You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sg...@apache.org on 2015/05/11 17:58:02 UTC
spec commit: CB-8992 Do not install mobilespec tests when --plugins
specified
Repository: cordova-mobile-spec
Updated Branches:
refs/heads/master ca815abbb -> d7d43d687
CB-8992 Do not install mobilespec tests when --plugins specified
github close #128
Project: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/commit/d7d43d68
Tree: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/tree/d7d43d68
Diff: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/diff/d7d43d68
Branch: refs/heads/master
Commit: d7d43d687d5b74e163b368eb41320e331cf40b74
Parents: ca815ab
Author: alsorokin <al...@akvelon.com>
Authored: Mon May 11 10:38:14 2015 +0300
Committer: sgrebnov <v-...@microsoft.com>
Committed: Mon May 11 18:58:13 2015 +0300
----------------------------------------------------------------------
createmobilespec/createmobilespec.js | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/blob/d7d43d68/createmobilespec/createmobilespec.js
----------------------------------------------------------------------
diff --git a/createmobilespec/createmobilespec.js b/createmobilespec/createmobilespec.js
index 6f7b2ad..0bfa76a 100755
--- a/createmobilespec/createmobilespec.js
+++ b/createmobilespec/createmobilespec.js
@@ -546,11 +546,14 @@ function installPlugins() {
console.log("Installing local test framework plugins...");
var linkPluginsFlag = (argv.link || argv.linkplugins) ? ' --link' : '';
- pluginAdd('org.apache.cordova.mobilespec.tests', mobile_spec_git_dir, linkPluginsFlag + browserifyFlag);
+ // Install mobilespec tests only if we install default list of plugins
+ // If custom list of plugins is being installed, mobilespec tests can be listed there, if needed
+ if (!argv.plugins) {
+ pluginAdd('org.apache.cordova.mobilespec.tests', mobile_spec_git_dir, linkPluginsFlag + browserifyFlag);
+ }
pluginAdd('org.apache.cordova.test.whitelist', mobile_spec_git_dir, linkPluginsFlag + browserifyFlag);
pluginAdd('org.apache.cordova.test.echo', mobile_spec_git_dir, linkPluginsFlag + browserifyFlag);
-
pluginAdd('cordova-plugin-test-framework', searchPath, linkPluginsFlag + browserifyFlag);
pluginAdd('cordova-plugin-device', searchPath, linkPluginsFlag + browserifyFlag);
@@ -562,7 +565,10 @@ function installPlugins() {
pluginAdd('cordova-plugin-crosswalk-webview', searchPath, linkPluginsFlag + browserifyFlag);
}
- pluginAdd(plugins.join(' '), searchPath, linkPluginsFlag + browserifyFlag);
+ plugins.forEach(function(p) {
+ var sp = SEARCH_PATHS.hasOwnProperty(p) ? SEARCH_PATHS[p] : searchPath;
+ pluginAdd(p, sp, linkPluginsFlag + browserifyFlag);
+ });
if (argv.thirdpartyplugins || argv.cprplugins) {
var mapVars = ' --variable API_KEY_FOR_ANDROID="AIzaSyBICVSs9JqT7WdASuN5HSe7w-pCE0n_X88" --variable API_KEY_FOR_IOS="AIzaSyAikyYG24YYFvq5Vy41P5kppsfO2GgF9jM"';
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org