You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2016/06/06 22:59:15 UTC
[1/3] cordova-lib git commit: [CB-11252] Fix cordova-fetch tests
Repository: cordova-lib
Updated Branches:
refs/heads/master 79cfdfd9c -> e4b317beb
[CB-11252] Fix cordova-fetch tests
It's only a scoped package if the @ is the first character.
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/a0d46057
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/a0d46057
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/a0d46057
Branch: refs/heads/master
Commit: a0d46057566d454b110016af75f112ee190d9b57
Parents: 79cfdfd
Author: Darryl Pogue <da...@dpogue.ca>
Authored: Sat Jun 4 21:56:41 2016 -0700
Committer: Darryl Pogue <da...@dpogue.ca>
Committed: Sat Jun 4 21:56:41 2016 -0700
----------------------------------------------------------------------
cordova-fetch/index.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a0d46057/cordova-fetch/index.js
----------------------------------------------------------------------
diff --git a/cordova-fetch/index.js b/cordova-fetch/index.js
index 99b622b..51d6c42 100644
--- a/cordova-fetch/index.js
+++ b/cordova-fetch/index.js
@@ -152,7 +152,7 @@ function trimID(target) {
//also support scoped packages
if(target.indexOf('@') != -1) {
parts = target.split('@');
- if (parts.length > 1) {
+ if (parts.length > 1 && parts[0] === '') {
//scoped package
target = '@' + parts[1];
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/3] cordova-lib git commit: Revert "attempting to fix failing
travis and appveyor tests"
Posted by st...@apache.org.
Revert "attempting to fix failing travis and appveyor tests"
This reverts commit bebbbe78cf8f9fecc95e99433b41fea625eb3c33.
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/260eac4c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/260eac4c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/260eac4c
Branch: refs/heads/master
Commit: 260eac4ce961c5de27f788ca323c652e549db679
Parents: a0d4605
Author: Darryl Pogue <da...@dpogue.ca>
Authored: Sat Jun 4 21:59:58 2016 -0700
Committer: Darryl Pogue <da...@dpogue.ca>
Committed: Sat Jun 4 21:59:58 2016 -0700
----------------------------------------------------------------------
.travis.yml | 6 ++++--
appveyor.yml | 6 ++----
cordova-fetch/spec/fetch.spec.js | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/260eac4c/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 590804e..438d1f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,9 +11,10 @@ install:
- git clone https://github.com/apache/cordova-js --depth 10
- cd cordova-lib
- npm link ../cordova-js
- - (cd ../cordova-common && npm install && npm link)
- - npm link cordova-common
+ - npm link ../cordova-common
- npm link ../cordova-serve
+ - (cd ../cordova-fetch && npm link ../cordova-common && npm install)
+ - npm link ../cordova-fetch
- npm install
# Workaround for npm/npm#10343 when dependency of linked module is moved to dependent
# module's 'node_modules' In our case 'cordova-common' -> jshint' -> 'cli' dependency
@@ -22,4 +23,5 @@ install:
script:
- "(cd ../cordova-common && npm test)"
+ - "(cd ../cordova-fetch && npm test)"
- "npm run ci"
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/260eac4c/appveyor.yml
----------------------------------------------------------------------
diff --git a/appveyor.yml b/appveyor.yml
index eae312d..b6a02cd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,14 +5,12 @@ install:
- git clone https://github.com/apache/cordova-js --depth 10
- cd cordova-lib
- npm link ../cordova-js
- - cd ../cordova-common
- - npm install
+ - npm link ../cordova-common
+ - npm link ../cordova-serve
- cd ../cordova-fetch
- npm link ../cordova-common
- npm install
- cd ../cordova-lib
- - npm link ../cordova-common
- - npm link ../cordova-serve
- npm link ../cordova-fetch
- npm install
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/260eac4c/cordova-fetch/spec/fetch.spec.js
----------------------------------------------------------------------
diff --git a/cordova-fetch/spec/fetch.spec.js b/cordova-fetch/spec/fetch.spec.js
index 31dc9c8..32fdb98 100644
--- a/cordova-fetch/spec/fetch.spec.js
+++ b/cordova-fetch/spec/fetch.spec.js
@@ -299,7 +299,7 @@ describe('fetch failure with git subdirectory', function () {
}, 30000);
});
-/*describe('scoped plugin fetch/uninstall tests via npm', function () {
+describe('scoped plugin fetch/uninstall tests via npm', function () {
var tmpDir = helpers.tmpDir('scoped_plug_fetch');
var opts = {};
@@ -327,4 +327,4 @@ describe('fetch failure with git subdirectory', function () {
})
.fin(done);
}, 30000);
-});*/
+});
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/3] cordova-lib git commit: Fix node 6 failure in travis.
Posted by st...@apache.org.
Fix node 6 failure in travis.
This closes #454
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/e4b317be
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/e4b317be
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/e4b317be
Branch: refs/heads/master
Commit: e4b317bebfaf97076cc95a2566db50ce7bb5814b
Parents: 260eac4
Author: Darryl Pogue <da...@dpogue.ca>
Authored: Sat Jun 4 22:30:48 2016 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Mon Jun 6 10:58:47 2016 -0700
----------------------------------------------------------------------
.travis.yml | 1 +
cordova-lib/spec-cordova/create.spec.js | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/e4b317be/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 438d1f4..6922a88 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,7 @@ install:
# module's 'node_modules' In our case 'cordova-common' -> jshint' -> 'cli' dependency
# is moved to 'cordova-lib' and hence 'npm run jshint' on 'cordova-common' is failing
- "(cd ../cordova-common && npm install)"
+ - (cd ../cordova-fetch && npm install && npm link ../cordova-common)
script:
- "(cd ../cordova-common && npm test)"
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/e4b317be/cordova-lib/spec-cordova/create.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/create.spec.js b/cordova-lib/spec-cordova/create.spec.js
index c7ad91d..f4a8bdf 100644
--- a/cordova-lib/spec-cordova/create.spec.js
+++ b/cordova-lib/spec-cordova/create.spec.js
@@ -205,6 +205,7 @@ describe('create end-to-end', function() {
})
.fin(done);
}, 60000);
+ */
it('should successfully run with NPM package --fetch', function(done) {
// Call cordova create with no args, should return help.
@@ -219,7 +220,7 @@ describe('create end-to-end', function() {
expect(err).toBeUndefined();
})
.fin(done);
- });*/
+ });
it('should successfully run with template not having a package.json at toplevel', function(done) {
// Call cordova create with no args, should return help.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org