incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fil...@apache.org
Subject [7/37] spec commit: somehow i really messed up my rebase: sorry everyone. things should be fixed
Date Wed, 18 Apr 2012 21:49:52 GMT
somehow i really messed up my rebase: sorry everyone. things should be fixed


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/f0a6df28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/tree/f0a6df28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/diff/f0a6df28

Branch: refs/heads/master
Commit: f0a6df28a2e1fd94927d00eefe3bb73ad5bc0f8c
Parents: acaf0ee
Author: Fil Maj <maj.fil@gmail.com>
Authored: Mon Apr 16 16:26:26 2012 -0700
Committer: Fil Maj <maj.fil@gmail.com>
Committed: Mon Apr 16 16:26:26 2012 -0700

----------------------------------------------------------------------
 autotest/pages/accelerometer.html |  142 ------------
 autotest/pages/all.html           |  150 -------------
 autotest/pages/battery.html       |  152 -------------
 autotest/pages/camera.html        |  122 -----------
 autotest/pages/capture.html       |  136 ------------
 autotest/pages/compass.html       |  122 +----------
 autotest/pages/contacts.html      |  122 +----------
 autotest/pages/device.html        |  122 +----------
 autotest/pages/geolocation.html   |  109 +---------
 autotest/pages/media.html         |  109 +---------
 autotest/pages/network.html       |  109 +---------
 autotest/pages/notification.html  |  109 +---------
 autotest/pages/platform.html      |  109 +---------
 autotest/pages/storage.html       |  109 +---------
 autotest/tests/compass.tests.js   |  147 -------------
 autotest/tests/storage.tests.js   |  375 --------------------------------
 16 files changed, 9 insertions(+), 2235 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/f0a6df28/autotest/pages/accelerometer.html
----------------------------------------------------------------------
diff --git a/autotest/pages/accelerometer.html b/autotest/pages/accelerometer.html
index 00f85d7..6134ffd 100644
--- a/autotest/pages/accelerometer.html
+++ b/autotest/pages/accelerometer.html
@@ -1,63 +1,5 @@
 <!DOCTYPE html>
 <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;" />
-
-    <title>Cordova: Accelerometer API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/accelerometer.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Accelerometer API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-=======
-=======
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
-=======
-=======
->>>>>>> converted accel tests
->>>>>>> converted accel tests
 <head>
   <title>Cordova: Accelerometer API Specs</title>
 
@@ -79,83 +21,6 @@
 
   <!-- Tests -->
   <script type="text/javascript" src="../tests/accelerometer.tests.js"></script>
-<<<<<<< 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;" />
-
-    <title>Cordova: Accelerometer API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/accelerometer.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Accelerometer API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-=======
-
-  <script type="text/javascript">
-    document.addEventListener('deviceready', function () {
-      var jasmineEnv = jasmine.getEnv();
-      jasmineEnv.updateInterval = 1000;
-
-      var htmlReporter = new jasmine.HtmlReporter();
-
-      jasmineEnv.addReporter(htmlReporter);
-
-      jasmineEnv.specFilter = function(spec) {
-        return htmlReporter.specFilter(spec);
-      };
-
-      jasmineEnv.execute();
-    }, false);
-  </script>
-</head>
-
-<body>
-  <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
-</body>
->>>>>>> converted accel tests
-</html>
-<<<<<<< HEAD
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
 
   <script type="text/javascript">
     document.addEventListener('deviceready', function () {
@@ -164,7 +29,6 @@
 
       var htmlReporter = new jasmine.HtmlReporter();
 
-<<<<<<< HEAD
       jasmineEnv.addReporter(htmlReporter);
 
       jasmineEnv.specFilter = function(spec) {
@@ -179,10 +43,4 @@
 <body>
   <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
 </body>
->>>>>>> converted accel tests
 </html>
-=======
-
->>>>>>> converted accel tests
-=======
->>>>>>> converted some more tests to jasmine

http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/f0a6df28/autotest/pages/all.html
----------------------------------------------------------------------
diff --git a/autotest/pages/all.html b/autotest/pages/all.html
index 7063cd4..b230501 100644
--- a/autotest/pages/all.html
+++ b/autotest/pages/all.html
@@ -1,76 +1,5 @@
 <!DOCTYPE html>
 <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;" />
-
-    <title>Cordova: All API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/accelerometer.tests.js"></script>
-    <script type="text/javascript" src="../tests/battery.tests.js"></script>
-    <script type="text/javascript" src="../tests/capture.tests.js"></script>
-    <script type="text/javascript" src="../tests/compass.tests.js"></script>
-    <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>
-    <script type="text/javascript" src="../tests/file.tests.js"></script>
-    <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>
-    <script type="text/javascript" src="../tests/notification.tests.js"></script>
-    <script type="text/javascript" src="../tests/platform.tests.js"></script>
-    <script type="text/javascript" src="../tests/storage.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: All API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-=======
-=======
->>>>>>> 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>
 
@@ -98,11 +27,7 @@
   <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>
@@ -131,79 +56,4 @@
 <body>
   <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;" />
-
-    <title>Cordova: All API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/accelerometer.tests.js"></script>
-    <script type="text/javascript" src="../tests/battery.tests.js"></script>
-    <script type="text/javascript" src="../tests/capture.tests.js"></script>
-    <script type="text/javascript" src="../tests/compass.tests.js"></script>
-    <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>
-    <script type="text/javascript" src="../tests/file.tests.js"></script>
-    <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>
-    <script type="text/javascript" src="../tests/notification.tests.js"></script>
-    <script type="text/javascript" src="../tests/platform.tests.js"></script>
-    <script type="text/javascript" src="../tests/storage.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: All API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </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/f0a6df28/autotest/pages/battery.html
----------------------------------------------------------------------
diff --git a/autotest/pages/battery.html b/autotest/pages/battery.html
index ffd8b39..ac1172c 100644
--- a/autotest/pages/battery.html
+++ b/autotest/pages/battery.html
@@ -1,74 +1,7 @@
 <!DOCTYPE html>
 <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;" />
-
-    <title>Cordova: Battery API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/battery.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Battery API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-=======
-=======
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
-=======
->>>>>>> added jasmine runner and ported battery tests
 <head>
   <title>Cordova: Battery API Specs</title>
-
-  <!-- Load jasmine -->
-=======
-<head>
-  <title>Cordova: Battery API Specs</title>
-
-<<<<<<< HEAD
->>>>>>> added jasmine runner and ported battery tests
-=======
-  <!-- Load jasmine -->
->>>>>>> updated test-runner and changed title of battery tests
   <link href="../jasmine.css" rel="stylesheet"/>
   <script type="text/javascript" src="../jasmine.js"></script>
   <script type="text/javascript" src="../html/HtmlReporterHelpers.js"></script>
@@ -77,10 +10,6 @@
   <script type="text/javascript" src="../html/SpecView.js"></script>
   <script type="text/javascript" src="../html/SuiteView.js"></script>
   <script type="text/javascript" src="../html/TrivialReporter.js"></script>
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-  <!-- Source -->
   <script type="text/javascript" src="../../phonegap.js"></script>
 
   <!-- Load Test Runner -->
@@ -88,22 +17,6 @@
 
   <!-- Tests -->
   <script type="text/javascript" src="../tests/battery.tests.js"></script>
-=======
-  <!-- include source files here... -->
-=======
-  <!-- Source -->
->>>>>>> updated test-runner and changed title of battery tests
-  <script type="text/javascript" src="../../phonegap.js"></script>
-
-  <!-- Load Test Runner -->
-  <script type="text/javascript" src="../test-runner.js"></script>
-
-<<<<<<< HEAD
->>>>>>> added jasmine runner and ported battery tests
-=======
-  <!-- Tests -->
-  <script type="text/javascript" src="../tests/battery.tests.js"></script>
->>>>>>> updated test-runner and changed title of battery tests
   <script type="text/javascript">
     document.addEventListener('deviceready', function () {
       var jasmineEnv = jasmine.getEnv();
@@ -125,69 +38,4 @@
 <body>
   <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
 </body>
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> added jasmine runner and ported battery tests
-=======
-=======
->>>>>>> added jasmine runner and ported battery 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;" />
-
-    <title>Cordova: Battery API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/battery.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Battery API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
-<<<<<<< HEAD
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
-=======
-=======
->>>>>>> added jasmine runner and ported battery tests
->>>>>>> added jasmine runner and ported battery tests
 </html>
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/f0a6df28/autotest/pages/camera.html
----------------------------------------------------------------------
diff --git a/autotest/pages/camera.html b/autotest/pages/camera.html
index 5b80261..c7464fb 100644
--- a/autotest/pages/camera.html
+++ b/autotest/pages/camera.html
@@ -1,63 +1,6 @@
 <!DOCTYPE html>
 <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;" />
 
-    <title>Cordova: Camera API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/camera.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Camera API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-=======
-=======
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
-=======
-=======
->>>>>>> converted camera tests
->>>>>>> converted camera tests
 <head>
   <title>Cordova: Camera API Specs</title>
 
@@ -101,69 +44,4 @@
 <body>
   <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
 </body>
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> converted camera tests
-=======
-=======
->>>>>>> converted camera 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;" />
-
-    <title>Cordova: Camera API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/camera.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Camera API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
-<<<<<<< HEAD
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
-=======
-=======
->>>>>>> converted camera tests
->>>>>>> converted camera tests
 </html>
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/f0a6df28/autotest/pages/capture.html
----------------------------------------------------------------------
diff --git a/autotest/pages/capture.html b/autotest/pages/capture.html
index 1e37595..dea1e54 100644
--- a/autotest/pages/capture.html
+++ b/autotest/pages/capture.html
@@ -1,63 +1,6 @@
 <!DOCTYPE html>
 <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;" />
 
-    <title>Cordova: Capture API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/capture.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Capture API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-=======
-=======
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
-=======
-=======
->>>>>>> converted capture tests
->>>>>>> converted capture tests
 <head>
   <title>Cordova: Capture API Specs</title>
 
@@ -79,57 +22,6 @@
 
   <!-- Tests -->
   <script type="text/javascript" src="../tests/capture.tests.js"></script>
-<<<<<<< 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;" />
-
-    <title>Cordova: Capture API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/capture.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Capture API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-=======
 
   <script type="text/javascript">
     document.addEventListener('deviceready', function () {
@@ -152,33 +44,5 @@
 <body>
   <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
 </body>
->>>>>>> converted capture tests
 </html>
-<<<<<<< HEAD
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
-
-  <script type="text/javascript">
-    document.addEventListener('deviceready', function () {
-      var jasmineEnv = jasmine.getEnv();
-      jasmineEnv.updateInterval = 1000;
 
-      var htmlReporter = new jasmine.HtmlReporter();
-
-      jasmineEnv.addReporter(htmlReporter);
-
-      jasmineEnv.specFilter = function(spec) {
-        return htmlReporter.specFilter(spec);
-      };
-
-      jasmineEnv.execute();
-    }, false);
-  </script>
-</head>
-
-<body>
-  <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
-</body>
->>>>>>> converted capture tests
-</html>
-=======
->>>>>>> converted some more tests to jasmine

http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/f0a6df28/autotest/pages/compass.html
----------------------------------------------------------------------
diff --git a/autotest/pages/compass.html b/autotest/pages/compass.html
index 9a23f40..64a76f1 100644
--- a/autotest/pages/compass.html
+++ b/autotest/pages/compass.html
@@ -1,64 +1,6 @@
 <!DOCTYPE html>
 <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;" />
 
-    <title>Cordova: Compass API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/compass.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Compass API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
-=======
-=======
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
-=======
-=======
->>>>>>> converted some more tests to jasmine
->>>>>>> converted some more tests to jasmine
 <head>
   <title>Cordova: Compass API Specs</title>
 
@@ -80,69 +22,6 @@
 
   <!-- Tests -->
   <script type="text/javascript" src="../tests/compass.tests.js"></script>
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> converted some more tests to jasmine
-=======
-=======
->>>>>>> converted some more tests to jasmine
-=======
-  <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;" />
-
-    <title>Cordova: Compass API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/compass.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Compass API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
-<<<<<<< HEAD
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
-=======
-=======
->>>>>>> converted some more tests to jasmine
->>>>>>> converted some more tests to jasmine
 
   <script type="text/javascript">
     document.addEventListener('deviceready', function () {
@@ -166,3 +45,4 @@
   <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
 </body>
 </html>
+

http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/f0a6df28/autotest/pages/contacts.html
----------------------------------------------------------------------
diff --git a/autotest/pages/contacts.html b/autotest/pages/contacts.html
index 4dae647..671524c 100644
--- a/autotest/pages/contacts.html
+++ b/autotest/pages/contacts.html
@@ -1,64 +1,6 @@
 <!DOCTYPE html>
 <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;" />
 
-    <title>Cordova: Contacts API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/contacts.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Contacts API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
-=======
-=======
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
-=======
-=======
->>>>>>> converted some more tests to jasmine
->>>>>>> converted some more tests to jasmine
 <head>
   <title>Cordova: Contacts API Specs</title>
 
@@ -80,69 +22,6 @@
 
   <!-- Tests -->
   <script type="text/javascript" src="../tests/contacts.tests.js"></script>
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> converted some more tests to jasmine
-=======
-=======
->>>>>>> converted some more tests to jasmine
-=======
-  <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;" />
-
-    <title>Cordova: Contacts API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/contacts.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Contacts API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
-<<<<<<< HEAD
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
-=======
-=======
->>>>>>> converted some more tests to jasmine
->>>>>>> converted some more tests to jasmine
 
   <script type="text/javascript">
     document.addEventListener('deviceready', function () {
@@ -166,3 +45,4 @@
   <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
 </body>
 </html>
+

http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/f0a6df28/autotest/pages/device.html
----------------------------------------------------------------------
diff --git a/autotest/pages/device.html b/autotest/pages/device.html
index 5af6785..4de7eea 100644
--- a/autotest/pages/device.html
+++ b/autotest/pages/device.html
@@ -1,64 +1,6 @@
 <!DOCTYPE html>
 <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;" />
 
-    <title>Cordova: Device API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/device.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Device API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
-=======
-=======
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
-=======
-=======
->>>>>>> converted some more tests to jasmine
->>>>>>> converted some more tests to jasmine
 <head>
   <title>Cordova: Device API Specs</title>
 
@@ -80,69 +22,6 @@
 
   <!-- Tests -->
   <script type="text/javascript" src="../tests/device.tests.js"></script>
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> converted some more tests to jasmine
-=======
-=======
->>>>>>> converted some more tests to jasmine
-=======
-  <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;" />
-
-    <title>Cordova: Device API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/device.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Device API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
-<<<<<<< HEAD
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
-=======
-=======
->>>>>>> converted some more tests to jasmine
->>>>>>> converted some more tests to jasmine
 
   <script type="text/javascript">
     document.addEventListener('deviceready', function () {
@@ -166,3 +45,4 @@
   <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
 </body>
 </html>
+

http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/f0a6df28/autotest/pages/geolocation.html
----------------------------------------------------------------------
diff --git a/autotest/pages/geolocation.html b/autotest/pages/geolocation.html
index cba0386..0a15c87 100644
--- a/autotest/pages/geolocation.html
+++ b/autotest/pages/geolocation.html
@@ -1,59 +1,6 @@
 <!DOCTYPE html>
 <html>
-<<<<<<< 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;" />
 
-    <title>Cordova: Geolocation API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/geolocation.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Geolocation API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
-=======
-=======
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
 <head>
   <title>Cordova: Geolocation API Specs</title>
 
@@ -75,61 +22,6 @@
 
   <!-- Tests -->
   <script type="text/javascript" src="../tests/geolocation.tests.js"></script>
-<<<<<<< HEAD
->>>>>>> converted some more tests to jasmine
-=======
-=======
-  <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;" />
-
-    <title>Cordova: Geolocation API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/geolocation.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Geolocation API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
 
   <script type="text/javascript">
     document.addEventListener('deviceready', function () {
@@ -153,3 +45,4 @@
   <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
 </body>
 </html>
+

http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/f0a6df28/autotest/pages/media.html
----------------------------------------------------------------------
diff --git a/autotest/pages/media.html b/autotest/pages/media.html
index 2be19bc..d04ce00 100644
--- a/autotest/pages/media.html
+++ b/autotest/pages/media.html
@@ -1,59 +1,6 @@
 <!DOCTYPE html>
 <html>
-<<<<<<< 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;" />
 
-    <title>Cordova: Media API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/media.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Media API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
-=======
-=======
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
 <head>
   <title>Cordova: Media API Specs</title>
 
@@ -75,61 +22,6 @@
 
   <!-- Tests -->
   <script type="text/javascript" src="../tests/media.tests.js"></script>
-<<<<<<< HEAD
->>>>>>> converted some more tests to jasmine
-=======
-=======
-  <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;" />
-
-    <title>Cordova: Media API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/media.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Media API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
 
   <script type="text/javascript">
     document.addEventListener('deviceready', function () {
@@ -153,3 +45,4 @@
   <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
 </body>
 </html>
+

http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/f0a6df28/autotest/pages/network.html
----------------------------------------------------------------------
diff --git a/autotest/pages/network.html b/autotest/pages/network.html
index 76c352e..180dd08 100644
--- a/autotest/pages/network.html
+++ b/autotest/pages/network.html
@@ -1,59 +1,6 @@
 <!DOCTYPE html>
 <html>
-<<<<<<< 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;" />
 
-    <title>Cordova: Network API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/network.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Network API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
-=======
-=======
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
 <head>
   <title>Cordova: Network API Specs</title>
 
@@ -75,61 +22,6 @@
 
   <!-- Tests -->
   <script type="text/javascript" src="../tests/network.tests.js"></script>
-<<<<<<< HEAD
->>>>>>> converted some more tests to jasmine
-=======
-=======
-  <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;" />
-
-    <title>Cordova: Network API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/network.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Network API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
 
   <script type="text/javascript">
     document.addEventListener('deviceready', function () {
@@ -153,3 +45,4 @@
   <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
 </body>
 </html>
+

http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/f0a6df28/autotest/pages/notification.html
----------------------------------------------------------------------
diff --git a/autotest/pages/notification.html b/autotest/pages/notification.html
index 2bd5c07..857be90 100644
--- a/autotest/pages/notification.html
+++ b/autotest/pages/notification.html
@@ -1,59 +1,6 @@
 <!DOCTYPE html>
 <html>
-<<<<<<< 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;" />
 
-    <title>Cordova: Notification API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/notification.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Notification API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
-=======
-=======
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
 <head>
   <title>Cordova: Notification API Specs</title>
 
@@ -75,61 +22,6 @@
 
   <!-- Tests -->
   <script type="text/javascript" src="../tests/notification.tests.js"></script>
-<<<<<<< HEAD
->>>>>>> converted some more tests to jasmine
-=======
-=======
-  <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;" />
-
-    <title>Cordova: Notification API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/notification.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Notification API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
 
   <script type="text/javascript">
     document.addEventListener('deviceready', function () {
@@ -153,3 +45,4 @@
   <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
 </body>
 </html>
+

http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/f0a6df28/autotest/pages/platform.html
----------------------------------------------------------------------
diff --git a/autotest/pages/platform.html b/autotest/pages/platform.html
index 86e36c6..4e16990 100644
--- a/autotest/pages/platform.html
+++ b/autotest/pages/platform.html
@@ -1,59 +1,6 @@
 <!DOCTYPE html>
 <html>
-<<<<<<< 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;" />
 
-    <title>Cordova: Platform API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/platform.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Platform API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
-=======
-=======
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
 <head>
   <title>Cordova: Platform API Specs</title>
 
@@ -75,61 +22,6 @@
 
   <!-- Tests -->
   <script type="text/javascript" src="../tests/platform.tests.js"></script>
-<<<<<<< HEAD
->>>>>>> converted some more tests to jasmine
-=======
-=======
-  <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;" />
-
-    <title>Cordova: Platform API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/platform.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Platform API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
 
   <script type="text/javascript">
     document.addEventListener('deviceready', function () {
@@ -153,3 +45,4 @@
   <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
 </body>
 </html>
+

http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/f0a6df28/autotest/pages/storage.html
----------------------------------------------------------------------
diff --git a/autotest/pages/storage.html b/autotest/pages/storage.html
index 901eca9..854cdd6 100644
--- a/autotest/pages/storage.html
+++ b/autotest/pages/storage.html
@@ -1,59 +1,6 @@
 <!DOCTYPE html>
 <html>
-<<<<<<< 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;" />
 
-    <title>Cordova: Storage API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/storage.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Storage API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
-=======
-=======
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
 <head>
   <title>Cordova: Storage API Specs</title>
 
@@ -75,61 +22,6 @@
 
   <!-- Tests -->
   <script type="text/javascript" src="../tests/storage.tests.js"></script>
-<<<<<<< HEAD
->>>>>>> converted some more tests to jasmine
-=======
-=======
-  <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;" />
-
-    <title>Cordova: Storage API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/storage.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Storage API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
->>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
 
   <script type="text/javascript">
     document.addEventListener('deviceready', function () {
@@ -153,3 +45,4 @@
   <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
 </body>
 </html>
+

http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/f0a6df28/autotest/tests/compass.tests.js
----------------------------------------------------------------------
diff --git a/autotest/tests/compass.tests.js b/autotest/tests/compass.tests.js
index 924dcb4..a16ec0e 100644
--- a/autotest/tests/compass.tests.js
+++ b/autotest/tests/compass.tests.js
@@ -5,40 +5,8 @@ describe('Compass (navigator.compass)', function () {
 
     it("should contain a getCurrentHeading function", function() {
         expect(navigator.compass.getCurrentHeading).toBeDefined();
-<<<<<<< HEAD
 		expect(typeof navigator.compass.getCurrentHeading == 'function').toBe(true);
 	});
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-	test("getCurrentHeading success callback should be called with a Heading object", function() {
-		expect(9);
-		QUnit.stop(Tests.TEST_TIMEOUT);
-		var win = function(a) {
-			ok(a instanceof CompassHeading, "Heading object returned in getCurrentHeading success callback should be an instance of CompassHeading.");
-			ok(a.magneticHeading !== null, "Heading object returned in getCurrentHeading success callback should have an 'magneticHeading' property.");
-			ok(typeof a.magneticHeading == 'number', "Heading object's 'magneticHeading' property returned in getCurrentHeading success callback should be of type 'number'.");
-			ok(a.trueHeading !== undefined, "Heading object returned in getCurrentHeading success callback should have a 'trueHeading' property.");
-			ok(typeof a.trueHeading == 'number' || a.trueHeading === null, "Heading object's 'trueHeading' property returned in getCurrentHeading success callback should be of type 'number', or should be null if not available.");
-			ok(a.headingAccuracy !== undefined, "Heading object returned in getCurrentHeading success callback should have a 'headingAccuracy' property.");
-			ok(typeof a.headingAccuracy == 'number' || a.headingAccuracy === null, "Heading object's 'headingAccuracy' property returned in getCurrentHeading success callback should be of type 'number', or should be null if not available.");
-			ok(a.timestamp !== null, "Heading object returned in getCurrentHeading success callback should have a 'timestamp' property.");
-			ok(typeof a.timestamp == 'number', "Heading object's 'timestamp' property returned in getCurrentHeading success callback should be of type 'number'.");
-			QUnit.start();
-		};
-		var fail = function() { QUnit.start(); };
-		navigator.compass.getCurrentHeading(win, fail);
-=======
-=======
->>>>>>> Fixes CB-439 Compass timestamp specified in milliseconds
-=======
-=======
->>>>>>> converted some more tests to jasmine
->>>>>>> converted some more tests to jasmine
-=======
-        expect(typeof navigator.compass.getCurrentHeading == 'function').toBe(true);
-    });
->>>>>>> bmping timeout to 5 secs and fixing compass tests
 
     it("getCurrentHeading success callback should be called with a Heading object", function() {
         var win = jasmine.createSpy().andCallFake(function(a) {
@@ -63,44 +31,7 @@ describe('Compass (navigator.compass)', function () {
             expect(fail).not.toHaveBeenCalled();
             expect(win).toHaveBeenCalled();
         });
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> converted some more tests to jasmine
-=======
-=======
->>>>>>> converted some more tests to jasmine
-=======
->>>>>>> bmping timeout to 5 secs and fixing compass tests
-=======
-	test("getCurrentHeading success callback should be called with a Heading object", function() {
-		expect(9);
-		QUnit.stop(Tests.TEST_TIMEOUT);
-		var win = function(a) {
-			ok(a instanceof CompassHeading, "Heading object returned in getCurrentHeading success callback should be an instance of CompassHeading.");
-			ok(a.magneticHeading !== null, "Heading object returned in getCurrentHeading success callback should have an 'magneticHeading' property.");
-			ok(typeof a.magneticHeading == 'number', "Heading object's 'magneticHeading' property returned in getCurrentHeading success callback should be of type 'number'.");
-			ok(a.trueHeading !== undefined, "Heading object returned in getCurrentHeading success callback should have a 'trueHeading' property.");
-			ok(typeof a.trueHeading == 'number' || a.trueHeading === null, "Heading object's 'trueHeading' property returned in getCurrentHeading success callback should be of type 'number', or should be null if not available.");
-			ok(a.headingAccuracy !== undefined, "Heading object returned in getCurrentHeading success callback should have a 'headingAccuracy' property.");
-			ok(typeof a.headingAccuracy == 'number' || a.headingAccuracy === null, "Heading object's 'headingAccuracy' property returned in getCurrentHeading success callback should be of type 'number', or should be null if not available.");
-			ok(a.timestamp !== null, "Heading object returned in getCurrentHeading success callback should have a 'timestamp' property.");
-			ok(typeof a.timestamp == 'number', "Heading object's 'timestamp' property returned in getCurrentHeading success callback should be of type 'number'.");
-			QUnit.start();
-		};
-		var fail = function() { QUnit.start(); };
-		navigator.compass.getCurrentHeading(win, fail);
->>>>>>> Fixes CB-439 Compass timestamp specified in milliseconds
-<<<<<<< HEAD
->>>>>>> Fixes CB-439 Compass timestamp specified in milliseconds
-=======
-=======
->>>>>>> converted some more tests to jasmine
->>>>>>> converted some more tests to jasmine
 	});
-=======
-    });
->>>>>>> bmping timeout to 5 secs and fixing compass tests
 
     it("should contain a watchHeading function", function() {
         expect(navigator.compass.watchHeading).toBeDefined();
@@ -133,47 +64,7 @@ describe('Compass (navigator.compass)', function () {
             expect(typeof h.timestamp == 'number').toBe(true);
         });
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-  module('Compass Heading model (CompassHeading)');
-  test("CompassHeading function should exist", function() {
-    expect(1);
-    ok(typeof CompassHeading != 'undefined' && CompassHeading !== null, 'CompassHeading should not be null');
-  });
-  test("Creating a new CompassHeading instance with no parameters", function() {
-    expect(5);
-    var h = new CompassHeading();
-    equals(h.magneticHeading, null, "CompassHeading instance should have null magneticHeading property by default");
-    equals(h.trueHeading, null, "CompassHeading instance should have null trueHeading property by default");
-    equals(h.headingAccuracy, null, "CompassHeading instance should have null headingAccuracy property by default");
-    ok(h.timestamp !== null, "CompassHeading instance should have timestamp that is not null by default");
-    ok(typeof h.timestamp == 'number', "CompassHeading instance should have timestamp that is a number.");
-  });
-  test("Creating a new CompassHeading instance with parameters", function() {
-    expect(5);
-    var h = new CompassHeading(1,2,3,4);
-    equals(h.magneticHeading, 1, "CompassHeading instance should have specified magneticHeading.");
-    equals(h.trueHeading, 2, "CompassHeading instance should have specified trueHeading.");
-    equals(h.headingAccuracy, 3, "CompassHeading instance should have specified headingAccuracy.");
-    equals(h.timestamp.valueOf(), 4, "CompassHeading instance should have specified timestamp.");
-    ok(typeof h.timestamp == 'number', "CompassHeading instance should have timestamp that is a number");
-  });
-};
-=======
-=======
->>>>>>> Fixes CB-439 Compass timestamp specified in milliseconds
-=======
-=======
->>>>>>> bmping timeout to 5 secs and fixing compass tests
-=======
->>>>>>> converted some more tests to jasmine
->>>>>>> converted some more tests to jasmine
-        it("Creating a new CompassHeading instance with parameters", function() {
-=======
         it("should be able to creat a new CompassHeading instance with parameters", function() {
->>>>>>> bmping timeout to 5 secs and fixing compass tests
             var h = new CompassHeading(1,2,3,4);
             expect(h.magneticHeading).toBe(1);
             expect(h.trueHeading).toBe(2);
@@ -183,41 +74,3 @@ describe('Compass (navigator.compass)', function () {
         });
     });
 });
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> converted some more tests to jasmine
-=======
-=======
->>>>>>> converted some more tests to jasmine
-=======
-  module('Compass Heading model (CompassHeading)');
-  test("CompassHeading function should exist", function() {
-    expect(1);
-    ok(typeof CompassHeading != 'undefined' && CompassHeading !== null, 'CompassHeading should not be null');
-  });
-  test("Creating a new CompassHeading instance with no parameters", function() {
-    expect(5);
-    var h = new CompassHeading();
-    equals(h.magneticHeading, null, "CompassHeading instance should have null magneticHeading property by default");
-    equals(h.trueHeading, null, "CompassHeading instance should have null trueHeading property by default");
-    equals(h.headingAccuracy, null, "CompassHeading instance should have null headingAccuracy property by default");
-    ok(h.timestamp !== null, "CompassHeading instance should have timestamp that is not null by default");
-    ok(typeof h.timestamp == 'number', "CompassHeading instance should have timestamp that is a number.");
-  });
-  test("Creating a new CompassHeading instance with parameters", function() {
-    expect(5);
-    var h = new CompassHeading(1,2,3,4);
-    equals(h.magneticHeading, 1, "CompassHeading instance should have specified magneticHeading.");
-    equals(h.trueHeading, 2, "CompassHeading instance should have specified trueHeading.");
-    equals(h.headingAccuracy, 3, "CompassHeading instance should have specified headingAccuracy.");
-    equals(h.timestamp.valueOf(), 4, "CompassHeading instance should have specified timestamp.");
-    ok(typeof h.timestamp == 'number', "CompassHeading instance should have timestamp that is a number");
-  });
-};
->>>>>>> Fixes CB-439 Compass timestamp specified in milliseconds
-<<<<<<< HEAD
->>>>>>> Fixes CB-439 Compass timestamp specified in milliseconds
-=======
-=======
->>>>>>> converted some more tests to jasmine
->>>>>>> converted some more tests to jasmine


Mime
View raw message