You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by da...@apache.org on 2016/09/29 10:08:17 UTC
android commit: CB-11869 Fix cordova-js android exec tests
Repository: cordova-android
Updated Branches:
refs/heads/master 9cf38f870 -> 30325e4f3
CB-11869 Fix cordova-js android exec tests
Useragent Regexp result is null in node environment - add a check for it
Updated cordova-js
Increased e2e create specs timeout
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/30325e4f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/30325e4f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/30325e4f
Branch: refs/heads/master
Commit: 30325e4f32564cc8806bb1e100dbe4be8a0db449
Parents: 9cf38f8
Author: daserge <v-...@microsoft.com>
Authored: Mon Sep 19 15:56:48 2016 +0300
Committer: daserge <v-...@microsoft.com>
Committed: Thu Sep 29 12:24:52 2016 +0300
----------------------------------------------------------------------
bin/templates/project/assets/www/cordova.js | 16 ++++++++--------
cordova-js-src/exec.js | 2 +-
spec/e2e/create.spec.js | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/30325e4f/bin/templates/project/assets/www/cordova.js
----------------------------------------------------------------------
diff --git a/bin/templates/project/assets/www/cordova.js b/bin/templates/project/assets/www/cordova.js
index 1f06fae..f5e1fe5 100644
--- a/bin/templates/project/assets/www/cordova.js
+++ b/bin/templates/project/assets/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: android
-// 2fd4bcb84048415922d13d80d35b8d1668e8e150
+// 0030f1d859d2a8360b621b0d48072f3f08eb6925
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -330,7 +330,7 @@ module.exports = cordova;
});
-// file: /Users/jbowser/cordova/cordova-android/cordova-js-src/android/nativeapiprovider.js
+// file: F:/coho/cordova-android/cordova-js-src/android/nativeapiprovider.js
define("cordova/android/nativeapiprovider", function(require, exports, module) {
/**
@@ -353,7 +353,7 @@ module.exports = {
});
-// file: /Users/jbowser/cordova/cordova-android/cordova-js-src/android/promptbasednativeapi.js
+// file: F:/coho/cordova-android/cordova-js-src/android/promptbasednativeapi.js
define("cordova/android/promptbasednativeapi", function(require, exports, module) {
/**
@@ -862,7 +862,7 @@ module.exports = channel;
});
-// file: /Users/jbowser/cordova/cordova-android/cordova-js-src/exec.js
+// file: F:/coho/cordova-android/cordova-js-src/exec.js
define("cordova/exec", function(require, exports, module) {
/**
@@ -958,7 +958,7 @@ androidExec.init = function() {
//
//It's ugly, but it's necessary.
var check = navigator.userAgent.toLowerCase().match(/android\s[0-9].[0-9]/);
- var version_code = check[0].match(/4.[0-3].*/);
+ var version_code = check && check[0].match(/4.[0-3].*/);
if (version_code != null && nativeToJsBridgeMode == nativeToJsModes.EVAL_BRIDGE) {
nativeToJsBridgeMode = nativeToJsModes.ONLINE_EVENT;
}
@@ -1622,7 +1622,7 @@ exports.reset();
});
-// file: /Users/jbowser/cordova/cordova-android/cordova-js-src/platform.js
+// file: F:/coho/cordova-android/cordova-js-src/platform.js
define("cordova/platform", function(require, exports, module) {
// The last resume event that was received that had the result of a plugin call.
@@ -1732,7 +1732,7 @@ function onMessageFromNative(msg) {
});
-// file: /Users/jbowser/cordova/cordova-android/cordova-js-src/plugin/android/app.js
+// file: F:/coho/cordova-android/cordova-js-src/plugin/android/app.js
define("cordova/plugin/android/app", function(require, exports, module) {
var exec = require('cordova/exec');
@@ -2094,7 +2094,7 @@ utils.clone = function(obj) {
retVal = {};
for(i in obj){
- if(!(i in retVal) || retVal[i] != obj[i]) {
+ if((!(i in retVal) || retVal[i] != obj[i]) && typeof obj[i] != 'undefined') {
retVal[i] = utils.clone(obj[i]);
}
}
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/30325e4f/cordova-js-src/exec.js
----------------------------------------------------------------------
diff --git a/cordova-js-src/exec.js b/cordova-js-src/exec.js
index 36298ce..b45aee8 100644
--- a/cordova-js-src/exec.js
+++ b/cordova-js-src/exec.js
@@ -112,7 +112,7 @@ androidExec.init = function() {
//
//It's ugly, but it's necessary.
var check = navigator.userAgent.toLowerCase().match(/android\s[0-9].[0-9]/);
- var version_code = check[0].match(/4.[0-3].*/);
+ var version_code = check && check[0].match(/4.[0-3].*/);
if (version_code != null && nativeToJsBridgeMode == nativeToJsModes.EVAL_BRIDGE) {
nativeToJsBridgeMode = nativeToJsModes.ONLINE_EVENT;
}
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/30325e4f/spec/e2e/create.spec.js
----------------------------------------------------------------------
diff --git a/spec/e2e/create.spec.js b/spec/e2e/create.spec.js
index 2f5822a..3556364 100644
--- a/spec/e2e/create.spec.js
+++ b/spec/e2e/create.spec.js
@@ -19,7 +19,7 @@
var actions = require('./helpers/projectActions.js');
-var CREATE_TIMEOUT = 90000;
+var CREATE_TIMEOUT = 180000;
function createAndBuild(projectname, projectid, done) {
actions.createProject(projectname, projectid, function (error) {
@@ -27,7 +27,7 @@ function createAndBuild(projectname, projectid, done) {
actions.buildProject(projectid, function (error) {
expect(error).toBe(null);
actions.removeProject(projectid);
- done();
+ done();
});
});
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org