You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2012/04/18 23:49:52 UTC
[29/37] spec commit: converted all (commented out file for now)
converted all (commented out file for now)
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/85dd586e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/tree/85dd586e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/diff/85dd586e
Branch: refs/heads/master
Commit: 85dd586ecad8b4f80e777af579b498bff5a1e9dc
Parents: 6617fad
Author: Gord Tanner <gt...@gmail.com>
Authored: Mon Apr 9 16:14:54 2012 -0400
Committer: Fil Maj <ma...@gmail.com>
Committed: Mon Apr 16 16:05:23 2012 -0700
----------------------------------------------------------------------
autotest/pages/all.html | 60 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/85dd586e/autotest/pages/all.html
----------------------------------------------------------------------
diff --git a/autotest/pages/all.html b/autotest/pages/all.html
index 6b045ab..33ec8c5 100644
--- a/autotest/pages/all.html
+++ b/autotest/pages/all.html
@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html>
+<<<<<<< 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;" />
@@ -61,5 +62,62 @@
<!-- Populated by tests -->
</div>
</body>
-</html>
+=======
+<head>
+ <title>Cordova: API Specs</title>
+
+ <!-- Load jasmine -->
+ <link href="../jasmine.css" rel="stylesheet"/>
+ <script type="text/javascript" src="../jasmine.js"></script>
+ <script type="text/javascript" src="../html/HtmlReporterHelpers.js"></script>
+ <script type="text/javascript" src="../html/HtmlReporter.js"></script>
+ <script type="text/javascript" src="../html/ReporterView.js"></script>
+ <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>
+
+ <!-- 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 () {
+ 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 all (commented out file for now)
+</html>