github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-05-30 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor!: do not copy JS lib to platform project (#1269)

Browse Source
This commit is contained in:
Raphael von der Grün
2021-07-13 11:01:50 +02:00
committed by GitHub
parent f6d1deeff6
commit 16ff6e1b2f
105 changed files with 89 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec/e2e/e2e.spec.js
+2 -2
View File
@@ -22,7 +22,7 @@ const fs = require('fs-extra');
const path = require('path');
const { EventEmitter } = require('events');
const { ConfigParser, PluginInfoProvider } = require('cordova-common');
const Api = require('../../bin/templates/cordova/Api');
const Api = require('../../lib/Api');
function makeTempDir () {
const tmpDirTemplate = path.join(os.tmpdir(), 'cordova-android-test-');
@@ -30,7 +30,7 @@ function makeTempDir () {
}
async function makeProject (projectPath) {
const configXmlPath = path.join(__dirname, '../../bin/templates/project/res/xml/config.xml');
const configXmlPath = path.join(__dirname, '../../templates/project/res/xml/config.xml');
const config = new ConfigParser(configXmlPath);
config.setPackageName('io.cordova.testapp');
config.setName('TestApp');
spec/unit/Adb.spec.js
+1 -1
View File
@@ -38,7 +38,7 @@ describe('Adb', () => {
let execaSpy;
beforeEach(() => {
Adb = rewire('../../bin/templates/cordova/lib/Adb');
Adb = rewire('../../lib/Adb');
execaSpy = jasmine.createSpy('execa');
Adb.__set__('execa', execaSpy);
});
spec/unit/AndroidManifest.spec.js
+1 -1
View File
@@ -66,7 +66,7 @@ describe('AndroidManifest', () => {
beforeEach(() => {
createTempManifestFile(DEFAULT_MANIFEST);
AndroidManifest = rewire('../../bin/templates/cordova/lib/AndroidManifest');
AndroidManifest = rewire('../../lib/AndroidManifest');
manifest = new AndroidManifest(manifestPath);
});
spec/unit/AndroidProject.spec.js
+1 -1
View File
@@ -26,7 +26,7 @@ describe('AndroidProject', () => {
let AndroidStudioSpy;
beforeEach(() => {
AndroidProject = rewire('../../bin/templates/cordova/lib/AndroidProject');
AndroidProject = rewire('../../lib/AndroidProject');
AndroidStudioSpy = jasmine.createSpyObj('AndroidStudio', ['isAndroidStudioProject']);
AndroidProject.__set__('AndroidStudio', AndroidStudioSpy);
spec/unit/Api.spec.js
+2 -2
View File
@@ -22,8 +22,8 @@ var path = require('path');
var common = require('cordova-common');
const EventEmitter = require('events');
var Api = require('../../bin/templates/cordova/Api');
var AndroidProject = require('../../bin/templates/cordova/lib/AndroidProject');
var Api = require('../../lib/Api');
var AndroidProject = require('../../lib/AndroidProject');
var PluginInfo = common.PluginInfo;
spec/unit/android_sdk.spec.js
+1 -1
View File
@@ -26,7 +26,7 @@ describe('android_sdk', () => {
let execaSpy;
beforeEach(() => {
android_sdk = rewire('../../bin/templates/cordova/lib/android_sdk');
android_sdk = rewire('../../lib/android_sdk');
execaSpy = jasmine.createSpy('execa');
android_sdk.__set__('execa', execaSpy);
});
spec/unit/builders/ProjectBuilder.spec.js
+1 -1
View File
@@ -32,7 +32,7 @@ describe('ProjectBuilder', () => {
beforeEach(() => {
execaSpy = jasmine.createSpy('execa').and.returnValue(new Promise(() => {}));
ProjectBuilder = rewire('../../../bin/templates/cordova/lib/builders/ProjectBuilder');
ProjectBuilder = rewire('../../../lib/builders/ProjectBuilder');
ProjectBuilder.__set__('execa', execaSpy);
builder = new ProjectBuilder(rootDir);
spec/unit/builders/builders.spec.js
+2 -2
View File
@@ -20,13 +20,13 @@
const rewire = require('rewire');
const CordovaError = require('cordova-common').CordovaError;
const ProjectBuilder = require('../../../bin/templates/cordova/lib/builders/ProjectBuilder');
const ProjectBuilder = require('../../../lib/builders/ProjectBuilder');
describe('builders', () => {
let builders;
beforeEach(() => {
builders = rewire('../../../bin/templates/cordova/lib/builders/builders');
builders = rewire('../../../lib/builders/builders');
});
describe('getBuilder', () => {
spec/unit/check_reqs.spec.js
+3 -3
View File
@@ -18,7 +18,7 @@
*/
var rewire = require('rewire');
var android_sdk = require('../../bin/templates/cordova/lib/android_sdk');
var android_sdk = require('../../lib/android_sdk');
var fs = require('fs-extra');
var path = require('path');
var events = require('cordova-common').events;
@@ -26,12 +26,12 @@ var which = require('which');
const {
SDK_VERSION: DEFAULT_TARGET_API
} = require('../../bin/templates/cordova/lib/gradle-config-defaults');
} = require('../../lib/gradle-config-defaults');
describe('check_reqs', function () {
let check_reqs;
beforeEach(() => {
check_reqs = rewire('../../bin/templates/cordova/lib/check_reqs');
check_reqs = rewire('../../lib/check_reqs');
});
var original_env;
spec/unit/config/GradlePropertiesParser.spec.js
+1 -1
View File
@@ -18,7 +18,7 @@
*/
const rewire = require('rewire');
const GradlePropertiesParser = rewire('../../../bin/templates/cordova/lib/config/GradlePropertiesParser');
const GradlePropertiesParser = rewire('../../../lib/config/GradlePropertiesParser');
describe('Gradle Builder', () => {
describe('_initializeEditor method', () => {
spec/unit/create.spec.js
+4 -4
View File
@@ -18,9 +18,9 @@
*/
var rewire = require('rewire');
var utils = require('../../bin/templates/cordova/lib/utils');
var create = rewire('../../bin/lib/create');
var check_reqs = require('../../bin/templates/cordova/lib/check_reqs');
var utils = require('../../lib/utils');
var create = rewire('../../lib/create');
var check_reqs = require('../../lib/check_reqs');
var fs = require('fs-extra');
var path = require('path');
@@ -117,7 +117,7 @@ describe('create', function () {
var revert_manifest_mock;
var project_path = path.join('some', 'path');
var app_path = path.join(project_path, 'app', 'src', 'main');
var default_templates = path.join(__dirname, '..', '..', 'bin', 'templates', 'project');
var default_templates = path.join(__dirname, '..', '..', 'templates', 'project');
var fake_android_target = 'android-1337';
beforeEach(function () {
spec/unit/emulator.spec.js
+2 -2
View File
@@ -28,7 +28,7 @@ describe('emulator', () => {
let emu;
beforeEach(() => {
emu = rewire('../../bin/templates/cordova/lib/emulator');
emu = rewire('../../lib/emulator');
});
describe('list_images_using_avdmanager', () => {
@@ -376,7 +376,7 @@ describe('emulator', () => {
// If we use Jasmine's fake clock, we need to re-require the target module,
// or else it will not work.
jasmine.clock().install();
emu = rewire('../../bin/templates/cordova/lib/emulator');
emu = rewire('../../lib/emulator');
AdbSpy = jasmine.createSpyObj('Adb', ['shell']);
emu.__set__('Adb', AdbSpy);
spec/unit/java.spec.js
+2 -2
View File
@@ -20,11 +20,11 @@
const path = require('path');
const rewire = require('rewire');
const { CordovaError } = require('cordova-common');
const utils = require('../../bin/templates/cordova/lib/utils');
const utils = require('../../lib/utils');
const glob = require('fast-glob');
describe('Java', () => {
const Java = rewire('../../bin/templates/cordova/lib/env/java');
const Java = rewire('../../lib/env/java');
describe('getVersion', () => {
beforeEach(() => {
spec/unit/pluginHandlers/common.spec.js
+1 -1
View File
@@ -17,7 +17,7 @@
*/
var rewire = require('rewire');
var common = rewire('../../../bin/templates/cordova/lib/pluginHandlers');
var common = rewire('../../../lib/pluginHandlers');
var path = require('path');
var fs = require('fs-extra');
var osenv = require('os');
spec/unit/pluginHandlers/handlers.spec.js
+2 -2
View File
@@ -18,7 +18,7 @@
*/
var rewire = require('rewire');
var common = rewire('../../../bin/templates/cordova/lib/pluginHandlers');
var common = rewire('../../../lib/pluginHandlers');
var android = common.__get__('handlers');
var path = require('path');
var fs = require('fs-extra');
@@ -30,7 +30,7 @@ var faultyplugin = path.join(__dirname, '../../fixtures/org.test.plugins.faultyp
var android_studio_project = path.join(__dirname, '../../fixtures/android_studio_project');
var PluginInfo = require('cordova-common').PluginInfo;
var AndroidProject = require('../../../bin/templates/cordova/lib/AndroidProject');
var AndroidProject = require('../../../lib/AndroidProject');
var dummyPluginInfo = new PluginInfo(dummyplugin);
var valid_source = dummyPluginInfo.getSourceFiles('android');
spec/unit/prepare.spec.js
+3 -3
View File
@@ -20,7 +20,7 @@
var rewire = require('rewire');
var path = require('path');
var CordovaError = require('cordova-common').CordovaError;
const GradlePropertiesParser = require('../../bin/templates/cordova/lib/config/GradlePropertiesParser');
const GradlePropertiesParser = require('../../lib/config/GradlePropertiesParser');
const PATH_RESOURCE = path.join('platforms', 'android', 'app', 'src', 'main', 'res');
@@ -102,7 +102,7 @@ describe('prepare', () => {
let updatePathsSpy;
beforeEach(() => {
prepare = rewire('../../bin/templates/cordova/lib/prepare');
prepare = rewire('../../lib/prepare');
emitSpy = jasmine.createSpy('emit');
prepare.__set__('events', {
@@ -747,7 +747,7 @@ describe('prepare', () => {
let options;
beforeEach(function () {
Api = rewire('../../bin/templates/cordova/Api');
Api = rewire('../../lib/Api');
cordovaProject = {
root: '/mock',
spec/unit/retry.spec.js
+1 -1
View File
@@ -17,7 +17,7 @@
under the License.
*/
const retry = require('../../bin/templates/cordova/lib/retry');
const retry = require('../../lib/retry');
describe('retry', () => {
describe('retryPromise method', () => {
spec/unit/run.spec.js
+2 -2
View File
@@ -18,13 +18,13 @@
*/
const rewire = require('rewire');
const builders = require('../../bin/templates/cordova/lib/builders/builders');
const builders = require('../../lib/builders/builders');
describe('run', () => {
let run;
beforeEach(() => {
run = rewire('../../bin/templates/cordova/lib/run');
run = rewire('../../lib/run');
run.__set__({
events: jasmine.createSpyObj('eventsSpy', ['emit'])
});
spec/unit/target.spec.js
+1 -1
View File
@@ -24,7 +24,7 @@ describe('target', () => {
let target;
beforeEach(() => {
target = rewire('../../bin/templates/cordova/lib/target');
target = rewire('../../lib/target');
});
describe('list', () => {