You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by dp...@apache.org on 2019/01/16 05:57:14 UTC
[cordova-android] branch master updated (f228d90 -> 634f92e)
This is an automated email from the ASF dual-hosted git repository.
dpogue pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git.
from f228d90 Copy node_modules if the directory exists (#607)
new c1819cc Bumped cordova-common@^3.1.0
new 39bd0d6 Bumped Dev Dependencies + ESLint Correction
new 18e2829 Updated Dependencies
new f7688bc Replaced code coverage istanbul with nyc
new 3976685 Cleanup package scripts
new 98a7b75 Remove unused dependecy promise-matchers
new 634f92e Update Bug Issue Tracker
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 2 +
bin/templates/cordova/build | 8 +--
bin/templates/cordova/clean | 8 +--
bin/templates/cordova/lib/Adb.js | 8 +--
bin/templates/cordova/lib/AndroidManifest.js | 2 +-
bin/templates/cordova/lib/device.js | 4 +-
bin/templates/cordova/lib/emulator.js | 6 +-
bin/templates/cordova/lib/log.js | 2 +-
bin/templates/cordova/lib/prepare.js | 4 +-
bin/templates/cordova/run | 8 +--
bin/update | 2 +-
package.json | 52 ++++++++------
spec/coverage.json | 9 +++
spec/unit/Adb.spec.js | 2 +-
spec/unit/config/GradlePropertiesParser.spec.js | 2 +-
spec/unit/create.spec.js | 4 +-
spec/unit/emulator.spec.js | 8 +--
spec/unit/pluginHandlers/handlers.spec.js | 96 ++++++++++++-------------
spec/unit/prepare.spec.js | 12 ++--
spec/unit/run.spec.js | 4 +-
20 files changed, 130 insertions(+), 113 deletions(-)
create mode 100644 spec/coverage.json
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-android] 01/07: Bumped cordova-common@^3.1.0
Posted by dp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dpogue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
commit c1819cc027a733812676099a2021b3abbbc18280
Author: エリス <el...@gmail.com>
AuthorDate: Tue Jan 8 14:28:53 2019 +0900
Bumped cordova-common@^3.1.0
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index a790add..7a29a06 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
"license": "Apache-2.0",
"dependencies": {
"android-versions": "^1.3.0",
- "cordova-common": "^3.0.0",
+ "cordova-common": "^3.1.0",
"elementtree": "0.1.6",
"nopt": "^3.0.1",
"properties-parser": "^0.2.3",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-android] 03/07: Updated Dependencies
Posted by dp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dpogue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
commit 18e28294d6d12fec52aa8c69107bc1815c0ac447
Author: エリス <el...@gmail.com>
AuthorDate: Tue Jan 8 15:35:49 2019 +0900
Updated Dependencies
---
package.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/package.json b/package.json
index 6767504..4d5b6dd 100644
--- a/package.json
+++ b/package.json
@@ -33,9 +33,9 @@
"dependencies": {
"android-versions": "^1.3.0",
"cordova-common": "^3.1.0",
- "elementtree": "0.1.6",
- "nopt": "^3.0.1",
- "properties-parser": "^0.2.3",
+ "elementtree": "^0.1.7",
+ "nopt": "^4.0.1",
+ "properties-parser": "^0.3.1",
"q": "^1.4.1",
"shelljs": "^0.5.3"
},
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-android] 04/07: Replaced code coverage istanbul with nyc
Posted by dp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dpogue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
commit f7688bc64eda36e18a1dcaf3218d67511ff735f0
Author: エリス <el...@gmail.com>
AuthorDate: Tue Jan 8 15:36:54 2019 +0900
Replaced code coverage istanbul with nyc
---
.gitignore | 2 ++
package.json | 16 +++++++++++++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index 281e609..224f30f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,5 @@ tmp/**/*
*.iml
npm-debug.log
node_modules/
+coverage/
+.nyc_output/
diff --git a/package.json b/package.json
index 4d5b6dd..e5ab0f9 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
"scripts": {
"test": "run-s eslint unit-tests java-unit-tests e2e-tests",
"unit-tests": "jasmine --config=spec/unit/jasmine.json",
- "cover": "istanbul cover --root bin --print detail jasmine -- --config=spec/unit/jasmine.json",
+ "cover": "nyc jasmine --config=spec/unit/jasmine.json",
"e2e-tests": "jasmine --config=spec/e2e/jasmine.json",
"java-unit-tests": "node test/run_java_unit_tests.js",
"eslint": "run-s -c eslint:*",
@@ -47,14 +47,24 @@
"eslint-plugin-node": "^8.0.1",
"eslint-plugin-promise": "^4.0.1",
"eslint-plugin-standard": "^4.0.0",
- "istanbul": "^0.4.2",
"jasmine": "^3.3.1",
"npm-run-all": "^4.1.5",
+ "nyc": "^13.1.0",
"promise-matchers": "~0",
"rewire": "^4.0.1"
},
"engines": {
"node": ">=6.0.0"
},
- "engineStrict": true
+ "engineStrict": true,
+ "nyc": {
+ "include": [
+ "bin/lib/**",
+ "bin/templates/cordova/**"
+ ],
+ "reporter": [
+ "lcov",
+ "text"
+ ]
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-android] 07/07: Update Bug Issue Tracker
Posted by dp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dpogue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
commit 634f92efb687f3c1f6cb7ad14be03cff546808c9
Author: エリス <el...@gmail.com>
AuthorDate: Fri Jan 11 13:05:45 2019 +0900
Update Bug Issue Tracker
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index ef6fafb..4e7051f 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
"url": "https://github.com/apache/cordova-android"
},
"bugs": {
- "url": "https://issues.apache.org/jira/browse/CB"
+ "url": "https://github.com/apache/cordova-android/issues"
},
"keywords": [
"android",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-android] 06/07: Remove unused dependecy promise-matchers
Posted by dp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dpogue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
commit 98a7b759e8d6181f50ef0cfafe0f1628d55707ae
Author: エリス <el...@gmail.com>
AuthorDate: Tue Jan 8 15:57:33 2019 +0900
Remove unused dependecy promise-matchers
---
package.json | 1 -
1 file changed, 1 deletion(-)
diff --git a/package.json b/package.json
index eb3a461..ef6fafb 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,6 @@
"eslint-plugin-standard": "^4.0.0",
"jasmine": "^3.3.1",
"nyc": "^13.1.0",
- "promise-matchers": "~0",
"rewire": "^4.0.1"
},
"engines": {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-android] 02/07: Bumped Dev Dependencies + ESLint Correction
Posted by dp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dpogue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
commit 39bd0d6463dc38d270373524ecd6799dd2d4b1ad
Author: エリス <el...@gmail.com>
AuthorDate: Tue Jan 8 14:31:14 2019 +0900
Bumped Dev Dependencies + ESLint Correction
---
bin/templates/cordova/build | 8 +--
bin/templates/cordova/clean | 8 +--
bin/templates/cordova/lib/Adb.js | 8 +--
bin/templates/cordova/lib/AndroidManifest.js | 2 +-
bin/templates/cordova/lib/device.js | 4 +-
bin/templates/cordova/lib/emulator.js | 6 +-
bin/templates/cordova/lib/log.js | 2 +-
bin/templates/cordova/lib/prepare.js | 4 +-
bin/templates/cordova/run | 8 +--
bin/update | 2 +-
package.json | 20 +++---
spec/unit/Adb.spec.js | 2 +-
spec/unit/config/GradlePropertiesParser.spec.js | 2 +-
spec/unit/create.spec.js | 4 +-
spec/unit/emulator.spec.js | 8 +--
spec/unit/pluginHandlers/handlers.spec.js | 96 ++++++++++++-------------
spec/unit/prepare.spec.js | 12 ++--
spec/unit/run.spec.js | 4 +-
18 files changed, 100 insertions(+), 100 deletions(-)
diff --git a/bin/templates/cordova/build b/bin/templates/cordova/build
index 69f7b3a..d703547 100755
--- a/bin/templates/cordova/build
+++ b/bin/templates/cordova/build
@@ -45,7 +45,7 @@ buildOpts.argv = buildOpts.argv.original;
require('./loggingHelper').adjustLoggerLevel(buildOpts);
new Api().build(buildOpts)
-.catch(function (err) {
- console.error(err.stack);
- process.exit(2);
-});
+ .catch(function (err) {
+ console.error(err.stack);
+ process.exit(2);
+ });
diff --git a/bin/templates/cordova/clean b/bin/templates/cordova/clean
index d3e6da1..9db5847 100755
--- a/bin/templates/cordova/clean
+++ b/bin/templates/cordova/clean
@@ -45,7 +45,7 @@ opts.noPrepare = true;
require('./loggingHelper').adjustLoggerLevel(opts);
new Api().clean(opts)
-.catch(function (err) {
- console.error(err.stack);
- process.exit(2);
-});
+ .catch(function (err) {
+ console.error(err.stack);
+ process.exit(2);
+ });
diff --git a/bin/templates/cordova/lib/Adb.js b/bin/templates/cordova/lib/Adb.js
index 038c67c..b6ad8f1 100644
--- a/bin/templates/cordova/lib/Adb.js
+++ b/bin/templates/cordova/lib/Adb.js
@@ -44,7 +44,7 @@ function isEmulator (line) {
* devices/emulators
*/
Adb.devices = function (opts) {
- return spawn('adb', ['devices'], {cwd: os.tmpdir()}).then(function (output) {
+ return spawn('adb', ['devices'], { cwd: os.tmpdir() }).then(function (output) {
return output.split('\n').filter(function (line) {
// Filter out either real devices or emulators, depending on options
return (line && opts && opts.emulators) ? isEmulator(line) : isDevice(line);
@@ -58,7 +58,7 @@ Adb.install = function (target, packagePath, opts) {
events.emit('verbose', 'Installing apk ' + packagePath + ' on target ' + target + '...');
var args = ['-s', target, 'install'];
if (opts && opts.replace) args.push('-r');
- return spawn('adb', args.concat(packagePath), {cwd: os.tmpdir()}).then(function (output) {
+ return spawn('adb', args.concat(packagePath), { cwd: os.tmpdir() }).then(function (output) {
// 'adb install' seems to always returns no error, even if installation fails
// so we catching output to detect installation failure
if (output.match(/Failure/)) {
@@ -77,14 +77,14 @@ Adb.install = function (target, packagePath, opts) {
Adb.uninstall = function (target, packageId) {
events.emit('verbose', 'Uninstalling package ' + packageId + ' from target ' + target + '...');
- return spawn('adb', ['-s', target, 'uninstall', packageId], {cwd: os.tmpdir()});
+ return spawn('adb', ['-s', target, 'uninstall', packageId], { cwd: os.tmpdir() });
};
Adb.shell = function (target, shellCommand) {
events.emit('verbose', 'Running adb shell command "' + shellCommand + '" on target ' + target + '...');
var args = ['-s', target, 'shell'];
shellCommand = shellCommand.split(/\s+/);
- return spawn('adb', args.concat(shellCommand), {cwd: os.tmpdir()}).catch(function (output) {
+ return spawn('adb', args.concat(shellCommand), { cwd: os.tmpdir() }).catch(function (output) {
return Q.reject(new CordovaError('Failed to execute shell command "' +
shellCommand + '"" on device: ' + output));
});
diff --git a/bin/templates/cordova/lib/AndroidManifest.js b/bin/templates/cordova/lib/AndroidManifest.js
index 98f8202..4fe1c2b 100644
--- a/bin/templates/cordova/lib/AndroidManifest.js
+++ b/bin/templates/cordova/lib/AndroidManifest.js
@@ -146,7 +146,7 @@ AndroidManifest.prototype.setDebuggable = function (value) {
* manifest will be written to file it has been read from.
*/
AndroidManifest.prototype.write = function (destPath) {
- fs.writeFileSync(destPath || this.path, this.doc.write({indent: 4}), 'utf-8');
+ fs.writeFileSync(destPath || this.path, this.doc.write({ indent: 4 }), 'utf-8');
};
module.exports = AndroidManifest;
diff --git a/bin/templates/cordova/lib/device.js b/bin/templates/cordova/lib/device.js
index b186f81..1559e9b 100644
--- a/bin/templates/cordova/lib/device.js
+++ b/bin/templates/cordova/lib/device.js
@@ -86,7 +86,7 @@ module.exports.install = function (target, buildResults) {
events.emit('log', 'Using apk: ' + apk_path);
events.emit('log', 'Package name: ' + pkgName);
- return Adb.install(resolvedTarget.target, apk_path, {replace: true}).catch(function (error) {
+ return Adb.install(resolvedTarget.target, apk_path, { replace: true }).catch(function (error) {
// CB-9557 CB-10157 only uninstall and reinstall app if the one that
// is already installed on device was signed w/different certificate
if (!/INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES/.test(error.toString())) { throw error; }
@@ -97,7 +97,7 @@ module.exports.install = function (target, buildResults) {
// This promise is always resolved, even if 'adb uninstall' fails to uninstall app
// or the app doesn't installed at all, so no error catching needed.
return Adb.uninstall(resolvedTarget.target, pkgName).then(function () {
- return Adb.install(resolvedTarget.target, apk_path, {replace: true});
+ return Adb.install(resolvedTarget.target, apk_path, { replace: true });
});
}).then(function () {
// unlock screen
diff --git a/bin/templates/cordova/lib/emulator.js b/bin/templates/cordova/lib/emulator.js
index e87b7d4..7afc48a 100644
--- a/bin/templates/cordova/lib/emulator.js
+++ b/bin/templates/cordova/lib/emulator.js
@@ -223,13 +223,13 @@ module.exports.best_image = function () {
// Returns a promise.
module.exports.list_started = function () {
- return Adb.devices({emulators: true});
+ return Adb.devices({ emulators: true });
};
// Returns a promise.
// TODO: we should remove this, there's a more robust method under android_sdk.js
module.exports.list_targets = function () {
- return superspawn.spawn('android', ['list', 'targets'], {cwd: os.tmpdir()}).then(function (output) {
+ return superspawn.spawn('android', ['list', 'targets'], { cwd: os.tmpdir() }).then(function (output) {
var target_out = output.split('\n');
var targets = [];
for (var i = target_out.length; i >= 0; i--) {
@@ -419,7 +419,7 @@ module.exports.resolveTarget = function (target) {
}
return build.detectArchitecture(target).then(function (arch) {
- return {target: target, arch: arch, isEmulator: true};
+ return { target: target, arch: arch, isEmulator: true };
});
});
};
diff --git a/bin/templates/cordova/lib/log.js b/bin/templates/cordova/lib/log.js
index ef2dd5c..ec69f8c 100644
--- a/bin/templates/cordova/lib/log.js
+++ b/bin/templates/cordova/lib/log.js
@@ -31,7 +31,7 @@ var ROOT = path.join(__dirname, '..', '..');
*/
module.exports.run = function () {
var d = Q.defer();
- var adb = child_process.spawn('adb', ['logcat'], {cwd: os.tmpdir()});
+ var adb = child_process.spawn('adb', ['logcat'], { cwd: os.tmpdir() });
adb.stdout.on('data', function (data) {
var lines = data ? data.toString().split('\n') : [];
diff --git a/bin/templates/cordova/lib/prepare.js b/bin/templates/cordova/lib/prepare.js
index 54aa97d..2eb0888 100644
--- a/bin/templates/cordova/lib/prepare.js
+++ b/bin/templates/cordova/lib/prepare.js
@@ -183,7 +183,7 @@ function updateProjectAccordingTo (platformConfig, locations) {
strings.find('string[@name="launcher_name"]').text = shortName.replace(/\'/g, '\\\'');
}
- fs.writeFileSync(locations.strings, strings.write({indent: 4}), 'utf-8');
+ fs.writeFileSync(locations.strings, strings.write({ indent: 4 }), 'utf-8');
events.emit('verbose', 'Wrote out android application name "' + name + '" to ' + locations.strings);
// Java packages cannot support dashes
@@ -661,7 +661,7 @@ function cleanFileResources (projectRoot, projectConfig, platformDir) {
FileUpdater.updatePaths(
resourceMap, {
- rootDir: projectRoot, all: true}, logFileOp);
+ rootDir: projectRoot, all: true }, logFileOp);
}
}
diff --git a/bin/templates/cordova/run b/bin/templates/cordova/run
index 7408a94..a3d6f53 100755
--- a/bin/templates/cordova/run
+++ b/bin/templates/cordova/run
@@ -48,7 +48,7 @@ runOpts.argv = runOpts.argv.remain;
require('./loggingHelper').adjustLoggerLevel(runOpts);
new Api().run(runOpts)
-.catch(function (err) {
- console.error(err, err.stack);
- process.exit(2);
-});
+ .catch(function (err) {
+ console.error(err, err.stack);
+ process.exit(2);
+ });
diff --git a/bin/update b/bin/update
index 53ac9ae..419d34e 100755
--- a/bin/update
+++ b/bin/update
@@ -34,4 +34,4 @@ if (args.help || args.argv.remain.length === 0) {
require('./templates/cordova/loggingHelper').adjustLoggerLevel(args);
-Api.updatePlatform(args.argv.remain[0], {link: (args.link || args.shared)}).done();
+Api.updatePlatform(args.argv.remain[0], { link: (args.link || args.shared) }).done();
diff --git a/package.json b/package.json
index 7a29a06..6767504 100644
--- a/package.json
+++ b/package.json
@@ -40,18 +40,18 @@
"shelljs": "^0.5.3"
},
"devDependencies": {
- "eslint": "^3.19.0",
- "eslint-config-semistandard": "^11.0.0",
- "eslint-config-standard": "^10.2.1",
- "eslint-plugin-import": "^2.3.0",
- "eslint-plugin-node": "^5.0.0",
- "eslint-plugin-promise": "^3.5.0",
- "eslint-plugin-standard": "^3.0.1",
+ "eslint": "^5.12.0",
+ "eslint-config-semistandard": "^13.0.0",
+ "eslint-config-standard": "^12.0.0",
+ "eslint-plugin-import": "^2.14.0",
+ "eslint-plugin-node": "^8.0.1",
+ "eslint-plugin-promise": "^4.0.1",
+ "eslint-plugin-standard": "^4.0.0",
"istanbul": "^0.4.2",
- "jasmine": "^3.1.0",
- "npm-run-all": "^4.1.3",
+ "jasmine": "^3.3.1",
+ "npm-run-all": "^4.1.5",
"promise-matchers": "~0",
- "rewire": "^2.1.3"
+ "rewire": "^4.0.1"
},
"engines": {
"node": ">=6.0.0"
diff --git a/spec/unit/Adb.spec.js b/spec/unit/Adb.spec.js
index c637978..24e3cb4 100644
--- a/spec/unit/Adb.spec.js
+++ b/spec/unit/Adb.spec.js
@@ -72,7 +72,7 @@ emulator-5554\tdevice
});
it('should return only emulators if opts.emulators is true', () => {
- return Adb.devices({emulators: true}).then(devices => {
+ return Adb.devices({ emulators: true }).then(devices => {
expect(devices.length).toBe(1);
expect(devices[0]).toBe(emulatorId);
});
diff --git a/spec/unit/config/GradlePropertiesParser.spec.js b/spec/unit/config/GradlePropertiesParser.spec.js
index a9f7890..91af627 100644
--- a/spec/unit/config/GradlePropertiesParser.spec.js
+++ b/spec/unit/config/GradlePropertiesParser.spec.js
@@ -87,7 +87,7 @@ describe('Gradle Builder', () => {
parser = new GradlePropertiesParser('/root');
- parser._defaults = {'org.gradle.jvmargs': '-Xmx2048m'};
+ parser._defaults = { 'org.gradle.jvmargs': '-Xmx2048m' };
});
it('should detect missing default property and sets the property.', () => {
diff --git a/spec/unit/create.spec.js b/spec/unit/create.spec.js
index ac7026b..5b33058 100644
--- a/spec/unit/create.spec.js
+++ b/spec/unit/create.spec.js
@@ -195,7 +195,7 @@ describe('create', function () {
});
it('should use the activityName provided via options parameter, if exists', function (done) {
config_mock.android_activityName.and.returnValue(undefined);
- create.create(project_path, config_mock, {activityName: 'AwesomeActivity'}, events_mock).then(function () {
+ create.create(project_path, config_mock, { activityName: 'AwesomeActivity' }, events_mock).then(function () {
expect(Manifest_mock.prototype.setName).toHaveBeenCalledWith('AwesomeActivity');
}).fail(fail).done(done);
});
@@ -217,7 +217,7 @@ describe('create', function () {
});
describe('happy path', function () {
it('should copy project templates from a specified custom template', function (done) {
- create.create(project_path, config_mock, {customTemplate: '/template/path'}, events_mock).then(function () {
+ create.create(project_path, config_mock, { customTemplate: '/template/path' }, events_mock).then(function () {
expect(shell.cp).toHaveBeenCalledWith('-r', path.join('/template/path', 'assets'), app_path);
expect(shell.cp).toHaveBeenCalledWith('-r', path.join('/template/path', 'res'), app_path);
expect(shell.cp).toHaveBeenCalledWith(path.join('/template/path', 'gitignore'), path.join(project_path, '.gitignore'));
diff --git a/spec/unit/emulator.spec.js b/spec/unit/emulator.spec.js
index 0efcee7..3f42fe7 100644
--- a/spec/unit/emulator.spec.js
+++ b/spec/unit/emulator.spec.js
@@ -206,7 +206,7 @@ describe('emulator', () => {
emu.__set__('Adb', AdbSpy);
return emu.list_started().then(() => {
- expect(AdbSpy.devices).toHaveBeenCalledWith({emulators: true});
+ expect(AdbSpy.devices).toHaveBeenCalledWith({ emulators: true });
});
});
});
@@ -388,9 +388,9 @@ describe('emulator', () => {
it('should call itself again if shell fails for a known reason', () => {
AdbSpy.shell.and.returnValues(
- Promise.reject({message: 'device not found'}),
- Promise.reject({message: 'device offline'}),
- Promise.reject({message: 'device still connecting'}),
+ Promise.reject({ message: 'device not found' }),
+ Promise.reject({ message: 'device offline' }),
+ Promise.reject({ message: 'device still connecting' }),
Promise.resolve('1')
);
diff --git a/spec/unit/pluginHandlers/handlers.spec.js b/spec/unit/pluginHandlers/handlers.spec.js
index a44b8cf..39e51f4 100644
--- a/spec/unit/pluginHandlers/handlers.spec.js
+++ b/spec/unit/pluginHandlers/handlers.spec.js
@@ -105,73 +105,73 @@ describe('android project handler', function () {
// TODO: renumber these tests and other tests below
it('Test#00a6 : should allow installing sources with new app target-dir scheme', function () {
- android['source-file'].install(valid_source[1], dummyPluginInfo, dummyProject, {android_studio: true});
+ android['source-file'].install(valid_source[1], dummyPluginInfo, dummyProject, { android_studio: true });
expect(copyFileSpy)
.toHaveBeenCalledWith(dummyplugin, 'src/android/DummyPlugin2.java', temp, path.join('app/src/main/src/com/phonegap/plugins/dummyplugin/DummyPlugin2.java'), false);
});
it('Test#006b : should allow installing jar lib file from sources with new app target-dir scheme', function () {
- android['source-file'].install(valid_source[2], dummyPluginInfo, dummyProject, {android_studio: true});
+ android['source-file'].install(valid_source[2], dummyPluginInfo, dummyProject, { android_studio: true });
expect(copyFileSpy)
.toHaveBeenCalledWith(dummyplugin, 'src/android/TestLib.jar', temp, path.join('app/libs/TestLib.jar'), false);
});
it('Test#006c : should allow installing aar lib file from sources with new app target-dir scheme', function () {
- android['source-file'].install(valid_source[3], dummyPluginInfo, dummyProject, {android_studio: true});
+ android['source-file'].install(valid_source[3], dummyPluginInfo, dummyProject, { android_studio: true });
expect(copyFileSpy)
.toHaveBeenCalledWith(dummyplugin, 'src/android/TestAar.aar', temp, path.join('app/libs/TestAar.aar'), false);
});
it('Test#006d : should allow installing xml file from sources with old target-dir scheme', function () {
- android['source-file'].install(valid_source[4], dummyPluginInfo, dummyProject, {android_studio: true});
+ android['source-file'].install(valid_source[4], dummyPluginInfo, dummyProject, { android_studio: true });
expect(copyFileSpy).toHaveBeenCalledWith(dummyplugin,
'src/android/mysettings.xml', temp,
path.join('app/src/main/res/xml/mysettings.xml'), false);
});
it('Test#006e : should allow installing file with other extension from sources with old target-dir scheme', function () {
- android['source-file'].install(valid_source[5], dummyPluginInfo, dummyProject, {android_studio: true});
+ android['source-file'].install(valid_source[5], dummyPluginInfo, dummyProject, { android_studio: true });
expect(copyFileSpy).toHaveBeenCalledWith(dummyplugin,
'src/android/other.extension', temp,
path.join('app/src/main/res/values/other.extension'), false);
});
it('Test#006f : should allow installing aidl file from sources with old target-dir scheme (GH-547)', function () {
- android['source-file'].install(valid_source[6], dummyPluginInfo, dummyProject, {android_studio: true});
+ android['source-file'].install(valid_source[6], dummyPluginInfo, dummyProject, { android_studio: true });
expect(copyFileSpy).toHaveBeenCalledWith(dummyplugin,
'src/android/myapi.aidl', temp,
path.join('app/src/main/aidl/com/mytest/myapi.aidl'), false);
});
it('Test#006g : should allow installing aar lib file from sources with old target-dir scheme (GH-547)', function () {
- android['source-file'].install(valid_source[7], dummyPluginInfo, dummyProject, {android_studio: true});
+ android['source-file'].install(valid_source[7], dummyPluginInfo, dummyProject, { android_studio: true });
expect(copyFileSpy).toHaveBeenCalledWith(dummyplugin,
'src/android/testaar2.aar', temp,
path.join('app/libs/testaar2.aar'), false);
});
it('Test#006h : should allow installing jar lib file from sources with old target-dir scheme (GH-547)', function () {
- android['source-file'].install(valid_source[8], dummyPluginInfo, dummyProject, {android_studio: true});
+ android['source-file'].install(valid_source[8], dummyPluginInfo, dummyProject, { android_studio: true });
expect(copyFileSpy).toHaveBeenCalledWith(dummyplugin,
'src/android/testjar2.jar', temp,
path.join('app/libs/testjar2.jar'), false);
});
it('Test#006i : should allow installing .so lib file from sources with old target-dir scheme (GH-547)', function () {
- android['source-file'].install(valid_source[9], dummyPluginInfo, dummyProject, {android_studio: true});
+ android['source-file'].install(valid_source[9], dummyPluginInfo, dummyProject, { android_studio: true });
expect(copyFileSpy).toHaveBeenCalledWith(dummyplugin,
'src/android/jniLibs/x86/libnative.so', temp,
path.join('app/src/main/jniLibs/x86/libnative.so'), false);
});
it('Test#006j : should allow installing sources with target-dir that includes "app"', function () {
- android['source-file'].install(valid_source[10], dummyPluginInfo, dummyProject, {android_studio: true});
+ android['source-file'].install(valid_source[10], dummyPluginInfo, dummyProject, { android_studio: true });
expect(copyFileSpy)
.toHaveBeenCalledWith(dummyplugin, 'src/android/DummyPlugin2.java', temp, path.join('app/src/main/java/com/appco/DummyPlugin2.java'), false);
});
it('Test#006k : should allow installing sources with target-dir that includes "app" in its first directory', function () {
- android['source-file'].install(valid_source[11], dummyPluginInfo, dummyProject, {android_studio: true});
+ android['source-file'].install(valid_source[11], dummyPluginInfo, dummyProject, { android_studio: true });
expect(copyFileSpy)
.toHaveBeenCalledWith(dummyplugin, 'src/android/DummyPlugin2.java', temp, path.join('app/src/main/java/appco/src/DummyPlugin2.java'), false);
});
@@ -202,19 +202,19 @@ describe('android project handler', function () {
});
it('Test#008 : should install framework without "parent" attribute into project root', function () {
- var framework = {src: 'plugin-lib'};
+ var framework = { src: 'plugin-lib' };
android.framework.install(framework, dummyPluginInfo, dummyProject);
expect(dummyProject.addSystemLibrary).toHaveBeenCalledWith(dummyProject.projectDir, someString);
});
it('Test#009 : should install framework with "parent" attribute into parent framework dir', function () {
- var childFramework = {src: 'plugin-lib2', parent: 'plugin-lib'};
+ var childFramework = { src: 'plugin-lib2', parent: 'plugin-lib' };
android.framework.install(childFramework, dummyPluginInfo, dummyProject);
expect(dummyProject.addSystemLibrary).toHaveBeenCalledWith(path.resolve(dummyProject.projectDir, childFramework.parent), someString);
});
it('Test#010 : should not copy anything if "custom" attribute is not set', function () {
- var framework = {src: 'plugin-lib'};
+ var framework = { src: 'plugin-lib' };
var cpSpy = spyOn(shell, 'cp');
android.framework.install(framework, dummyPluginInfo, dummyProject);
expect(dummyProject.addSystemLibrary).toHaveBeenCalledWith(someString, framework.src);
@@ -222,14 +222,14 @@ describe('android project handler', function () {
});
it('Test#011 : should copy framework sources if "custom" attribute is set', function () {
- var framework = {src: 'plugin-lib', custom: true};
+ var framework = { src: 'plugin-lib', custom: true };
android.framework.install(framework, dummyPluginInfo, dummyProject);
expect(dummyProject.addSubProject).toHaveBeenCalledWith(dummyProject.projectDir, someString);
expect(copyNewFileSpy).toHaveBeenCalledWith(dummyPluginInfo.dir, framework.src, dummyProject.projectDir, someString, false);
});
it('Test#012 : should install gradleReference using project.addGradleReference', function () {
- var framework = {src: 'plugin-lib', custom: true, type: 'gradleReference'};
+ var framework = { src: 'plugin-lib', custom: true, type: 'gradleReference' };
android.framework.install(framework, dummyPluginInfo, dummyProject);
expect(copyNewFileSpy).toHaveBeenCalledWith(dummyPluginInfo.dir, framework.src, dummyProject.projectDir, someString, false);
expect(dummyProject.addGradleReference).toHaveBeenCalledWith(dummyProject.projectDir, someString);
@@ -237,7 +237,7 @@ describe('android project handler', function () {
});
describe('of <js-module> elements', function () {
- var jsModule = {src: 'www/dummyplugin.js'};
+ var jsModule = { src: 'www/dummyplugin.js' };
var wwwDest, platformWwwDest;
beforeEach(function () {
@@ -247,7 +247,7 @@ describe('android project handler', function () {
});
it('Test#013 : should put module to both www and platform_www when options.usePlatformWww flag is specified', function () {
- android['js-module'].install(jsModule, dummyPluginInfo, dummyProject, {usePlatformWww: true});
+ android['js-module'].install(jsModule, dummyPluginInfo, dummyProject, { usePlatformWww: true });
expect(fs.writeFileSync).toHaveBeenCalledWith(wwwDest, jasmine.any(String), 'utf-8');
expect(fs.writeFileSync).toHaveBeenCalledWith(platformWwwDest, jasmine.any(String), 'utf-8');
});
@@ -260,7 +260,7 @@ describe('android project handler', function () {
});
describe('of <asset> elements', function () {
- var asset = {src: 'www/dummyPlugin.js', target: 'foo/dummy.js'};
+ var asset = { src: 'www/dummyPlugin.js', target: 'foo/dummy.js' };
var wwwDest; /* eslint no-unused-vars: "off" */
var platformWwwDest; /* eslint no-unused-vars: "off" */
@@ -270,7 +270,7 @@ describe('android project handler', function () {
});
it('Test#015 : should put asset to both www and platform_www when options.usePlatformWww flag is specified', function () {
- android.asset.install(asset, dummyPluginInfo, dummyProject, {usePlatformWww: true});
+ android.asset.install(asset, dummyPluginInfo, dummyProject, { usePlatformWww: true });
expect(copyFileSpy).toHaveBeenCalledWith(dummyPluginInfo.dir, asset.src, dummyProject.www, asset.target);
expect(copyFileSpy).toHaveBeenCalledWith(dummyPluginInfo.dir, asset.src, dummyProject.platformWww, asset.target);
});
@@ -332,62 +332,62 @@ describe('android project handler', function () {
});
it('Test#019a : should remove stuff by calling common.deleteJava for Android Studio projects, with specific app target-dir', function () {
- android['source-file'].install(valid_source[1], dummyPluginInfo, dummyProject, {android_studio: true});
- android['source-file'].uninstall(valid_source[1], dummyPluginInfo, dummyProject, {android_studio: true});
+ android['source-file'].install(valid_source[1], dummyPluginInfo, dummyProject, { android_studio: true });
+ android['source-file'].uninstall(valid_source[1], dummyPluginInfo, dummyProject, { android_studio: true });
expect(deleteJavaSpy).toHaveBeenCalledWith(temp, path.join('app/src/main/src/com/phonegap/plugins/dummyplugin/DummyPlugin2.java'));
});
it('Test#019b : should remove stuff by calling common.removeFile for Android Studio projects, of jar with new app target-dir scheme', function () {
- android['source-file'].install(valid_source[2], dummyPluginInfo, dummyProject, {android_studio: true});
- android['source-file'].uninstall(valid_source[2], dummyPluginInfo, dummyProject, {android_studio: true});
+ android['source-file'].install(valid_source[2], dummyPluginInfo, dummyProject, { android_studio: true });
+ android['source-file'].uninstall(valid_source[2], dummyPluginInfo, dummyProject, { android_studio: true });
expect(removeFileSpy).toHaveBeenCalledWith(temp, path.join('app/libs/TestLib.jar'));
});
it('Test#019c : should remove stuff by calling common.removeFile for Android Studio projects, of aar with new app target-dir scheme', function () {
- android['source-file'].install(valid_source[3], dummyPluginInfo, dummyProject, {android_studio: true});
- android['source-file'].uninstall(valid_source[3], dummyPluginInfo, dummyProject, {android_studio: true});
+ android['source-file'].install(valid_source[3], dummyPluginInfo, dummyProject, { android_studio: true });
+ android['source-file'].uninstall(valid_source[3], dummyPluginInfo, dummyProject, { android_studio: true });
expect(removeFileSpy).toHaveBeenCalledWith(temp, path.join('app/libs/TestAar.aar'));
});
it('Test#019d : should remove stuff by calling common.removeFile for Android Studio projects, of xml with old target-dir scheme', function () {
- android['source-file'].install(valid_source[4], dummyPluginInfo, dummyProject, {android_studio: true});
- android['source-file'].uninstall(valid_source[4], dummyPluginInfo, dummyProject, {android_studio: true});
+ android['source-file'].install(valid_source[4], dummyPluginInfo, dummyProject, { android_studio: true });
+ android['source-file'].uninstall(valid_source[4], dummyPluginInfo, dummyProject, { android_studio: true });
expect(removeFileSpy).toHaveBeenCalledWith(temp, path.join('app/src/main/res/xml/mysettings.xml'));
});
it('Test#019e : should remove stuff by calling common.removeFile for Android Studio projects, of file with other extension with old target-dir scheme', function () {
- android['source-file'].install(valid_source[5], dummyPluginInfo, dummyProject, {android_studio: true});
- android['source-file'].uninstall(valid_source[5], dummyPluginInfo, dummyProject, {android_studio: true});
+ android['source-file'].install(valid_source[5], dummyPluginInfo, dummyProject, { android_studio: true });
+ android['source-file'].uninstall(valid_source[5], dummyPluginInfo, dummyProject, { android_studio: true });
expect(removeFileSpy).toHaveBeenCalledWith(temp, path.join('app/src/main/res/values/other.extension'));
});
it('Test#019f : should remove stuff by calling common.removeFile for Android Studio projects, of aidl with old target-dir scheme (GH-547)', function () {
- android['source-file'].install(valid_source[6], dummyPluginInfo, dummyProject, {android_studio: true});
- android['source-file'].uninstall(valid_source[6], dummyPluginInfo, dummyProject, {android_studio: true});
+ android['source-file'].install(valid_source[6], dummyPluginInfo, dummyProject, { android_studio: true });
+ android['source-file'].uninstall(valid_source[6], dummyPluginInfo, dummyProject, { android_studio: true });
expect(removeFileSpy).toHaveBeenCalledWith(temp, path.join('app/src/main/aidl/com/mytest/myapi.aidl'));
});
it('Test#019g : should remove stuff by calling common.removeFile for Android Studio projects, of aar with old target-dir scheme (GH-547)', function () {
- android['source-file'].install(valid_source[7], dummyPluginInfo, dummyProject, {android_studio: true});
- android['source-file'].uninstall(valid_source[7], dummyPluginInfo, dummyProject, {android_studio: true});
+ android['source-file'].install(valid_source[7], dummyPluginInfo, dummyProject, { android_studio: true });
+ android['source-file'].uninstall(valid_source[7], dummyPluginInfo, dummyProject, { android_studio: true });
expect(removeFileSpy).toHaveBeenCalledWith(temp, path.join('app/libs/testaar2.aar'));
});
it('Test#019h : should remove stuff by calling common.removeFile for Android Studio projects, of jar with old target-dir scheme (GH-547)', function () {
- android['source-file'].install(valid_source[8], dummyPluginInfo, dummyProject, {android_studio: true});
- android['source-file'].uninstall(valid_source[8], dummyPluginInfo, dummyProject, {android_studio: true});
+ android['source-file'].install(valid_source[8], dummyPluginInfo, dummyProject, { android_studio: true });
+ android['source-file'].uninstall(valid_source[8], dummyPluginInfo, dummyProject, { android_studio: true });
expect(removeFileSpy).toHaveBeenCalledWith(temp, path.join('app/libs/testjar2.jar'));
});
it('Test#019i : should remove stuff by calling common.removeFile for Android Studio projects, of .so lib file with old target-dir scheme (GH-547)', function () {
- android['source-file'].install(valid_source[9], dummyPluginInfo, dummyProject, {android_studio: true});
- android['source-file'].uninstall(valid_source[9], dummyPluginInfo, dummyProject, {android_studio: true});
+ android['source-file'].install(valid_source[9], dummyPluginInfo, dummyProject, { android_studio: true });
+ android['source-file'].uninstall(valid_source[9], dummyPluginInfo, dummyProject, { android_studio: true });
expect(removeFileSpy).toHaveBeenCalledWith(temp, path.join('app/src/main/jniLibs/x86/libnative.so'));
});
it('Test#019j : should remove stuff by calling common.deleteJava for Android Studio projects, with target-dir that includes "app"', function () {
- android['source-file'].install(valid_source[10], dummyPluginInfo, dummyProject, {android_studio: true});
- android['source-file'].uninstall(valid_source[10], dummyPluginInfo, dummyProject, {android_studio: true});
+ android['source-file'].install(valid_source[10], dummyPluginInfo, dummyProject, { android_studio: true });
+ android['source-file'].uninstall(valid_source[10], dummyPluginInfo, dummyProject, { android_studio: true });
expect(deleteJavaSpy).toHaveBeenCalledWith(temp, path.join('app/src/main/java/com/appco/DummyPlugin2.java'));
});
});
@@ -409,26 +409,26 @@ describe('android project handler', function () {
});
it('Test#021 : should uninstall framework without "parent" attribute into project root', function () {
- var framework = {src: 'plugin-lib'};
+ var framework = { src: 'plugin-lib' };
android.framework.uninstall(framework, dummyPluginInfo, dummyProject);
expect(dummyProject.removeSystemLibrary).toHaveBeenCalledWith(dummyProject.projectDir, someString);
});
it('Test#022 : should uninstall framework with "parent" attribute into parent framework dir', function () {
- var childFramework = {src: 'plugin-lib2', parent: 'plugin-lib'};
+ var childFramework = { src: 'plugin-lib2', parent: 'plugin-lib' };
android.framework.uninstall(childFramework, dummyPluginInfo, dummyProject);
expect(dummyProject.removeSystemLibrary).toHaveBeenCalledWith(path.resolve(dummyProject.projectDir, childFramework.parent), someString);
});
it('Test#023 : should remove framework sources if "custom" attribute is set', function () {
- var framework = {src: 'plugin-lib', custom: true};
+ var framework = { src: 'plugin-lib', custom: true };
android.framework.uninstall(framework, dummyPluginInfo, dummyProject);
expect(dummyProject.removeSubProject).toHaveBeenCalledWith(dummyProject.projectDir, someString);
expect(removeFileSpy).toHaveBeenCalledWith(dummyProject.projectDir, someString);
});
it('Test#24 : should install gradleReference using project.removeGradleReference', function () {
- var framework = {src: 'plugin-lib', custom: true, type: 'gradleReference'};
+ var framework = { src: 'plugin-lib', custom: true, type: 'gradleReference' };
android.framework.uninstall(framework, dummyPluginInfo, dummyProject);
expect(removeFileSpy).toHaveBeenCalledWith(dummyProject.projectDir, someString);
expect(dummyProject.removeGradleReference).toHaveBeenCalledWith(dummyProject.projectDir, someString);
@@ -436,7 +436,7 @@ describe('android project handler', function () {
});
describe('of <js-module> elements', function () {
- var jsModule = {src: 'www/dummyPlugin.js'};
+ var jsModule = { src: 'www/dummyPlugin.js' };
var wwwDest;
var platformWwwDest;
@@ -454,7 +454,7 @@ describe('android project handler', function () {
});
it('Test#025 : should put module to both www and platform_www when options.usePlatformWww flag is specified', function () {
- android['js-module'].uninstall(jsModule, dummyPluginInfo, dummyProject, {usePlatformWww: true});
+ android['js-module'].uninstall(jsModule, dummyPluginInfo, dummyProject, { usePlatformWww: true });
expect(shell.rm).toHaveBeenCalledWith('-Rf', wwwDest);
expect(shell.rm).toHaveBeenCalledWith('-Rf', platformWwwDest);
});
@@ -467,7 +467,7 @@ describe('android project handler', function () {
});
describe('of <asset> elements', function () {
- var asset = {src: 'www/dummyPlugin.js', target: 'foo/dummy.js'};
+ var asset = { src: 'www/dummyPlugin.js', target: 'foo/dummy.js' };
var wwwDest, platformWwwDest;
beforeEach(function () {
@@ -484,7 +484,7 @@ describe('android project handler', function () {
});
it('Test#027 : should put module to both www and platform_www when options.usePlatformWww flag is specified', function () {
- android.asset.uninstall(asset, dummyPluginInfo, dummyProject, {usePlatformWww: true});
+ android.asset.uninstall(asset, dummyPluginInfo, dummyProject, { usePlatformWww: true });
expect(shell.rm).toHaveBeenCalledWith(jasmine.any(String), wwwDest);
expect(shell.rm).toHaveBeenCalledWith(jasmine.any(String), platformWwwDest);
});
diff --git a/spec/unit/prepare.spec.js b/spec/unit/prepare.spec.js
index 3b133c1..55008c1 100644
--- a/spec/unit/prepare.spec.js
+++ b/spec/unit/prepare.spec.js
@@ -216,7 +216,7 @@ describe('updateIcons method', function () {
// mock data.
cordovaProject.projectConfig.getIcons = function () {
- return [mockGetIconItem({density: 'mdpi'})];
+ return [mockGetIconItem({ density: 'mdpi' })];
};
expect(function () {
@@ -231,7 +231,7 @@ describe('updateIcons method', function () {
// mock data.
cordovaProject.projectConfig.getIcons = function () {
- return [mockGetIconItem({density: 'mdpi'})];
+ return [mockGetIconItem({ density: 'mdpi' })];
};
expect(function () {
@@ -246,7 +246,7 @@ describe('updateIcons method', function () {
// mock data.
cordovaProject.projectConfig.getIcons = function () {
- return [mockGetIconItem({height: '192'})];
+ return [mockGetIconItem({ height: '192' })];
};
expect(function () {
@@ -261,7 +261,7 @@ describe('updateIcons method', function () {
// mock data.
cordovaProject.projectConfig.getIcons = function () {
- return [mockGetIconItem({width: '192'})];
+ return [mockGetIconItem({ width: '192' })];
};
expect(function () {
@@ -525,7 +525,7 @@ describe('prepareIcons method', function () {
let icons = [ldpi, mdpi];
let actual = prepareIcons(icons);
let expected = {
- android_icons: {ldpi, mdpi},
+ android_icons: { ldpi, mdpi },
default_icon: undefined
};
@@ -548,7 +548,7 @@ describe('prepareIcons method', function () {
let icons = [ldpi, mdpi];
let actual = prepareIcons(icons);
let expected = {
- android_icons: {ldpi, mdpi},
+ android_icons: { ldpi, mdpi },
default_icon: undefined
};
diff --git a/spec/unit/run.spec.js b/spec/unit/run.spec.js
index cae2949..8b5108a 100644
--- a/spec/unit/run.spec.js
+++ b/spec/unit/run.spec.js
@@ -181,7 +181,7 @@ describe('run', () => {
deviceSpyObj.resolveTarget.and.returnValue(deviceTarget);
return run.run().then(() => {
- expect(deviceSpyObj.install).toHaveBeenCalledWith(deviceTarget, {apkPaths: [], buildType: 'debug'});
+ expect(deviceSpyObj.install).toHaveBeenCalledWith(deviceTarget, { apkPaths: [], buildType: 'debug' });
});
});
@@ -193,7 +193,7 @@ describe('run', () => {
emulatorSpyObj.wait_for_boot.and.returnValue(Promise.resolve());
return run.run().then(() => {
- expect(emulatorSpyObj.install).toHaveBeenCalledWith(emulatorTarget, {apkPaths: [], buildType: 'debug'});
+ expect(emulatorSpyObj.install).toHaveBeenCalledWith(emulatorTarget, { apkPaths: [], buildType: 'debug' });
});
});
});
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-android] 05/07: Cleanup package scripts
Posted by dp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dpogue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
commit 3976685e4edba2e33e20e4cfd6053fd2857dbc64
Author: エリス <el...@gmail.com>
AuthorDate: Tue Jan 8 15:50:41 2019 +0900
Cleanup package scripts
---
package.json | 9 +++------
spec/coverage.json | 9 +++++++++
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/package.json b/package.json
index e5ab0f9..eb3a461 100644
--- a/package.json
+++ b/package.json
@@ -19,14 +19,12 @@
"apache"
],
"scripts": {
- "test": "run-s eslint unit-tests java-unit-tests e2e-tests",
+ "test": "npm run eslint && npm run cover && npm run java-unit-tests",
"unit-tests": "jasmine --config=spec/unit/jasmine.json",
- "cover": "nyc jasmine --config=spec/unit/jasmine.json",
+ "cover": "nyc jasmine --config=spec/coverage.json",
"e2e-tests": "jasmine --config=spec/e2e/jasmine.json",
"java-unit-tests": "node test/run_java_unit_tests.js",
- "eslint": "run-s -c eslint:*",
- "eslint:scripts": "eslint bin spec test",
- "eslint:bins": "eslint 'bin/**/*' --ignore-pattern '**/*.*' --ignore-pattern '**/gitignore' --ignore-pattern 'bin/templates/cordova/version'"
+ "eslint": "eslint bin spec test"
},
"author": "Apache Software Foundation",
"license": "Apache-2.0",
@@ -48,7 +46,6 @@
"eslint-plugin-promise": "^4.0.1",
"eslint-plugin-standard": "^4.0.0",
"jasmine": "^3.3.1",
- "npm-run-all": "^4.1.5",
"nyc": "^13.1.0",
"promise-matchers": "~0",
"rewire": "^4.0.1"
diff --git a/spec/coverage.json b/spec/coverage.json
new file mode 100644
index 0000000..a9476c9
--- /dev/null
+++ b/spec/coverage.json
@@ -0,0 +1,9 @@
+{
+ "spec_dir": "spec",
+ "spec_files": [
+ "unit/**/*[sS]pec.js",
+ "e2e/**/*[sS]pec.js"
+ ],
+ "stopSpecOnExpectationFailure": false,
+ "random": false
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org