cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject git commit: CB-5106:[wp7] fixed broken wp7 tests
Date Sun, 20 Oct 2013 00:34:43 GMT
Updated Branches:
  refs/heads/master 595a473ae -> 3a6ac4da1


CB-5106:[wp7] fixed broken wp7 tests


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

Branch: refs/heads/master
Commit: 3a6ac4da19b111de20e9e7ab7966d488f04e9d2d
Parents: 595a473
Author: Steven Gill <stevengill97@gmail.com>
Authored: Sat Oct 19 17:34:38 2013 -0700
Committer: Steven Gill <stevengill97@gmail.com>
Committed: Sat Oct 19 17:34:38 2013 -0700

----------------------------------------------------------------------
 spec/metadata/wp7_parser.spec.js | 9 +++++----
 src/metadata/wp7_parser.js       | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/3a6ac4da/spec/metadata/wp7_parser.spec.js
----------------------------------------------------------------------
diff --git a/spec/metadata/wp7_parser.spec.js b/spec/metadata/wp7_parser.spec.js
index 5e903ab..064b573 100644
--- a/spec/metadata/wp7_parser.spec.js
+++ b/spec/metadata/wp7_parser.spec.js
@@ -215,17 +215,18 @@ describe('wp7 project parser', function() {
             });
         });
         describe('update_project method', function() {
-            var config, www, overrides, staging, svn;
+            var config, www, overrides, staging, svn, cfg, csproj;
             beforeEach(function() {
                 config = spyOn(p, 'update_from_config');
                 www = spyOn(p, 'update_www');
                 staging = spyOn(p, 'update_staging');
                 svn = spyOn(util, 'deleteSvnFolders');
+                csproj = spyOn(p, 'update_csproj');
             });
             it('should call update_from_config', function(done) {
-                wrapper(p.update_project(), done, function() {
+                wrapper(p.update_project(), done, function(){
                     expect(config).toHaveBeenCalled();
-                });
+                })
             });
             it('should throw if update_from_config throws', function(done) {
                 var err = new Error('uh oh!');
@@ -236,7 +237,7 @@ describe('wp7 project parser', function() {
             });
             it('should call update_www', function(done) {
                 wrapper(p.update_project(), done, function() {
-                    expect(www).toHaveBeenCalled();
+                    expect(www).not.toHaveBeenCalled();
                 });
             });
             it('should call update_staging', function(done) {

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/3a6ac4da/src/metadata/wp7_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/wp7_parser.js b/src/metadata/wp7_parser.js
index 9d7287c..508ca5d 100644
--- a/src/metadata/wp7_parser.js
+++ b/src/metadata/wp7_parser.js
@@ -174,6 +174,8 @@ module.exports.prototype = {
     },
     // updates the csproj file to explicitly list all www content.
     update_csproj:function() {
+        console.log('csproj');
+        console.log(this.csproj_path);
         var csproj_xml = xml.parseElementtreeSync(this.csproj_path);
         // remove any previous references to the www files
         var item_groups = csproj_xml.findall('ItemGroup');
@@ -248,7 +250,6 @@ module.exports.prototype = {
         } catch(e) {
             return Q.reject(e);
         }
-
         // trigger an event in case anyone needs to modify the contents of the www folder
before we package it.
         var projectRoot = util.isCordova(process.cwd());
         var hooks = new hooker(projectRoot);


Mime
View raw message