cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jso...@apache.org
Subject git commit: CB-7056 serve: fix Android test, make tests conditional
Date Wed, 02 Jul 2014 17:04:08 GMT
Repository: cordova-lib
Updated Branches:
  refs/heads/master 53f7b2272 -> fe873fd12


CB-7056 serve: fix Android test, make tests conditional

Fix **Android** merges codepath, as it turns out that merges
doesn't need the platform specific hack.

Adding **BlackBerry 10** test.

**Android**, **iOS** and **BlackBerry 10** require specific scripts
to be available, otherwise they fail.

Introduce `itifapps` and `cit` (conditional `it`) based on **Jasmine**'s:

* `xit` -- ignore test
* `iit` -- run these tests, but skip it tests
* `it` -- run these tests, unless there are iit tests


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

Branch: refs/heads/master
Commit: fe873fd12b87ebc52866bb1f494ffdaa31a278b7
Parents: 53f7b22
Author: Josh Soref <jsoref@blackberry.com>
Authored: Wed Jul 2 12:54:10 2014 -0400
Committer: Josh Soref <jsoref@blackberry.com>
Committed: Wed Jul 2 12:58:58 2014 -0400

----------------------------------------------------------------------
 cordova-lib/spec-cordova/serve.spec.js | 54 ++++++++++++++++++++++-------
 1 file changed, 41 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/fe873fd1/cordova-lib/spec-cordova/serve.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/serve.spec.js b/cordova-lib/spec-cordova/serve.spec.js
index 4572913..fecbe25 100644
--- a/cordova-lib/spec-cordova/serve.spec.js
+++ b/cordova-lib/spec-cordova/serve.spec.js
@@ -48,7 +48,7 @@ describe('serve command', function() {
         process.env.PWD = cwd;
         shell.rm('-rf', tempDir);
     })
-    it('should not run outside of a Cordova-based project', function() {
+    iit('should not run outside of a Cordova-based project', function() {
         process.chdir(tempDir);
 
         expect(function() {
@@ -70,7 +70,18 @@ describe('serve command', function() {
             payloads = {};
         });
 
+        function cit(cond) {
+            if (cond) {
+                return iit;
+            }
+            return it;
+        }
+        function itifapps(apps) {
+            return cit(apps.every(function (bin) {return shell.which(bin);}));
+        }
+
         function test_serve(platform, ref, expectedContents, opts) {
+            var timeout = opts && 'timeout' in opts && opts.timeout || 1000;
             return function() {
                 var server;
                 runs(function() {
@@ -82,7 +93,7 @@ describe('serve command', function() {
                             var d = Q.defer();
                             plats.push(d.promise);
                             cordova.raw.platform('add', plat, {spawnoutput:'ignore'}).then(function
() {
-                                var dir = path.join(tempDir, 'merges', plat, plat == 'android'
? 'assets' : '');
+                                var dir = path.join(tempDir, 'merges', plat);
                                 shell.mkdir('-p', dir);
                                 // Write testing HTML files into the directory.
                                 fs.writeFileSync(path.join(dir, 'test.html'), payloads[plat]);
@@ -109,7 +120,7 @@ describe('serve command', function() {
 
                 waitsFor(function() {
                     return server || failed;
-                }, 'the server should start', 1000);
+                }, 'the server should start', timeout);
 
                 var done, errorCB;
                 runs(function() {
@@ -129,8 +140,10 @@ describe('serve command', function() {
                             response += data;
                         });
                         res.on('end', function() {
-                            expect(res.statusCode).toEqual(200);
-                            expect(response).toEqual(expectedContents);
+                            expect(response).toEqual(expectedContents)
+                            if (response === expectedContents) {
+                                expect(res.statusCode).toEqual(200);
+                            }
                             done = true;
                         });
                     }).on('error', errorCB);
@@ -138,7 +151,7 @@ describe('serve command', function() {
 
                 waitsFor(function() {
                     return done || failed;
-                }, 'the HTTP request should complete', 1000);
+                }, 'the HTTP request should complete', timeout);
 
                 runs(function() {
                     if (!failed) {
@@ -151,7 +164,7 @@ describe('serve command', function() {
             };
         };
 
-        it('should serve from top-level www if the file exists there', function() {
+        iit('should serve from top-level www if the file exists there', function() {
             var payload = 'This is test file.';
             payloads.firefoxos = 'This is the firefoxos test file.'
             test_serve('firefoxos', '/basictest.html', payload, {
@@ -161,7 +174,7 @@ describe('serve command', function() {
             })();
         });
 
-        it('should honour a custom port setting', function() {
+        iit('should honour a custom port setting', function() {
             var payload = 'This is test file.';
             payloads.firefoxos = 'This is the firefoxos test file.'
             test_serve('firefoxos', '/basictest.html', payload, {
@@ -172,17 +185,32 @@ describe('serve command', function() {
             })();
         });
 
-        it('should fall back to assets/www on Android', function() {
+        itifapps([
+            'android',
+            'ant',
+        ])('should fall back to assets/www on Android', function() {
             payloads.android = 'This is the Android test file.';
-            test_serve('android', '/test.html', payloads.android)();
+            test_serve('android', '/test.html', payloads.android, {timeout: 20000})();
+        });
+
+        itifapps([
+            'blackberry-nativepackager',
+            'blackberry-deploy',
+            'blackberry-signer',
+            'blackberry-debugtokenrequest',
+        ])('should fall back to www on BlackBerry10', function() {
+            payloads.blackberry10 = 'This is the BlackBerry10 test file.';
+            test_serve('blackberry10', '/test.html', payloads.blackberry10, {timeout: 10000})();
         });
 
-        it('should fall back to www on iOS', function() {
+        itifapps([
+            'xcodebuild',
+        ])('should fall back to www on iOS', function() {
             payloads.ios = 'This is the iOS test file.';
-            test_serve('ios', '/test.html', payloads.ios)();
+            test_serve('ios', '/test.html', payloads.ios, {timeout: 10000})();
         });
 
-        it('should fall back to www on firefoxos', function() {
+        iit('should fall back to www on firefoxos', function() {
             payloads.firefoxos = 'This is the firefoxos test file.';
             test_serve('firefoxos', '/test.html', payloads.firefoxos)();
         });


Mime
View raw message