Skip to content

Commit

Permalink
Merge pull request apache#10 from stevengill/master
Browse files Browse the repository at this point in the history
Fixed failing tests

 This closes apache#608
  • Loading branch information
audreyso authored and stevengill committed Dec 13, 2017
2 parents 99400b5 + c374b7e commit fcc5601
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
1 change: 0 additions & 1 deletion integration-tests/pkgJson-restore.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,6 @@ describe('tests platform/spec restore with --save', function () {
var configXmlPath = path.join(cwd, 'config.xml');
var configPlugins;
var configPlugin;

emptyPlatformList().then(function () {
// Add plugin with save and fetch.
return cordovaPlugin('add', ['https://github.com/apache/cordova-plugin-splashscreen'], {'save': true, 'fetch': true});
Expand Down
3 changes: 3 additions & 0 deletions integration-tests/plugman_fetch.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,9 @@ describe('fetch', function () {

var srcDir = path.join(plugins_dir, 'recursivePlug');
var appDir = path.join(plugins_dir, 'recursivePlug', 'demo');
fetch.__set__('fetch', function (pluginDir) {
return Q(pluginDir);
});

if (/^win/.test(process.platform)) {
it('Test 020 : should copy all but the /demo/ folder', function (done) {
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
},
"dependencies": {
"aliasify": "^2.1.0",
"cordova-common": "2.1.1",
"cordova-create": "~1.1.0",
"cordova-fetch": "1.2.1",
"cordova-js": "4.2.2",
"cordova-common": "^2.2.0",
"cordova-create": "^1.1.0",
"cordova-fetch": "^1.2.1",
"cordova-js": "^4.2.2",
"cordova-serve": "^2.0.0",
"dep-graph": "1.1.0",
"detect-indent": "^5.0.0",
Expand Down

0 comments on commit fcc5601

Please sign in to comment.