You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2014/12/02 02:09:33 UTC

[1/2] cordova-plugin-geolocation git commit: CB-8094 Pended auto tests for Windows Store since they require user interaction

Repository: cordova-plugin-geolocation
Updated Branches:
  refs/heads/master e3f968599 -> 41233f66f


CB-8094 Pended auto tests for Windows Store since they require user interaction


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/commit/67bd0fcc
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/tree/67bd0fcc
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/diff/67bd0fcc

Branch: refs/heads/master
Commit: 67bd0fcc47aa49cdc0db610f7a0db2aeefd42c31
Parents: 7dc4400
Author: maria.bukharina <ma...@akvelon.com>
Authored: Fri Nov 28 13:53:56 2014 +0300
Committer: maria.bukharina <ma...@akvelon.com>
Committed: Mon Dec 1 17:53:14 2014 +0300

----------------------------------------------------------------------
 tests/tests.js | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/blob/67bd0fcc/tests/tests.js
----------------------------------------------------------------------
diff --git a/tests/tests.js b/tests/tests.js
index cb187ae..4a99991 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -1,4 +1,4 @@
-/*
+/*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -27,6 +27,7 @@ exports.defineAutoTests = function () {
         expect(true).toBe(true);
         done();
     };
+    var isWindowsStore = (cordova.platformId == "windows8") || (cordova.platformId == "windows" && !WinJS.Utilities.isPhone);
 
     describe('Geolocation (navigator.geolocation)', function () {
 
@@ -56,6 +57,11 @@ exports.defineAutoTests = function () {
         describe('error callback', function () {
 
             it("geolocation.spec.5 should be called if we set timeout to 0 and maximumAge to a very small number", function (done) {
+                // this test asks for using geolocation and interrupts autotests running.
+                // That's why we have to pending that for Windows Store 8.0/8.1 apps
+                if (isWindowsStore) {
+                    pending();
+                }
                 navigator.geolocation.getCurrentPosition(
                     fail.bind(null, done),
                     succeed.bind(null, done),
@@ -70,6 +76,11 @@ exports.defineAutoTests = function () {
         describe('success callback', function () {
 
             it("geolocation.spec.6 should be called with a Position object", function (done) {
+                // this test asks for using geolocation and interrupts autotests running.
+                // That's why we have to pending that for Windows Store 8.0/8.1 apps
+                if (isWindowsStore) {
+                    pending();
+                }
                 navigator.geolocation.getCurrentPosition(function (p) {
                     expect(p.coords).toBeDefined();
                     expect(p.timestamp).toBeDefined();
@@ -95,6 +106,11 @@ exports.defineAutoTests = function () {
             });
 
             it("geolocation.spec.7 should be called if we set timeout to 0 and maximumAge to a very small number", function (done) {
+                // this test asks for using geolocation and interrupts autotests running.
+                // That's why we have to pending that for Windows Store 8.0/8.1 apps
+                if (isWindowsStore) {
+                    pending();
+                }
                 errorWatch = navigator.geolocation.watchPosition(
                     fail.bind(null, done),
                     succeed.bind(null, done),
@@ -114,7 +130,11 @@ exports.defineAutoTests = function () {
             });
 
             it("geolocation.spec.8 should be called with a Position object", function (done) {
-
+                // this test asks for using geolocation and interrupts autotests running.
+                // That's why we have to pending that for Windows Store 8.0/8.1 apps
+                if (isWindowsStore) {
+                    pending();
+                }
                 successWatch = navigator.geolocation.watchPosition(
                     function (p) {
                         expect(p.coords).toBeDefined();


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[2/2] cordova-plugin-geolocation git commit: Merge branch 'CB-8094' of https://github.com/MSOpenTech/cordova-plugin-geolocation

Posted by st...@apache.org.
Merge branch 'CB-8094' of https://github.com/MSOpenTech/cordova-plugin-geolocation


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/commit/41233f66
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/tree/41233f66
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/diff/41233f66

Branch: refs/heads/master
Commit: 41233f66f651868694c468eb6d139098102697d6
Parents: e3f9685 67bd0fc
Author: Steve Gill <st...@gmail.com>
Authored: Mon Dec 1 17:09:16 2014 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Mon Dec 1 17:09:16 2014 -0800

----------------------------------------------------------------------
 tests/tests.js | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org