You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2014/08/16 00:04:22 UTC
[1/4] git commit: Fix failing tests. update_jsproj and update_csproj
are now just update_proj
Repository: cordova-lib
Updated Branches:
refs/heads/master c8adbc2a0 -> 8fd058300
Fix failing tests. update_jsproj and update_csproj are now just update_proj
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/2cf51abe
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/2cf51abe
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/2cf51abe
Branch: refs/heads/master
Commit: 2cf51abe2b57703432979cda93e614137aa59a0a
Parents: c8adbc2
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Fri Aug 15 14:17:17 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Fri Aug 15 14:17:17 2014 -0700
----------------------------------------------------------------------
cordova-lib/spec-cordova/metadata/windows8_parser.spec.js | 6 +++---
cordova-lib/spec-cordova/metadata/wp8_parser.spec.js | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/2cf51abe/cordova-lib/spec-cordova/metadata/windows8_parser.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/metadata/windows8_parser.spec.js b/cordova-lib/spec-cordova/metadata/windows8_parser.spec.js
index b4b804f..75b651c 100644
--- a/cordova-lib/spec-cordova/metadata/windows8_parser.spec.js
+++ b/cordova-lib/spec-cordova/metadata/windows8_parser.spec.js
@@ -132,9 +132,9 @@ describe('windows8 project parser', function() {
});
});
describe('update_www method', function() {
- var update_jsproj;
+ var update_proj;
beforeEach(function() {
- update_jsproj = spyOn(parser, 'update_jsproj');
+ update_proj = spyOn(parser, 'update_proj');
});
it('should rm project-level www and cp in platform agnostic www', function() {
parser.update_www(path.join('lib','dir'));
@@ -147,7 +147,7 @@ describe('windows8 project parser', function() {
beforeEach(function() {
config = spyOn(parser, 'update_from_config');
www = spyOn(parser, 'update_www');
- www = spyOn(parser, 'update_jsproj');
+ www = spyOn(parser, 'update_proj');
shellls = spyOn(shell, 'ls').andReturn([]);
svn = spyOn(util, 'deleteSvnFolders');
exists.andReturn(false);
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/2cf51abe/cordova-lib/spec-cordova/metadata/wp8_parser.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/metadata/wp8_parser.spec.js b/cordova-lib/spec-cordova/metadata/wp8_parser.spec.js
index bf05411..45c5e4a 100644
--- a/cordova-lib/spec-cordova/metadata/wp8_parser.spec.js
+++ b/cordova-lib/spec-cordova/metadata/wp8_parser.spec.js
@@ -147,9 +147,9 @@ describe('wp8 project parser', function() {
});
});
describe('update_www method', function() {
- var update_csproj;
+ var update_proj;
beforeEach(function() {
- update_csproj = spyOn(p, 'update_csproj');
+ update_proj = spyOn(p, 'update_proj');
});
it('should rm project-level www and cp in platform agnostic www', function() {
p.update_www();
@@ -163,7 +163,7 @@ describe('wp8 project parser', function() {
config = spyOn(p, 'update_from_config');
www = spyOn(p, 'update_www');
svn = spyOn(util, 'deleteSvnFolders');
- csproj = spyOn(p, 'update_csproj');
+ csproj = spyOn(p, 'update_proj');
exists.andReturn(false);
});
it('should call update_from_config', function(done) {
[2/4] git commit: Fixing failing tests: update_proj should be
update_project
Posted by pu...@apache.org.
Fixing failing tests: update_proj should be update_project
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/3d21ee9d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/3d21ee9d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/3d21ee9d
Branch: refs/heads/master
Commit: 3d21ee9d268ff724bc678f05420c52915b3e6c7c
Parents: 2cf51ab
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Fri Aug 15 14:29:45 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Fri Aug 15 14:29:45 2014 -0700
----------------------------------------------------------------------
cordova-lib/spec-cordova/metadata/windows8_parser.spec.js | 6 +++---
cordova-lib/spec-cordova/metadata/wp8_parser.spec.js | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/3d21ee9d/cordova-lib/spec-cordova/metadata/windows8_parser.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/metadata/windows8_parser.spec.js b/cordova-lib/spec-cordova/metadata/windows8_parser.spec.js
index 75b651c..7e03404 100644
--- a/cordova-lib/spec-cordova/metadata/windows8_parser.spec.js
+++ b/cordova-lib/spec-cordova/metadata/windows8_parser.spec.js
@@ -132,9 +132,9 @@ describe('windows8 project parser', function() {
});
});
describe('update_www method', function() {
- var update_proj;
+ var update_project;
beforeEach(function() {
- update_proj = spyOn(parser, 'update_proj');
+ update_project = spyOn(parser, 'update_project');
});
it('should rm project-level www and cp in platform agnostic www', function() {
parser.update_www(path.join('lib','dir'));
@@ -147,7 +147,7 @@ describe('windows8 project parser', function() {
beforeEach(function() {
config = spyOn(parser, 'update_from_config');
www = spyOn(parser, 'update_www');
- www = spyOn(parser, 'update_proj');
+ www = spyOn(parser, 'update_project');
shellls = spyOn(shell, 'ls').andReturn([]);
svn = spyOn(util, 'deleteSvnFolders');
exists.andReturn(false);
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/3d21ee9d/cordova-lib/spec-cordova/metadata/wp8_parser.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/metadata/wp8_parser.spec.js b/cordova-lib/spec-cordova/metadata/wp8_parser.spec.js
index 45c5e4a..2c5451c 100644
--- a/cordova-lib/spec-cordova/metadata/wp8_parser.spec.js
+++ b/cordova-lib/spec-cordova/metadata/wp8_parser.spec.js
@@ -147,9 +147,9 @@ describe('wp8 project parser', function() {
});
});
describe('update_www method', function() {
- var update_proj;
+ var update_project;
beforeEach(function() {
- update_proj = spyOn(p, 'update_proj');
+ update_project = spyOn(p, 'update_project');
});
it('should rm project-level www and cp in platform agnostic www', function() {
p.update_www();
@@ -158,12 +158,12 @@ describe('wp8 project parser', function() {
});
});
describe('update_project method', function() {
- var config, www, overrides, svn, csproj;
+ var config, www, overrides, svn, proj;
beforeEach(function() {
config = spyOn(p, 'update_from_config');
www = spyOn(p, 'update_www');
svn = spyOn(util, 'deleteSvnFolders');
- csproj = spyOn(p, 'update_proj');
+ proj = spyOn(p, 'update_project');
exists.andReturn(false);
});
it('should call update_from_config', function(done) {
[4/4] git commit: Don't spy and expect it to call the other spy ...
Posted by pu...@apache.org.
Don't spy and expect it to call the other spy ...
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/8fd05830
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/8fd05830
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/8fd05830
Branch: refs/heads/master
Commit: 8fd058300d8f8dd37e8bd0fb5a233190c18c2974
Parents: c68974f
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Fri Aug 15 15:02:12 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Fri Aug 15 15:02:12 2014 -0700
----------------------------------------------------------------------
cordova-lib/spec-cordova/metadata/wp8_parser.spec.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/8fd05830/cordova-lib/spec-cordova/metadata/wp8_parser.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/metadata/wp8_parser.spec.js b/cordova-lib/spec-cordova/metadata/wp8_parser.spec.js
index 2c5451c..dd85d26 100644
--- a/cordova-lib/spec-cordova/metadata/wp8_parser.spec.js
+++ b/cordova-lib/spec-cordova/metadata/wp8_parser.spec.js
@@ -158,12 +158,11 @@ describe('wp8 project parser', function() {
});
});
describe('update_project method', function() {
- var config, www, overrides, svn, proj;
+ var config, www, overrides, svn;
beforeEach(function() {
config = spyOn(p, 'update_from_config');
www = spyOn(p, 'update_www');
svn = spyOn(util, 'deleteSvnFolders');
- proj = spyOn(p, 'update_project');
exists.andReturn(false);
});
it('should call update_from_config', function(done) {
[3/4] git commit: Well that looks like an error
Posted by pu...@apache.org.
Well that looks like an error
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/c68974f1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/c68974f1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/c68974f1
Branch: refs/heads/master
Commit: c68974f184a7bdf91da8fc3ae8ca53ebf753165e
Parents: 3d21ee9
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Fri Aug 15 14:53:03 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Fri Aug 15 14:53:03 2014 -0700
----------------------------------------------------------------------
cordova-lib/spec-cordova/metadata/windows8_parser.spec.js | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/c68974f1/cordova-lib/spec-cordova/metadata/windows8_parser.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/metadata/windows8_parser.spec.js b/cordova-lib/spec-cordova/metadata/windows8_parser.spec.js
index 7e03404..2d9c3f3 100644
--- a/cordova-lib/spec-cordova/metadata/windows8_parser.spec.js
+++ b/cordova-lib/spec-cordova/metadata/windows8_parser.spec.js
@@ -147,7 +147,6 @@ describe('windows8 project parser', function() {
beforeEach(function() {
config = spyOn(parser, 'update_from_config');
www = spyOn(parser, 'update_www');
- www = spyOn(parser, 'update_project');
shellls = spyOn(shell, 'ls').andReturn([]);
svn = spyOn(util, 'deleteSvnFolders');
exists.andReturn(false);