incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fil...@apache.org
Subject [23/37] spec commit: updated test-runner and changed title of battery tests
Date Wed, 18 Apr 2012 21:49:52 GMT
updated test-runner and changed title of battery 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/0a24c60a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/tree/0a24c60a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/diff/0a24c60a

Branch: refs/heads/master
Commit: 0a24c60a05c3988853a3f9658730331cdedae6bc
Parents: 54df5d8
Author: Gord Tanner <gtanner@gmail.com>
Authored: Mon Apr 2 17:33:21 2012 -0400
Committer: Fil Maj <maj.fil@gmail.com>
Committed: Mon Apr 16 16:06:27 2012 -0700

----------------------------------------------------------------------
 autotest/pages/battery.html |   19 ++++++++++++++++---
 autotest/test-runner.js     |    5 +++++
 2 files changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/0a24c60a/autotest/pages/battery.html
----------------------------------------------------------------------
diff --git a/autotest/pages/battery.html b/autotest/pages/battery.html
index 42bbada..ffd8b39 100644
--- a/autotest/pages/battery.html
+++ b/autotest/pages/battery.html
@@ -62,9 +62,13 @@
   <!-- Load jasmine -->
 =======
 <head>
-  <title>Cordova API Specs</title>
+  <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>
@@ -75,6 +79,7 @@
   <script type="text/javascript" src="../html/TrivialReporter.js"></script>
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   <!-- Source -->
   <script type="text/javascript" src="../../phonegap.js"></script>
 
@@ -85,12 +90,20 @@
   <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>
 
-  <!-- include spec files here... -->
-  <script type="text/javascript" src="../tests/battery.tests.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();

http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/0a24c60a/autotest/test-runner.js
----------------------------------------------------------------------
diff --git a/autotest/test-runner.js b/autotest/test-runner.js
index d64bb45..243f2da 100644
--- a/autotest/test-runner.js
+++ b/autotest/test-runner.js
@@ -1,5 +1,6 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 // Prevent QUnit from running when the DOM load event fires
 QUnit.config.autostart = false;
 if (window.sessionStorage != null) {
@@ -9,10 +10,14 @@ if (window.sessionStorage != null) {
 sessionStorage.clear();
 >>>>>>> updated test-runner and changed title of battery tests
 =======
+=======
+>>>>>>> updated test-runner and changed title of battery tests
 sessionStorage.clear();
 =======
 // Prevent QUnit from running when the DOM load event fires
 QUnit.config.autostart = false;
+=======
+>>>>>>> updated test-runner and changed title of battery tests
 if (window.sessionStorage != null) {
     window.sessionStorage.clear();
 }


Mime
View raw message