cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fil...@apache.org
Subject git commit: 2.4.8. Fixed a bug where i hardcoded a path. baaad. added test for it.
Date Fri, 15 Feb 2013 22:11:40 GMT
Updated Branches:
  refs/heads/master 61d29e137 -> d3a59100b


2.4.8. Fixed a bug where i hardcoded a path. baaad. added test for it.


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

Branch: refs/heads/master
Commit: d3a59100bb023c1bc9878b877d4aaf069b74a4b4
Parents: 61d29e1
Author: Fil Maj <maj.fil@gmail.com>
Authored: Fri Feb 15 14:11:35 2013 -0800
Committer: Fil Maj <maj.fil@gmail.com>
Committed: Fri Feb 15 14:11:35 2013 -0800

----------------------------------------------------------------------
 package.json         |    2 +-
 spec/prepare.spec.js |    8 ++++----
 src/prepare.js       |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/d3a59100/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index fec2a0b..f5b8e21 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova",
-  "version": "2.4.7",
+  "version": "2.4.8",
   "preferGlobal": "true",
   "description": "Cordova command line interface tool",
   "main": "cordova",

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/d3a59100/spec/prepare.spec.js
----------------------------------------------------------------------
diff --git a/spec/prepare.spec.js b/spec/prepare.spec.js
index be0a1d3..f232b3e 100644
--- a/spec/prepare.spec.js
+++ b/spec/prepare.spec.js
@@ -55,19 +55,19 @@ describe('prepare command', function() {
         // move platform project fixtures over to fake cordova into thinking platforms were
added
         // TODO: possibly add this to helper?
         shell.mv('-f', path.join(cordova_project, 'platforms', 'blackberry'), path.join(tempDir));
-        shell.mv('-f', path.join(cordova_project, 'platforms', 'ios'), path.join(tempDir));
         this.after(function() {
             process.chdir(cwd);
             shell.mv('-f', path.join(tempDir, 'blackberry'), path.join(cordova_project, 'platforms',
'blackberry'));
-            shell.mv('-f', path.join(tempDir, 'ios'), path.join(cordova_project, 'platforms',
'ios'));
         });
 
         process.chdir(cordova_project);
 
-        var parser_spy = spyOn(android_parser.prototype, 'update_project');
+        var a_parser_spy = spyOn(android_parser.prototype, 'update_project');
+        var i_parser_spy = spyOn(ios_parser.prototype, 'update_project');
         expect(function() {
             cordova.prepare();
-            expect(parser_spy).toHaveBeenCalled();
+            expect(a_parser_spy).toHaveBeenCalled();
+            expect(i_parser_spy).toHaveBeenCalled();
         }).not.toThrow();
     });
     it('should not run outside of a Cordova-based project', function() {

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/d3a59100/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 36a1604..fda8d5a 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -73,7 +73,7 @@ module.exports = function prepare(platforms, callback) {
 
     // Iterate over each added platform
     platforms.forEach(function(platform) {
-        var platformPath = path.join(projectRoot, 'platforms', 'android');
+        var platformPath = path.join(projectRoot, 'platforms', platform);
         var parser = new parsers[platform](platformPath);
         parser.update_project(cfg, end);
     });


Mime
View raw message