incubator-callback-commits mailing list archives

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

Branch: refs/heads/master
Commit: 54df5d836c5d7b82786e42403c8720997abf4a21
Parents: e4fecc3
Author: Gord Tanner <gtanner@gmail.com>
Authored: Mon Apr 2 16:04:31 2012 -0400
Committer: Fil Maj <maj.fil@gmail.com>
Committed: Mon Apr 16 16:06:19 2012 -0700

----------------------------------------------------------------------
 autotest/pages/battery.html |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/54df5d83/autotest/pages/battery.html
----------------------------------------------------------------------
diff --git a/autotest/pages/battery.html b/autotest/pages/battery.html
index 49c9511..42bbada 100644
--- a/autotest/pages/battery.html
+++ b/autotest/pages/battery.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;" />
@@ -53,10 +54,17 @@
 =======
 =======
 >>>>>>> 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 API Specs</title>
+
+>>>>>>> added jasmine runner and ported 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>
@@ -66,6 +74,7 @@
   <script type="text/javascript" src="../html/SuiteView.js"></script>
   <script type="text/javascript" src="../html/TrivialReporter.js"></script>
 
+<<<<<<< HEAD
   <!-- Source -->
   <script type="text/javascript" src="../../phonegap.js"></script>
 
@@ -74,6 +83,14 @@
 
   <!-- Tests -->
   <script type="text/javascript" src="../tests/battery.tests.js"></script>
+=======
+  <!-- include source files here... -->
+  <script type="text/javascript" src="../../phonegap.js"></script>
+
+  <!-- include spec files here... -->
+  <script type="text/javascript" src="../tests/battery.tests.js"></script>
+
+>>>>>>> added jasmine runner and ported battery tests
   <script type="text/javascript">
     document.addEventListener('deviceready', function () {
       var jasmineEnv = jasmine.getEnv();
@@ -96,9 +113,12 @@
   <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;" />
@@ -148,7 +168,12 @@
         </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>
 
 


Mime
View raw message