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/08/01 22:23:16 UTC

[57/61] [abbrv] cordova-create git commit: updated jasmine dep, fixed caching issue with tests

updated jasmine dep, fixed caching issue with tests


Project: http://git-wip-us.apache.org/repos/asf/cordova-create/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-create/commit/6904ba95
Tree: http://git-wip-us.apache.org/repos/asf/cordova-create/tree/6904ba95
Diff: http://git-wip-us.apache.org/repos/asf/cordova-create/diff/6904ba95

Branch: refs/heads/master
Commit: 6904ba95fe2cc6f1420958e88ffe1cb764f6fab7
Parents: 32fc3e8
Author: Steve Gill <st...@gmail.com>
Authored: Tue Jul 19 18:26:21 2016 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Jul 19 18:26:21 2016 -0700

----------------------------------------------------------------------
 index.js            | 4 +++-
 package.json        | 2 +-
 spec/create.spec.js | 4 ----
 3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-create/blob/6904ba95/index.js
----------------------------------------------------------------------
diff --git a/index.js b/index.js
index 4a153d1..b0b3950 100644
--- a/index.js
+++ b/index.js
@@ -211,6 +211,8 @@ module.exports = function(dir, optionalId, optionalName, cfg, extEvents) {
         //handle when input wants to specify sub-directory (specified in index.js as "dirname" export); 
         var isSubDir = false;
         try {
+            // Delete cached require incase one exists
+            delete require.cache[require.resolve(input_directory)];
             var templatePkg = require(input_directory);
             if (templatePkg && templatePkg.dirname){
                 import_from_path = templatePkg.dirname;
@@ -407,4 +409,4 @@ function writeToConfigJson(project_root, opts, autoPersist) {
     } else {
         return json; 
     } 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/cordova-create/blob/6904ba95/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 6e5de80..a053596 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "valid-identifier": "0.0.1"
   },
   "devDependencies": {
-    "jasmine-node": "1.14.5",
+    "jasmine": "^2.4.1",
     "jshint": "2.5.8"
   },
   "scripts": {

http://git-wip-us.apache.org/repos/asf/cordova-create/blob/6904ba95/spec/create.spec.js
----------------------------------------------------------------------
diff --git a/spec/create.spec.js b/spec/create.spec.js
index d58986f..d6e719c 100644
--- a/spec/create.spec.js
+++ b/spec/create.spec.js
@@ -105,7 +105,6 @@ describe('create end-to-end', function() {
     });
 
     function checkProject() {
-        console.log('hi');
         // Check if top level dirs exist.
         var dirs = ['hooks', 'platforms', 'plugins', 'www'];
         dirs.forEach(function(d) {
@@ -190,7 +189,6 @@ describe('create end-to-end', function() {
         // Call cordova create with no args, should return help.
         Q()
             .then(function() {
-                console.log('creating proj');
                 // Create a real project
                 return create(project, appId, appName, configGit);
             })
@@ -207,8 +205,6 @@ describe('create end-to-end', function() {
         Q()
             .then(function() {
                 // Create a real project
-                console.log('creating proj2');
-                console.log(project, appId, appName, configNPM);
                 return create(project, appId, appName, configNPM);
             })
             .then(checkProject)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org