cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject git commit: CB-7133 more fixup of tests on Android
Date Wed, 27 Aug 2014 21:07:41 GMT
Repository: cordova-plugin-inappbrowser
Updated Branches:
  refs/heads/master 4f957919c -> 832ff5f2e


CB-7133 more fixup of tests on Android

- fix the paths to the injected resources
- update the urls to Google home page to use https to avoid redirects
- get the user agent to display on the inject.html page


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/832ff5f2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/832ff5f2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/832ff5f2

Branch: refs/heads/master
Commit: 832ff5f2e9f0b6e46b9cf5c9d598429f0fd84ce3
Parents: 4f95791
Author: Marcel Kinard <cmarcelk@gmail.com>
Authored: Wed Aug 27 17:07:07 2014 -0400
Committer: Marcel Kinard <cmarcelk@gmail.com>
Committed: Wed Aug 27 17:07:07 2014 -0400

----------------------------------------------------------------------
 tests/resources/inject.html |  1 +
 tests/tests.js              | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/832ff5f2/tests/resources/inject.html
----------------------------------------------------------------------
diff --git a/tests/resources/inject.html b/tests/resources/inject.html
index a2584a0..3004b35 100644
--- a/tests/resources/inject.html
+++ b/tests/resources/inject.html
@@ -32,6 +32,7 @@
     <h1 id="header">InAppBrowser - Script / Style Injection Test</h1>
     <h2 id="style-update-file" style="display:none">Style updated from file</h2>
     <h2 id="style-update-literal" style="display:none">Style updated from literal</h2>
+    <div>User-Agent: <cite id="u-a"></cite></div>
   </body>
   <script>
       function updateUserAgent() {

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/832ff5f2/tests/tests.js
----------------------------------------------------------------------
diff --git a/tests/tests.js b/tests/tests.js
index 6642f16..0c1d09d 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -295,8 +295,8 @@ exports.defineManualTests = function (contentEl, createActionButton) {
     var localhtml = basePath + 'local.html',
         localpdf = basePath + 'local.pdf',
         injecthtml = basePath + 'inject.html',
-        injectjs = basePath + 'inject.js',
-        injectcss = basePath + 'inject.css',
+        injectjs = 'inject.js',
+        injectcss = 'inject.css',
         videohtml = basePath + 'video.html';
 
     //Local
@@ -423,7 +423,7 @@ exports.defineManualTests = function (contentEl, createActionButton) {
 
     //Open hidden
     createActionButton('Create Hidden', function () {
-        openHidden('http://google.com', true);
+        openHidden('https://www.google.com', true);
     }, 'openHidden');
     createActionButton('Show Hidden', function () {
         showHidden();
@@ -432,15 +432,15 @@ exports.defineManualTests = function (contentEl, createActionButton)
{
         closeHidden();
     }, 'closeHidden');
     createActionButton('google.com Not Hidden', function () {
-        openHidden('http://google.com', false);
+        openHidden('https://www.google.com', false);
     }, 'openHiddenShow');
 
     //Clearing cache
     createActionButton('Clear Browser Cache', function () {
-        doOpen('http://www.google.com', '_blank', 'clearcache=yes');
+        doOpen('https://www.google.com', '_blank', 'clearcache=yes');
     }, 'openClearCache');
     createActionButton('Clear Session Cache', function () {
-        doOpen('http://www.google.com', '_blank', 'clearsessioncache=yes');
+        doOpen('https://www.google.com', '_blank', 'clearsessioncache=yes');
     }, 'openClearSessionCache');
 
     //Video tag


Mime
View raw message