Skip to content

Commit

Permalink
spec rename hasWebKitBrowser to hasWebKitWebSQL
Browse files Browse the repository at this point in the history
  • Loading branch information
Christopher J. Brody committed Aug 14, 2018
1 parent 954c148 commit 029e9e3
Show file tree
Hide file tree
Showing 15 changed files with 16 additions and 18 deletions.
2 changes: 1 addition & 1 deletion spec/www/spec/basic-db-tx-sql-storage-results.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var scenarioList = [
'Plugin-implementation-2'
];

var scenarioCount = (!!window.hasWebKitBrowser) ? (isAndroid ? 3 : 2) : 1;
var scenarioCount = (!!window.hasWebKitWebSQL) ? (isAndroid ? 3 : 2) : 1;

// FUTURE TBD SPLIT SCRIPT THIS EVEN FURTHER

Expand Down
6 changes: 2 additions & 4 deletions spec/www/spec/browser-check-startup.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ var isAppleMobileOS = /iPhone/.test(navigator.userAgent) ||
var isWKWebView = isAppleMobileOS && !!window.webkit && !!window.webkit.messageHandlers;

window.hasBrowser = true;
// XXX FUTURE TODO RENAME to window.hasWebKitWebSQL
// (here and in actual test scripts):
window.hasWebKitBrowser = isAndroid || (isAppleMobileOS && !isWKWebView);
window.hasWebKitWebSQL = isAndroid || (isAppleMobileOS && !isWKWebView);

describe('Check startup for navigator.userAgent: ' + navigator.userAgent, function() {
it('receives deviceready event', function(done) {
Expand All @@ -25,7 +23,7 @@ describe('Check startup for navigator.userAgent: ' + navigator.userAgent, functi
}, MYTIMEOUT);

it('has openDatabase', function() {
if (window.hasWebKitBrowser) expect(window.openDatabase).toBeDefined();
if (window.hasWebKitWebSQL) expect(window.openDatabase).toBeDefined();
expect(window.sqlitePlugin).toBeDefined();
expect(window.sqlitePlugin.openDatabase).toBeDefined();
});
Expand Down
2 changes: 1 addition & 1 deletion spec/www/spec/db-open-close-delete-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ var mytests = function() {
}
}, MYTIMEOUT);

if (window.hasWebKitBrowser)
if (window.hasWebKitWebSQL)
it('Web SQL check that db name is really a string', function(done) {
var p1 = { name: 'my.db.name', location: 'default' };
try {
Expand Down
2 changes: 1 addition & 1 deletion spec/www/spec/db-simultaneous-tx-access-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ var scenarioList = [
'Plugin-implementation-2'
];

var scenarioCount = (!!window.hasWebKitBrowser) ? (isAndroid ? 3 : 2) : 1;
var scenarioCount = (!!window.hasWebKitWebSQL) ? (isAndroid ? 3 : 2) : 1;

var mytests = function() {

Expand Down
2 changes: 1 addition & 1 deletion spec/www/spec/db-tx-error-handling-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var scenarioList = [
'Plugin-implementation-2'
];

var scenarioCount = (!!window.hasWebKitBrowser) ? (isAndroid ? 3 : 2) : 1;
var scenarioCount = (!!window.hasWebKitWebSQL) ? (isAndroid ? 3 : 2) : 1;

var mytests = function() {

Expand Down
2 changes: 1 addition & 1 deletion spec/www/spec/db-tx-error-mapping-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var scenarioList = [
'Plugin-implementation-2'
];

var scenarioCount = (!!window.hasWebKitBrowser) ? (isAndroid ? 3 : 2) : 1;
var scenarioCount = (!!window.hasWebKitWebSQL) ? (isAndroid ? 3 : 2) : 1;

var mytests = function() {

Expand Down
2 changes: 1 addition & 1 deletion spec/www/spec/db-tx-multiple-update-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ var scenarioList = [
'Plugin-implementation-2'
];

var scenarioCount = (!!window.hasWebKitBrowser) ? (isAndroid ? 3 : 2) : 1;
var scenarioCount = (!!window.hasWebKitWebSQL) ? (isAndroid ? 3 : 2) : 1;

var mytests = function() {

Expand Down
2 changes: 1 addition & 1 deletion spec/www/spec/db-tx-sql-features-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var scenarioList = [
'Plugin-implementation-2'
];

var scenarioCount = (!!window.hasWebKitBrowser) ? (isAndroid ? 3 : 2) : 1;
var scenarioCount = (!!window.hasWebKitWebSQL) ? (isAndroid ? 3 : 2) : 1;

var mytests = function() {

Expand Down
2 changes: 1 addition & 1 deletion spec/www/spec/db-tx-sql-select-value-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var scenarioList = [
'Plugin-implementation-2'
];

var scenarioCount = (!!window.hasWebKitBrowser) ? (isAndroid ? 3 : 2) : 1;
var scenarioCount = (!!window.hasWebKitWebSQL) ? (isAndroid ? 3 : 2) : 1;

var mytests = function() {

Expand Down
2 changes: 1 addition & 1 deletion spec/www/spec/db-tx-string-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var scenarioList = [
'Plugin-implementation-2'
];

var scenarioCount = (!!window.hasWebKitBrowser) ? (isAndroid ? 3 : 2) : 1;
var scenarioCount = (!!window.hasWebKitWebSQL) ? (isAndroid ? 3 : 2) : 1;

var mytests = function() {

Expand Down
2 changes: 1 addition & 1 deletion spec/www/spec/db-tx-value-bindings-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var scenarioList = [
'Plugin-implementation-2'
];

var scenarioCount = (!!window.hasWebKitBrowser) ? (isAndroid ? 3 : 2) : 1;
var scenarioCount = (!!window.hasWebKitWebSQL) ? (isAndroid ? 3 : 2) : 1;

var mytests = function() {

Expand Down
2 changes: 1 addition & 1 deletion spec/www/spec/ext-tx-blob-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var scenarioList = [
'Plugin-implementation-2'
];

var scenarioCount = (!!window.hasWebKitBrowser) ? (isAndroid ? 3 : 2) : 1;
var scenarioCount = (!!window.hasWebKitWebSQL) ? (isAndroid ? 3 : 2) : 1;

var mytests = function() {

Expand Down
2 changes: 1 addition & 1 deletion spec/www/spec/regexp-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var isAppleMobileOS = /iPhone/.test(navigator.userAgent) ||

var scenarioList = [ isAndroid ? 'Plugin-implementation-default' : 'Plugin', 'HTML5', 'Plugin-implementation-2' ];

var scenarioCount = (!!window.hasWebKitBrowser) ? (isAndroid ? 3 : 2) : 1;
var scenarioCount = (!!window.hasWebKitWebSQL) ? (isAndroid ? 3 : 2) : 1;

var mytests = function() {

Expand Down
2 changes: 1 addition & 1 deletion spec/www/spec/sqlite-version-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var scenarioList = [
'Plugin-implementation-2'
];

var scenarioCount = (!!window.hasWebKitBrowser) ? (isAndroid ? 3 : 2) : 1;
var scenarioCount = (!!window.hasWebKitWebSQL) ? (isAndroid ? 3 : 2) : 1;

var mytests = function() {

Expand Down
2 changes: 1 addition & 1 deletion spec/www/spec/tx-semantics-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ var scenarioList = [
'Plugin-implementation-2'
];

var scenarioCount = (!!window.hasWebKitBrowser) ? (isAndroid ? 3 : 2) : 1;
var scenarioCount = (!!window.hasWebKitWebSQL) ? (isAndroid ? 3 : 2) : 1;

var mytests = function() {

Expand Down

0 comments on commit 029e9e3

Please sign in to comment.