You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by js...@apache.org on 2014/06/27 21:31:27 UTC

[1/2] git commit: CB-7042 serve.spec: enable basic serve test

Repository: cordova-lib
Updated Branches:
  refs/heads/master 86f097f2b -> 306d4e5d8


CB-7042 serve.spec: enable basic serve test


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

Branch: refs/heads/master
Commit: e24bfb646fcfdccf6e8de632dafd1bcb05be9bf5
Parents: 86f097f
Author: Josh Soref <js...@blackberry.com>
Authored: Fri Jun 27 15:29:46 2014 -0400
Committer: Josh Soref <js...@blackberry.com>
Committed: Fri Jun 27 15:29:46 2014 -0400

----------------------------------------------------------------------
 cordova-lib/spec-cordova/serve.spec.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/e24bfb64/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 600c366..2ec1836 100644
--- a/cordova-lib/spec-cordova/serve.spec.js
+++ b/cordova-lib/spec-cordova/serve.spec.js
@@ -31,7 +31,7 @@ var cordova = require('../src/cordova/cordova'),
 
 var cwd = process.cwd();
 
-xdescribe('serve command', function() {
+describe('serve command', function() {
     beforeEach(function() {
         // Make a temp directory
         shell.rm('-rf', tempDir);
@@ -49,8 +49,7 @@ xdescribe('serve command', function() {
         }).toThrow();
     });
 
-
-    describe('`serve`', function() {
+    xdescribe('`serve`', function() {
         var payloads = {
             android: 'This is the Android test file.',
             ios: 'This is the iOS test file.'


[2/2] git commit: CB-7042 serve.spec: really expect not a Cordova-based project exception

Posted by js...@apache.org.
CB-7042 serve.spec: really expect not a Cordova-based project exception


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

Branch: refs/heads/master
Commit: 306d4e5d834fc504353c9c95cca9a3211f53125e
Parents: e24bfb6
Author: Josh Soref <js...@blackberry.com>
Authored: Fri Jun 27 15:30:20 2014 -0400
Committer: Josh Soref <js...@blackberry.com>
Committed: Fri Jun 27 15:30:20 2014 -0400

----------------------------------------------------------------------
 cordova-lib/spec-cordova/serve.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/306d4e5d/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 2ec1836..1a1c96a 100644
--- a/cordova-lib/spec-cordova/serve.spec.js
+++ b/cordova-lib/spec-cordova/serve.spec.js
@@ -46,7 +46,7 @@ describe('serve command', function() {
 
         expect(function() {
             cordova.serve('android');
-        }).toThrow();
+        }).toThrow("Current working directory is not a Cordova-based project.");
     });
 
     xdescribe('`serve`', function() {