Skip to content

Commit 62767f6

Browse files
author
Christopher J. Brody
committed
spec rename isWKWebView to hasMobileWKWebView
1 parent 029e9e3 commit 62767f6

5 files changed

+38
-40
lines changed

‎spec/www/spec/browser-check-startup.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ var isAndroid = !isWindows && /Android/.test(navigator.userAgent);
77
var isMac = /Macintosh/.test(navigator.userAgent);
88
var isAppleMobileOS = /iPhone/.test(navigator.userAgent) ||
99
/iPad/.test(navigator.userAgent) || /iPod/.test(navigator.userAgent);
10-
// XXX FUTURE TBD RENAME to hasWKWebView
11-
// (here and in actual test scripts):
12-
var isWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers;
10+
var hasMobileWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers;
1311

1412
window.hasBrowser = true;
1513
window.hasWebKitWebSQL = isAndroid || (isAppleMobileOS && !isWKWebView);

‎spec/www/spec/db-sql-operations-test.js

+14-14
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var isAndroid = !isWindows && /Android/.test(navigator.userAgent);
77
var isMac = /Macintosh/.test(navigator.userAgent);
88
var isAppleMobileOS = /iPhone/.test(navigator.userAgent) ||
99
/iPad/.test(navigator.userAgent) || /iPod/.test(navigator.userAgent);
10-
var isWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers;
10+
var hasMobileWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers;
1111

1212
// NOTE: While in certain version branches there is no difference between
1313
// the default Android implementation and implementation #2,
@@ -108,7 +108,7 @@ var mytests = function() {
108108
expect(rs).toBeDefined();
109109
expect(rs.rows).toBeDefined();
110110
expect(rs.rows.length).toBe(1);
111-
if (isMac || isWKWebView)
111+
if (isMac || hasMobileWKWebView)
112112
expect(rs.rows.item(0).myresult).toBe('real');
113113
else if (isAndroid && isImpl2)
114114
expect(rs.rows.item(0).myresult).toBe('text');
@@ -152,7 +152,7 @@ var mytests = function() {
152152
expect(rs).toBeDefined();
153153
expect(rs.rows).toBeDefined();
154154
expect(rs.rows.length).toBe(1);
155-
if (isMac || isWKWebView)
155+
if (isMac || hasMobileWKWebView)
156156
expect(rs.rows.item(0).myresult).toBe('real');
157157
else if (isAndroid && isImpl2)
158158
expect(rs.rows.item(0).myresult).toBe('text');
@@ -280,7 +280,7 @@ var mytests = function() {
280280
expect(rs).toBeDefined();
281281
expect(rs.rows).toBeDefined();
282282
expect(rs.rows.length).toBe(1);
283-
if (isMac || isWKWebView)
283+
if (isMac || hasMobileWKWebView)
284284
expect(rs.rows.item(0).myresult).toBe('real');
285285
else if (isAndroid && isImpl2)
286286
expect(rs.rows.item(0).myresult).toBe('text');
@@ -498,22 +498,22 @@ var mytests = function() {
498498
expect(rs.rows).toBeDefined();
499499
expect(rs.rows.length).toBe(9);
500500
expect(rs.rows.item(0).d1).toBe(101);
501-
if (isMac || isWKWebView)
501+
if (isMac || hasMobileWKWebView)
502502
expect(rs.rows.item(0).t1).toBe('real');
503503
else
504504
expect(rs.rows.item(0).t1).toBe('integer');
505505
expect(rs.rows.item(0).a1).toBe(101);
506-
if (isMac || isWKWebView)
506+
if (isMac || hasMobileWKWebView)
507507
expect(rs.rows.item(0).u1).toBe('101.0');
508508
else
509509
expect(rs.rows.item(0).u1).toBe('101');
510510
expect(rs.rows.item(1).d1).toBe(-101);
511-
if (isMac || isWKWebView)
511+
if (isMac || hasMobileWKWebView)
512512
expect(rs.rows.item(1).t1).toBe('real');
513513
else
514514
expect(rs.rows.item(1).t1).toBe('integer');
515515
expect(rs.rows.item(1).a1).toBe(101);
516-
if (isMac || isWKWebView)
516+
if (isMac || hasMobileWKWebView)
517517
expect(rs.rows.item(1).u1).toBe('-101.0');
518518
else
519519
expect(rs.rows.item(1).u1).toBe('-101');
@@ -526,22 +526,22 @@ var mytests = function() {
526526
expect(rs.rows.item(3).a1).toBe(123.456);
527527
expect(rs.rows.item(3).u1).toBe('-123.456');
528528
expect(rs.rows.item(4).d1).toBe(1234567890123);
529-
if (isMac || isWKWebView)
529+
if (isMac || hasMobileWKWebView)
530530
expect(rs.rows.item(4).t1).toBe('real');
531531
else
532532
expect(rs.rows.item(4).t1).toBe('integer');
533533
expect(rs.rows.item(4).a1).toBe(1234567890123);
534-
if (isMac || isWKWebView)
534+
if (isMac || hasMobileWKWebView)
535535
expect(rs.rows.item(4).u1).toBe('1234567890123.0');
536536
else
537537
expect(rs.rows.item(4).u1).toBe('1234567890123');
538538
expect(rs.rows.item(5).d1).toBe(-1234567890123);
539-
if (isMac || isWKWebView)
539+
if (isMac || hasMobileWKWebView)
540540
expect(rs.rows.item(5).t1).toBe('real');
541541
else
542542
expect(rs.rows.item(5).t1).toBe('integer');
543543
expect(rs.rows.item(5).a1).toBe(1234567890123);
544-
if (isMac || isWKWebView)
544+
if (isMac || hasMobileWKWebView)
545545
expect(rs.rows.item(5).u1).toBe('-1234567890123.0');
546546
else
547547
expect(rs.rows.item(5).u1).toBe('-1234567890123');
@@ -554,12 +554,12 @@ var mytests = function() {
554554
expect(rs.rows.item(7).a1).toBe(1234567890123.4);
555555
expect(rs.rows.item(7).u1).toBe('-1234567890123.4');
556556
expect(rs.rows.item(8).d1).toBe(0);
557-
if (isMac || isWKWebView)
557+
if (isMac || hasMobileWKWebView)
558558
expect(rs.rows.item(8).t1).toBe('real');
559559
else
560560
expect(rs.rows.item(8).t1).toBe('integer');
561561
expect(rs.rows.item(8).a1).toBe(0);
562-
if (isMac || isWKWebView)
562+
if (isMac || hasMobileWKWebView)
563563
expect(rs.rows.item(8).u1).toBe('0.0');
564564
else
565565
expect(rs.rows.item(8).u1).toBe('0');

‎spec/www/spec/db-tx-sql-select-value-test.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ var isAndroid = !isWindows && /Android/.test(navigator.userAgent);
99
var isMac = /Macintosh/.test(navigator.userAgent);
1010
var isAppleMobileOS = /iPhone/.test(navigator.userAgent) ||
1111
/iPad/.test(navigator.userAgent) || /iPod/.test(navigator.userAgent);
12-
var isWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers;
12+
var hasMobileWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers;
1313

1414
// The following openDatabase settings are used for Plugin-implementation-2
1515
// on Android:
@@ -409,7 +409,7 @@ var mytests = function() {
409409
expect(rs).toBeDefined();
410410
expect(rs.rows).toBeDefined();
411411
expect(rs.rows.length).toBe(1);
412-
if (isWebSql || isMac || isWKWebView)
412+
if (isWebSql || isMac || hasMobileWKWebView)
413413
expect(rs.rows.item(0).myresult).toBe('real');
414414
else if (!isWebSql && isAndroid && isImpl2)
415415
expect(rs.rows.item(0).myresult).toBe('text');
@@ -474,7 +474,7 @@ var mytests = function() {
474474
expect(rs).toBeDefined();
475475
expect(rs.rows).toBeDefined();
476476
expect(rs.rows.length).toBe(1);
477-
if (isWebSql || isMac || isWKWebView)
477+
if (isWebSql || isMac || hasMobileWKWebView)
478478
expect(rs.rows.item(0).myresult).toBe('real');
479479
else if (!isWebSql && isAndroid && isImpl2)
480480
expect(rs.rows.item(0).myresult).toBe('text');
@@ -665,7 +665,7 @@ var mytests = function() {
665665
expect(rs).toBeDefined();
666666
expect(rs.rows).toBeDefined();
667667
expect(rs.rows.length).toBe(1);
668-
if (isWebSql || isMac || isWKWebView)
668+
if (isWebSql || isMac || hasMobileWKWebView)
669669
expect(rs.rows.item(0).myresult).toBe('real');
670670
else if (!isWebSql && isAndroid && isImpl2)
671671
expect(rs.rows.item(0).myresult).toBe('text');
@@ -730,7 +730,7 @@ var mytests = function() {
730730
expect(rs).toBeDefined();
731731
expect(rs.rows).toBeDefined();
732732
expect(rs.rows.length).toBe(1);
733-
if (isWebSql || isMac || isWKWebView)
733+
if (isWebSql || isMac || hasMobileWKWebView)
734734
expect(rs.rows.item(0).myresult).toBe('real');
735735
else if (!isWebSql && isAndroid && isImpl2)
736736
expect(rs.rows.item(0).myresult).toBe('text');
@@ -924,7 +924,7 @@ var mytests = function() {
924924
expect(rs).toBeDefined();
925925
expect(rs.rows).toBeDefined();
926926
expect(rs.rows.length).toBe(1);
927-
if (isWebSql || isMac || isWKWebView)
927+
if (isWebSql || isMac || hasMobileWKWebView)
928928
expect(rs.rows.item(0).myresult).toBe('real');
929929
else if (!isWebSql && isAndroid && isImpl2)
930930
expect(rs.rows.item(0).myresult).toBe('text');
@@ -989,7 +989,7 @@ var mytests = function() {
989989
expect(rs).toBeDefined();
990990
expect(rs.rows).toBeDefined();
991991
expect(rs.rows.length).toBe(1);
992-
if (isWebSql || isMac || isWKWebView)
992+
if (isWebSql || isMac || hasMobileWKWebView)
993993
expect(rs.rows.item(0).myresult).toBe('real');
994994
else if (!isWebSql && isAndroid && isImpl2)
995995
expect(rs.rows.item(0).myresult).toBe('text');

‎spec/www/spec/db-tx-value-bindings-test.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ var isAndroid = !isWindows && /Android/.test(navigator.userAgent);
99
var isMac = /Macintosh/.test(navigator.userAgent);
1010
var isAppleMobileOS = /iPhone/.test(navigator.userAgent) ||
1111
/iPad/.test(navigator.userAgent) || /iPod/.test(navigator.userAgent);
12-
var isWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers;
12+
var hasMobileWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers;
1313

1414
// NOTE: While in certain version branches there is no difference between
1515
// the default Android implementation and implementation #2,
@@ -330,7 +330,7 @@ var mytests = function() {
330330
expect(row.data3).toBe(42);
331331
expect(row.data4).toBe(42);
332332

333-
if (isWebSql || isMac || isWKWebView)
333+
if (isWebSql || isMac || hasMobileWKWebView)
334334
expect(row.data5).toBe('42.0');
335335
else
336336
expect(row.data5).toBe('42');
@@ -341,7 +341,7 @@ var mytests = function() {
341341
expect(rs3.rows.length).toBe(1);
342342

343343
var row = rs3.rows.item(0);
344-
if (isWebSql || isMac || isWKWebView)
344+
if (isWebSql || isMac || hasMobileWKWebView)
345345
expect(row.t1).toBe('real');
346346
else
347347
expect(row.t1).toBe('integer');
@@ -654,7 +654,7 @@ var mytests = function() {
654654

655655
// NOTE: big number stored in field with TEXT affinity with different conversion
656656
// in case of plugin (certain platforms) vs. Android/iOS WebKit Web SQL
657-
if (isWebSql || isMac || isWKWebView)
657+
if (isWebSql || isMac || hasMobileWKWebView)
658658
expect(row.test_text).toBe("1424174959894.0"); // ([Big] number inserted as string ok)
659659
else
660660
expect(row.test_text).toBe("1424174959894"); // (Big integer number inserted as string ok)
@@ -665,7 +665,7 @@ var mytests = function() {
665665
expect(rs3.rows.length).toBe(1);
666666

667667
var row = rs3.rows.item(0);
668-
if (isWebSql || isMac || isWKWebView)
668+
if (isWebSql || isMac || hasMobileWKWebView)
669669
expect(row.t1).toBe('real');
670670
else
671671
expect(row.t1).toBe('integer');

‎spec/www/spec/sql-batch-test.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var isAndroid = !isWindows && /Android/.test(navigator.userAgent);
77
var isMac = /Macintosh/.test(navigator.userAgent);
88
var isAppleMobileOS = /iPhone/.test(navigator.userAgent) ||
99
/iPad/.test(navigator.userAgent) || /iPod/.test(navigator.userAgent);
10-
var isWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers;
10+
var hasMobileWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers;
1111

1212
// NOTE: While in certain version branches there is no difference between
1313
// the default Android implementation and implementation #2,
@@ -113,22 +113,22 @@ var mytests = function() {
113113
expect(rs.rows).toBeDefined();
114114
expect(rs.rows.length).toBe(7);
115115
expect(rs.rows.item(0).d1).toBe(101);
116-
if (isMac || isWKWebView)
116+
if (isMac || hasMobileWKWebView)
117117
expect(rs.rows.item(0).t1).toBe('real');
118118
else
119119
expect(rs.rows.item(0).t1).toBe('integer');
120120
expect(rs.rows.item(0).a1).toBe(101);
121-
if (isMac || isWKWebView)
121+
if (isMac || hasMobileWKWebView)
122122
expect(rs.rows.item(0).u1).toBe('101.0');
123123
else
124124
expect(rs.rows.item(0).u1).toBe('101');
125125
expect(rs.rows.item(1).d1).toBe(-101);
126-
if (isMac || isWKWebView)
126+
if (isMac || hasMobileWKWebView)
127127
expect(rs.rows.item(1).t1).toBe('real');
128128
else
129129
expect(rs.rows.item(1).t1).toBe('integer');
130130
expect(rs.rows.item(1).a1).toBe(101);
131-
if (isMac || isWKWebView)
131+
if (isMac || hasMobileWKWebView)
132132
expect(rs.rows.item(1).u1).toBe('-101.0');
133133
else
134134
expect(rs.rows.item(1).u1).toBe('-101');
@@ -141,32 +141,32 @@ var mytests = function() {
141141
expect(rs.rows.item(3).a1).toBe(123.456);
142142
expect(rs.rows.item(3).u1).toBe('-123.456');
143143
expect(rs.rows.item(4).d1).toBe(1234567890123);
144-
if (isMac || isWKWebView)
144+
if (isMac || hasMobileWKWebView)
145145
expect(rs.rows.item(4).t1).toBe('real');
146146
else
147147
expect(rs.rows.item(4).t1).toBe('integer');
148148
expect(rs.rows.item(4).a1).toBe(1234567890123);
149-
if (isMac || isWKWebView)
149+
if (isMac || hasMobileWKWebView)
150150
expect(rs.rows.item(4).u1).toBe('1234567890123.0');
151151
else
152152
expect(rs.rows.item(4).u1).toBe('1234567890123');
153153
expect(rs.rows.item(5).d1).toBe(-1234567890123);
154-
if (isMac || isWKWebView)
154+
if (isMac || hasMobileWKWebView)
155155
expect(rs.rows.item(5).t1).toBe('real');
156156
else
157157
expect(rs.rows.item(5).t1).toBe('integer');
158158
expect(rs.rows.item(5).a1).toBe(1234567890123);
159-
if (isMac || isWKWebView)
159+
if (isMac || hasMobileWKWebView)
160160
expect(rs.rows.item(5).u1).toBe('-1234567890123.0');
161161
else
162162
expect(rs.rows.item(5).u1).toBe('-1234567890123');
163163
expect(rs.rows.item(6).d1).toBe(0);
164-
if (isMac || isWKWebView)
164+
if (isMac || hasMobileWKWebView)
165165
expect(rs.rows.item(6).t1).toBe('real');
166166
else
167167
expect(rs.rows.item(6).t1).toBe('integer');
168168
expect(rs.rows.item(6).a1).toBe(0);
169-
if (isMac || isWKWebView)
169+
if (isMac || hasMobileWKWebView)
170170
expect(rs.rows.item(6).u1).toBe('0.0');
171171
else
172172
expect(rs.rows.item(6).u1).toBe('0');

0 commit comments

Comments
 (0)