incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fil...@apache.org
Subject [12/37] spec commit: updating all.html to use jasmine and fixing syntax errors in file tests
Date Wed, 18 Apr 2012 21:49:52 GMT
updating all.html to use jasmine and fixing syntax errors in file tests


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/commit/4087293b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/tree/4087293b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/diff/4087293b

Branch: refs/heads/master
Commit: 4087293bb16af24f2fefa4899d7eb6a0a7a1bb0c
Parents: 689b9fd
Author: Fil Maj <maj.fil@gmail.com>
Authored: Thu Apr 12 14:06:52 2012 -0700
Committer: Fil Maj <maj.fil@gmail.com>
Committed: Mon Apr 16 16:06:54 2012 -0700

----------------------------------------------------------------------
 autotest/pages/all.html      |   17 +++++++++++++++++
 autotest/tests/file.tests.js |    6 +++---
 2 files changed, 20 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/4087293b/autotest/pages/all.html
----------------------------------------------------------------------
diff --git a/autotest/pages/all.html b/autotest/pages/all.html
index d12345c..7063cd4 100644
--- a/autotest/pages/all.html
+++ b/autotest/pages/all.html
@@ -2,6 +2,7 @@
 <html>
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   <head>
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
     <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes,
initial-scale=1.0;" />
@@ -66,6 +67,10 @@
 =======
 =======
 >>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp;
javascript:
+=======
+=======
+>>>>>>> updating all.html to use jasmine and fixing syntax errors in
file tests
+>>>>>>> updating all.html to use jasmine and fixing syntax errors in
file tests
 <head>
   <title>Cordova: API Specs</title>
 
@@ -93,7 +98,11 @@
   <script type="text/javascript" src="../tests/contacts.tests.js"></script>
   <script type="text/javascript" src="../tests/camera.tests.js"></script>
   <script type="text/javascript" src="../tests/device.tests.js"></script>
+<<<<<<< HEAD
   <!-- <script type="text/javascript" src="../tests/file.tests.js"></script>
-->
+=======
+  <script type="text/javascript" src="../tests/file.tests.js"></script>
+>>>>>>> updating all.html to use jasmine and fixing syntax errors in
file tests
   <script type="text/javascript" src="../tests/geolocation.tests.js"></script>
   <script type="text/javascript" src="../tests/media.tests.js"></script>
   <script type="text/javascript" src="../tests/network.tests.js"></script>
@@ -123,9 +132,12 @@
   <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
 </body>
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> converted all (commented out file for now)
 =======
 =======
+>>>>>>> updating all.html to use jasmine and fixing syntax errors in
file tests
+=======
   <head>
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
     <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes,
initial-scale=1.0;" />
@@ -188,5 +200,10 @@
         </div>
     </body>
 >>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp;
javascript:
+<<<<<<< HEAD
 >>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp;
javascript:
+=======
+=======
+>>>>>>> updating all.html to use jasmine and fixing syntax errors in
file tests
+>>>>>>> updating all.html to use jasmine and fixing syntax errors in
file tests
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/4087293b/autotest/tests/file.tests.js
----------------------------------------------------------------------
diff --git a/autotest/tests/file.tests.js b/autotest/tests/file.tests.js
index c8c62ae..2eb81c7 100644
--- a/autotest/tests/file.tests.js
+++ b/autotest/tests/file.tests.js
@@ -81,7 +81,7 @@ describe('File API', function() {
         it("should define FileError constants", function() {
             expect(FileError.NOT_FOUND_ERR).toBe(1);
             expect(FileError.SECURITY_ERR).toBe(2);
-            expect(FileError.ABORT_ERR).tobe(3);
+            expect(FileError.ABORT_ERR).toBe(3);
             expect(FileError.NOT_READABLE_ERR).toBe(4);
             expect(FileError.ENCODING_ERR).toBe(5);
             expect(FileError.NO_MODIFICATION_ALLOWED_ERR).toBe(6);
@@ -452,7 +452,7 @@ describe('File API', function() {
             // create file to kick off it
             runs(function() {
                 root.getFile(fileName, {create:true}, getFile, fail);
-            }):
+            });
 
             waitsFor(function() { return getFile.wasCalled; }, "getFile was never called",
Tests.TEST_TIMEOUT);
         });
@@ -1661,7 +1661,7 @@ describe('File API', function() {
                         directory.getFile(file1, {create: true}, copyDir, fail);
                     });
 
-                    waitsFor(function() { retun copyDir.wasCalled; }, "copyDir never called",
Tests.TEST_TIMEOUT);
+                    waitsFor(function() { return copyDir.wasCalled; }, "copyDir never called",
Tests.TEST_TIMEOUT);
                 }),
                 itCopy = jasmine.createSpy().andCallFake(function(directory) {
                     expect(directory).toBeDefined();


Mime
View raw message