cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaz...@apache.org
Subject ios commit: CB-11424 - AppVeyor test failures (path separator) on cordova-ios platform
Date Mon, 13 Jun 2016 22:21:46 GMT
Repository: cordova-ios
Updated Branches:
  refs/heads/master 9fbc20fed -> d16ffe238


CB-11424 - AppVeyor test failures (path separator) on cordova-ios platform


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

Branch: refs/heads/master
Commit: d16ffe23844769a153a07081404f20e3f9b3d8ce
Parents: 9fbc20f
Author: Shazron Abdullah <shazron@apache.org>
Authored: Mon Jun 13 15:22:45 2016 -0700
Committer: Shazron Abdullah <shazron@apache.org>
Committed: Mon Jun 13 15:22:45 2016 -0700

----------------------------------------------------------------------
 tests/spec/unit/prepare.spec.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/d16ffe23/tests/spec/unit/prepare.spec.js
----------------------------------------------------------------------
diff --git a/tests/spec/unit/prepare.spec.js b/tests/spec/unit/prepare.spec.js
index 2a2c93a..8776b15 100644
--- a/tests/spec/unit/prepare.spec.js
+++ b/tests/spec/unit/prepare.spec.js
@@ -418,22 +418,22 @@ describe('prepare', function () {
         };
 
         it('should update project-level www and with platform agnostic www and merges', function()
{
-            var merges_path = path.join(project.root, 'merges/ios');
+            var merges_path = path.join(project.root, 'merges', 'ios');
             shell.mkdir('-p', merges_path);
             updateWww(project, p.locations);
             expect(FileUpdater.mergeAndUpdateDir).toHaveBeenCalledWith(
-                [ 'www', 'platforms/ios/platform_www', 'merges/ios' ],
-                'platforms/ios/www',
+                [ 'www', path.join('platforms', 'ios', 'platform_www'), path.join('merges','ios')
],
+                path.join('platforms', 'ios', 'www'),
                 { rootDir : iosProject },
                 logFileOp);
         });
         it('should skip merges if merges directory does not exist', function() {
-            var merges_path = path.join(project.root, 'merges/ios');
+            var merges_path = path.join(project.root, 'merges', 'ios');
             shell.rm('-rf', merges_path);
             updateWww(project, p.locations);
             expect(FileUpdater.mergeAndUpdateDir).toHaveBeenCalledWith(
-                [ 'www', 'platforms/ios/platform_www' ],
-                'platforms/ios/www',
+                [ 'www', path.join('platforms', 'ios', 'platform_www') ],
+                path.join('platforms', 'ios', 'www'),
                 { rootDir : iosProject },
                 logFileOp);
         });


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


Mime
View raw message