From 62767f68a61e4b96a018bc25ac5ca13f90988363 Mon Sep 17 00:00:00 2001 From: "Christopher J. Brody" Date: Tue, 3 Jul 2018 10:28:46 -0400 Subject: [PATCH] spec rename isWKWebView to hasMobileWKWebView --- spec/www/spec/browser-check-startup.js | 4 +-- spec/www/spec/db-sql-operations-test.js | 28 ++++++++++---------- spec/www/spec/db-tx-sql-select-value-test.js | 14 +++++----- spec/www/spec/db-tx-value-bindings-test.js | 10 +++---- spec/www/spec/sql-batch-test.js | 22 +++++++-------- 5 files changed, 38 insertions(+), 40 deletions(-) diff --git a/spec/www/spec/browser-check-startup.js b/spec/www/spec/browser-check-startup.js index 7ab52bc8..004b3628 100644 --- a/spec/www/spec/browser-check-startup.js +++ b/spec/www/spec/browser-check-startup.js @@ -7,9 +7,7 @@ var isAndroid = !isWindows && /Android/.test(navigator.userAgent); var isMac = /Macintosh/.test(navigator.userAgent); var isAppleMobileOS = /iPhone/.test(navigator.userAgent) || /iPad/.test(navigator.userAgent) || /iPod/.test(navigator.userAgent); -// XXX FUTURE TBD RENAME to hasWKWebView -// (here and in actual test scripts): -var isWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers; +var hasMobileWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers; window.hasBrowser = true; window.hasWebKitWebSQL = isAndroid || (isAppleMobileOS && !isWKWebView); diff --git a/spec/www/spec/db-sql-operations-test.js b/spec/www/spec/db-sql-operations-test.js index 05650a0c..1a876685 100755 --- a/spec/www/spec/db-sql-operations-test.js +++ b/spec/www/spec/db-sql-operations-test.js @@ -7,7 +7,7 @@ var isAndroid = !isWindows && /Android/.test(navigator.userAgent); var isMac = /Macintosh/.test(navigator.userAgent); var isAppleMobileOS = /iPhone/.test(navigator.userAgent) || /iPad/.test(navigator.userAgent) || /iPod/.test(navigator.userAgent); -var isWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers; +var hasMobileWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers; // NOTE: While in certain version branches there is no difference between // the default Android implementation and implementation #2, @@ -108,7 +108,7 @@ var mytests = function() { expect(rs).toBeDefined(); expect(rs.rows).toBeDefined(); expect(rs.rows.length).toBe(1); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(0).myresult).toBe('real'); else if (isAndroid && isImpl2) expect(rs.rows.item(0).myresult).toBe('text'); @@ -152,7 +152,7 @@ var mytests = function() { expect(rs).toBeDefined(); expect(rs.rows).toBeDefined(); expect(rs.rows.length).toBe(1); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(0).myresult).toBe('real'); else if (isAndroid && isImpl2) expect(rs.rows.item(0).myresult).toBe('text'); @@ -280,7 +280,7 @@ var mytests = function() { expect(rs).toBeDefined(); expect(rs.rows).toBeDefined(); expect(rs.rows.length).toBe(1); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(0).myresult).toBe('real'); else if (isAndroid && isImpl2) expect(rs.rows.item(0).myresult).toBe('text'); @@ -498,22 +498,22 @@ var mytests = function() { expect(rs.rows).toBeDefined(); expect(rs.rows.length).toBe(9); expect(rs.rows.item(0).d1).toBe(101); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(0).t1).toBe('real'); else expect(rs.rows.item(0).t1).toBe('integer'); expect(rs.rows.item(0).a1).toBe(101); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(0).u1).toBe('101.0'); else expect(rs.rows.item(0).u1).toBe('101'); expect(rs.rows.item(1).d1).toBe(-101); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(1).t1).toBe('real'); else expect(rs.rows.item(1).t1).toBe('integer'); expect(rs.rows.item(1).a1).toBe(101); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(1).u1).toBe('-101.0'); else expect(rs.rows.item(1).u1).toBe('-101'); @@ -526,22 +526,22 @@ var mytests = function() { expect(rs.rows.item(3).a1).toBe(123.456); expect(rs.rows.item(3).u1).toBe('-123.456'); expect(rs.rows.item(4).d1).toBe(1234567890123); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(4).t1).toBe('real'); else expect(rs.rows.item(4).t1).toBe('integer'); expect(rs.rows.item(4).a1).toBe(1234567890123); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(4).u1).toBe('1234567890123.0'); else expect(rs.rows.item(4).u1).toBe('1234567890123'); expect(rs.rows.item(5).d1).toBe(-1234567890123); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(5).t1).toBe('real'); else expect(rs.rows.item(5).t1).toBe('integer'); expect(rs.rows.item(5).a1).toBe(1234567890123); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(5).u1).toBe('-1234567890123.0'); else expect(rs.rows.item(5).u1).toBe('-1234567890123'); @@ -554,12 +554,12 @@ var mytests = function() { expect(rs.rows.item(7).a1).toBe(1234567890123.4); expect(rs.rows.item(7).u1).toBe('-1234567890123.4'); expect(rs.rows.item(8).d1).toBe(0); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(8).t1).toBe('real'); else expect(rs.rows.item(8).t1).toBe('integer'); expect(rs.rows.item(8).a1).toBe(0); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(8).u1).toBe('0.0'); else expect(rs.rows.item(8).u1).toBe('0'); diff --git a/spec/www/spec/db-tx-sql-select-value-test.js b/spec/www/spec/db-tx-sql-select-value-test.js index d0d6670e..78997e3a 100644 --- a/spec/www/spec/db-tx-sql-select-value-test.js +++ b/spec/www/spec/db-tx-sql-select-value-test.js @@ -9,7 +9,7 @@ var isAndroid = !isWindows && /Android/.test(navigator.userAgent); var isMac = /Macintosh/.test(navigator.userAgent); var isAppleMobileOS = /iPhone/.test(navigator.userAgent) || /iPad/.test(navigator.userAgent) || /iPod/.test(navigator.userAgent); -var isWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers; +var hasMobileWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers; // The following openDatabase settings are used for Plugin-implementation-2 // on Android: @@ -409,7 +409,7 @@ var mytests = function() { expect(rs).toBeDefined(); expect(rs.rows).toBeDefined(); expect(rs.rows.length).toBe(1); - if (isWebSql || isMac || isWKWebView) + if (isWebSql || isMac || hasMobileWKWebView) expect(rs.rows.item(0).myresult).toBe('real'); else if (!isWebSql && isAndroid && isImpl2) expect(rs.rows.item(0).myresult).toBe('text'); @@ -474,7 +474,7 @@ var mytests = function() { expect(rs).toBeDefined(); expect(rs.rows).toBeDefined(); expect(rs.rows.length).toBe(1); - if (isWebSql || isMac || isWKWebView) + if (isWebSql || isMac || hasMobileWKWebView) expect(rs.rows.item(0).myresult).toBe('real'); else if (!isWebSql && isAndroid && isImpl2) expect(rs.rows.item(0).myresult).toBe('text'); @@ -665,7 +665,7 @@ var mytests = function() { expect(rs).toBeDefined(); expect(rs.rows).toBeDefined(); expect(rs.rows.length).toBe(1); - if (isWebSql || isMac || isWKWebView) + if (isWebSql || isMac || hasMobileWKWebView) expect(rs.rows.item(0).myresult).toBe('real'); else if (!isWebSql && isAndroid && isImpl2) expect(rs.rows.item(0).myresult).toBe('text'); @@ -730,7 +730,7 @@ var mytests = function() { expect(rs).toBeDefined(); expect(rs.rows).toBeDefined(); expect(rs.rows.length).toBe(1); - if (isWebSql || isMac || isWKWebView) + if (isWebSql || isMac || hasMobileWKWebView) expect(rs.rows.item(0).myresult).toBe('real'); else if (!isWebSql && isAndroid && isImpl2) expect(rs.rows.item(0).myresult).toBe('text'); @@ -924,7 +924,7 @@ var mytests = function() { expect(rs).toBeDefined(); expect(rs.rows).toBeDefined(); expect(rs.rows.length).toBe(1); - if (isWebSql || isMac || isWKWebView) + if (isWebSql || isMac || hasMobileWKWebView) expect(rs.rows.item(0).myresult).toBe('real'); else if (!isWebSql && isAndroid && isImpl2) expect(rs.rows.item(0).myresult).toBe('text'); @@ -989,7 +989,7 @@ var mytests = function() { expect(rs).toBeDefined(); expect(rs.rows).toBeDefined(); expect(rs.rows.length).toBe(1); - if (isWebSql || isMac || isWKWebView) + if (isWebSql || isMac || hasMobileWKWebView) expect(rs.rows.item(0).myresult).toBe('real'); else if (!isWebSql && isAndroid && isImpl2) expect(rs.rows.item(0).myresult).toBe('text'); diff --git a/spec/www/spec/db-tx-value-bindings-test.js b/spec/www/spec/db-tx-value-bindings-test.js index d4d4f8d2..3e89101f 100755 --- a/spec/www/spec/db-tx-value-bindings-test.js +++ b/spec/www/spec/db-tx-value-bindings-test.js @@ -9,7 +9,7 @@ var isAndroid = !isWindows && /Android/.test(navigator.userAgent); var isMac = /Macintosh/.test(navigator.userAgent); var isAppleMobileOS = /iPhone/.test(navigator.userAgent) || /iPad/.test(navigator.userAgent) || /iPod/.test(navigator.userAgent); -var isWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers; +var hasMobileWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers; // NOTE: While in certain version branches there is no difference between // the default Android implementation and implementation #2, @@ -330,7 +330,7 @@ var mytests = function() { expect(row.data3).toBe(42); expect(row.data4).toBe(42); - if (isWebSql || isMac || isWKWebView) + if (isWebSql || isMac || hasMobileWKWebView) expect(row.data5).toBe('42.0'); else expect(row.data5).toBe('42'); @@ -341,7 +341,7 @@ var mytests = function() { expect(rs3.rows.length).toBe(1); var row = rs3.rows.item(0); - if (isWebSql || isMac || isWKWebView) + if (isWebSql || isMac || hasMobileWKWebView) expect(row.t1).toBe('real'); else expect(row.t1).toBe('integer'); @@ -654,7 +654,7 @@ var mytests = function() { // NOTE: big number stored in field with TEXT affinity with different conversion // in case of plugin (certain platforms) vs. Android/iOS WebKit Web SQL - if (isWebSql || isMac || isWKWebView) + if (isWebSql || isMac || hasMobileWKWebView) expect(row.test_text).toBe("1424174959894.0"); // ([Big] number inserted as string ok) else expect(row.test_text).toBe("1424174959894"); // (Big integer number inserted as string ok) @@ -665,7 +665,7 @@ var mytests = function() { expect(rs3.rows.length).toBe(1); var row = rs3.rows.item(0); - if (isWebSql || isMac || isWKWebView) + if (isWebSql || isMac || hasMobileWKWebView) expect(row.t1).toBe('real'); else expect(row.t1).toBe('integer'); diff --git a/spec/www/spec/sql-batch-test.js b/spec/www/spec/sql-batch-test.js index bb011d3a..437d4f8f 100644 --- a/spec/www/spec/sql-batch-test.js +++ b/spec/www/spec/sql-batch-test.js @@ -7,7 +7,7 @@ var isAndroid = !isWindows && /Android/.test(navigator.userAgent); var isMac = /Macintosh/.test(navigator.userAgent); var isAppleMobileOS = /iPhone/.test(navigator.userAgent) || /iPad/.test(navigator.userAgent) || /iPod/.test(navigator.userAgent); -var isWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers; +var hasMobileWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers; // NOTE: While in certain version branches there is no difference between // the default Android implementation and implementation #2, @@ -113,22 +113,22 @@ var mytests = function() { expect(rs.rows).toBeDefined(); expect(rs.rows.length).toBe(7); expect(rs.rows.item(0).d1).toBe(101); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(0).t1).toBe('real'); else expect(rs.rows.item(0).t1).toBe('integer'); expect(rs.rows.item(0).a1).toBe(101); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(0).u1).toBe('101.0'); else expect(rs.rows.item(0).u1).toBe('101'); expect(rs.rows.item(1).d1).toBe(-101); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(1).t1).toBe('real'); else expect(rs.rows.item(1).t1).toBe('integer'); expect(rs.rows.item(1).a1).toBe(101); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(1).u1).toBe('-101.0'); else expect(rs.rows.item(1).u1).toBe('-101'); @@ -141,32 +141,32 @@ var mytests = function() { expect(rs.rows.item(3).a1).toBe(123.456); expect(rs.rows.item(3).u1).toBe('-123.456'); expect(rs.rows.item(4).d1).toBe(1234567890123); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(4).t1).toBe('real'); else expect(rs.rows.item(4).t1).toBe('integer'); expect(rs.rows.item(4).a1).toBe(1234567890123); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(4).u1).toBe('1234567890123.0'); else expect(rs.rows.item(4).u1).toBe('1234567890123'); expect(rs.rows.item(5).d1).toBe(-1234567890123); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(5).t1).toBe('real'); else expect(rs.rows.item(5).t1).toBe('integer'); expect(rs.rows.item(5).a1).toBe(1234567890123); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(5).u1).toBe('-1234567890123.0'); else expect(rs.rows.item(5).u1).toBe('-1234567890123'); expect(rs.rows.item(6).d1).toBe(0); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(6).t1).toBe('real'); else expect(rs.rows.item(6).t1).toBe('integer'); expect(rs.rows.item(6).a1).toBe(0); - if (isMac || isWKWebView) + if (isMac || hasMobileWKWebView) expect(rs.rows.item(6).u1).toBe('0.0'); else expect(rs.rows.item(6).u1).toBe('0');