diff --git a/.travis.yml b/.travis.yml index 007553b..2047340 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,13 @@ matrix: node_js: - 10.13.0 before_script: - - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./codeclimate-test-reporter + - curl -L + https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 + > ./codeclimate-test-reporter - chmod +x ./codeclimate-test-reporter - ./codeclimate-test-reporter before-build - npm run build script: - - npm run lint - - npm run test:jest + - npm run test after_script: - ./codeclimate-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT diff --git a/karma/browserstack-android.conf.js b/karma/browserstack-android.conf.js index 68b3424..a9d09a8 100644 --- a/karma/browserstack-android.conf.js +++ b/karma/browserstack-android.conf.js @@ -3,7 +3,7 @@ const baseConfig = require('./browserstack.conf'); module.exports = function(config) { baseConfig({ set(base) { - base.browsers = ['android-7.0', 'android-7.1', 'android-8.0']; + base.browsers = ['android-8.0', 'android-8.1', 'android-9.0']; config.set(base); } }); diff --git a/karma/browserstack-chrome.conf.js b/karma/browserstack-chrome.conf.js index cd841b2..f51874b 100644 --- a/karma/browserstack-chrome.conf.js +++ b/karma/browserstack-chrome.conf.js @@ -3,7 +3,7 @@ const baseConfig = require('./browserstack.conf'); module.exports = function(config) { baseConfig({ set(base) { - base.browsers = ['chrome-61.0', 'chrome-62.0', 'chrome-63.0']; + base.browsers = ['chrome-69.0', 'chrome-70.0', 'chrome-71.0']; config.set(base); } }); diff --git a/karma/browserstack-firefox.conf.js b/karma/browserstack-firefox.conf.js index 91600f5..5c593f2 100644 --- a/karma/browserstack-firefox.conf.js +++ b/karma/browserstack-firefox.conf.js @@ -3,7 +3,7 @@ const baseConfig = require('./browserstack.conf'); module.exports = function(config) { baseConfig({ set(base) { - base.browsers = ['firefox-55.0', 'firefox-56.0', 'firefox-57.0']; + base.browsers = ['firefox-62.0', 'firefox-63.0', 'firefox-64.0']; config.set(base); } }); diff --git a/karma/browserstack-ie.conf.js b/karma/browserstack-ie.conf.js index 0ad775c..9fec303 100644 --- a/karma/browserstack-ie.conf.js +++ b/karma/browserstack-ie.conf.js @@ -3,7 +3,7 @@ const baseConfig = require('./browserstack.conf'); module.exports = function(config) { baseConfig({ set(base) { - base.browsers = ['ie-9.0', 'ie-10.0', 'ie-11.0']; + base.browsers = ['edge-16.0', 'edge-17.0', 'edge-18.0']; config.set(base); } }); diff --git a/karma/browserstack-ios.conf.js b/karma/browserstack-ios.conf.js index 4e33d4a..cfe10b8 100644 --- a/karma/browserstack-ios.conf.js +++ b/karma/browserstack-ios.conf.js @@ -3,7 +3,14 @@ const baseConfig = require('./browserstack.conf'); module.exports = function(config) { baseConfig({ set(base) { - base.browsers = ['iphone-10.3']; + base.browsers = [ + 'iphone-10.3', + 'iphone-11.0', + 'iphone-11.2', + 'iphone-11.4', + 'iphone-12.0', + 'iphone-12.1' + ]; config.set(base); } }); diff --git a/karma/browserstack-opera.conf.js b/karma/browserstack-opera.conf.js index 273d2f8..86e29fc 100644 --- a/karma/browserstack-opera.conf.js +++ b/karma/browserstack-opera.conf.js @@ -3,7 +3,7 @@ const baseConfig = require('./browserstack.conf'); module.exports = function(config) { baseConfig({ set(base) { - base.browsers = ['opera-12.16']; + base.browsers = ['opera-12.16', 'opera-12.15']; config.set(base); } }); diff --git a/karma/browserstack-safari.conf.js b/karma/browserstack-safari.conf.js index 87166ff..2c4553f 100644 --- a/karma/browserstack-safari.conf.js +++ b/karma/browserstack-safari.conf.js @@ -3,7 +3,7 @@ const baseConfig = require('./browserstack.conf'); module.exports = function(config) { baseConfig({ set(base) { - base.browsers = ['safari-9.1', 'safari-10.1', 'safari-11.0']; + base.browsers = ['safari-11.1', 'safari-12.0']; config.set(base); } }); diff --git a/karma/browserstack.json b/karma/browserstack.json index 1da6020..82c9f39 100644 --- a/karma/browserstack.json +++ b/karma/browserstack.json @@ -1,43 +1,43 @@ { - "android-4.0": { + "android-6.0": { "base": "BrowserStack", "browser": "android", "browser_version": null, - "device": "Samsung Galaxy Note 10.1", + "device": "Motorola Moto X 2nd Gen", "os": "android", - "os_version": "4.0" + "os_version": "6.0" }, - "android-6.0": { + "android-5.0": { "base": "BrowserStack", "browser": "android", "browser_version": null, - "device": "Samsung Galaxy Note 4", + "device": "Samsung Galaxy S6", "os": "android", - "os_version": "6.0" + "os_version": "5.0" }, - "android-7.0": { + "android-7.1": { "base": "BrowserStack", "browser": "android", "browser_version": null, - "device": "Samsung Galaxy S8", + "device": "Samsung Galaxy A8", "os": "android", - "os_version": "7.0" + "os_version": "7.1" }, - "android-7.1": { + "android-8.0": { "base": "BrowserStack", "browser": "android", "browser_version": null, - "device": "Samsung Galaxy Note 8", + "device": "Google Pixel 2", "os": "android", - "os_version": "7.1" + "os_version": "8.0" }, - "android-4.1": { + "android-9.0": { "base": "BrowserStack", "browser": "android", "browser_version": null, - "device": "Google Nexus 7", + "device": "Google Pixel 3", "os": "android", - "os_version": "4.1" + "os_version": "9.0" }, "android-5.1": { "base": "BrowserStack", @@ -47,21 +47,21 @@ "os": "android", "os_version": "5.1" }, - "android-4.3": { + "android-8.1": { "base": "BrowserStack", "browser": "android", "browser_version": null, - "device": "Amazon Kindle Fire HDX 7", + "device": "Samsung Galaxy Tab S4", "os": "android", - "os_version": "4.3" + "os_version": "8.1" }, - "android-5.0": { + "android-7.0": { "base": "BrowserStack", "browser": "android", "browser_version": null, - "device": "Motorola Moto X 2nd Gen", + "device": "Samsung Galaxy Tab S3", "os": "android", - "os_version": "5.0" + "os_version": "7.0" }, "android-4.4": { "base": "BrowserStack", @@ -71,421 +71,485 @@ "os": "android", "os_version": "4.4" }, - "android-8.0": { - "base": "BrowserStack", - "browser": "android", - "browser_version": null, - "device": "Google Pixel", - "os": "android", - "os_version": "8.0" - }, - "android-4.2": { + "chrome-70.0": { "base": "BrowserStack", - "browser": "android", - "browser_version": null, - "device": "Google Nexus 4", - "os": "android", - "os_version": "4.2" + "browser": "chrome", + "browser_version": "70.0", + "device": null, + "os": "OS X", + "os_version": "Yosemite" }, - "chrome-63.0": { + "chrome-42.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "63.0", + "browser_version": "42.0", "device": null, "os": "Windows", - "os_version": "7" + "os_version": "XP" }, - "chrome-62.0": { + "chrome-71.0 beta": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "62.0", + "browser_version": "71.0 beta", "device": null, "os": "OS X", - "os_version": "Sierra" + "os_version": "Mojave" }, - "chrome-61.0": { + "chrome-69.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "61.0", + "browser_version": "69.0", "device": null, - "os": "Windows", - "os_version": "8" + "os": "OS X", + "os_version": "Sierra" }, - "chrome-14.0": { + "chrome-68.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "14.0", + "browser_version": "68.0", "device": null, "os": "OS X", - "os_version": "Mountain Lion" + "os_version": "Sierra" }, - "chrome-60.0": { + "chrome-67.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "60.0", + "browser_version": "67.0", "device": null, - "os": "OS X", - "os_version": "High Sierra" + "os": "Windows", + "os_version": "8" }, - "chrome-15.0": { + "chrome-66.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "15.0", + "browser_version": "66.0", "device": null, "os": "Windows", - "os_version": "7" + "os_version": "8.1" }, - "chrome-16.0": { + "chrome-65.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "16.0", + "browser_version": "65.0", "device": null, - "os": "Windows", - "os_version": "XP" + "os": "OS X", + "os_version": "El Capitan" }, - "chrome-17.0": { + "chrome-64.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "17.0", + "browser_version": "64.0", "device": null, - "os": "Windows", - "os_version": "7" + "os": "OS X", + "os_version": "Mavericks" }, - "chrome-18.0": { + "chrome-63.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "18.0", + "browser_version": "63.0", "device": null, "os": "OS X", - "os_version": "Mountain Lion" + "os_version": "El Capitan" }, - "chrome-19.0": { + "chrome-62.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "19.0", + "browser_version": "62.0", "device": null, - "os": "OS X", - "os_version": "Snow Leopard" + "os": "Windows", + "os_version": "7" }, - "chrome-20.0": { + "chrome-61.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "20.0", + "browser_version": "61.0", "device": null, - "os": "OS X", - "os_version": "Snow Leopard" + "os": "Windows", + "os_version": "8" }, - "chrome-21.0": { + "chrome-60.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "21.0", + "browser_version": "60.0", "device": null, "os": "OS X", - "os_version": "Mountain Lion" + "os_version": "High Sierra" }, - "chrome-22.0": { + "chrome-59.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "22.0", + "browser_version": "59.0", "device": null, "os": "OS X", - "os_version": "Lion" + "os_version": "Mojave" }, - "chrome-23.0": { + "chrome-58.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "23.0", + "browser_version": "58.0", "device": null, "os": "OS X", - "os_version": "El Capitan" + "os_version": "High Sierra" }, - "chrome-24.0": { + "chrome-57.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "24.0", + "browser_version": "57.0", "device": null, - "os": "OS X", - "os_version": "Yosemite" + "os": "Windows", + "os_version": "10" }, - "chrome-25.0": { + "chrome-56.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "25.0", + "browser_version": "56.0", "device": null, "os": "OS X", - "os_version": "Yosemite" + "os_version": "El Capitan" }, - "chrome-26.0": { + "chrome-55.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "26.0", + "browser_version": "55.0", "device": null, "os": "OS X", - "os_version": "Mavericks" + "os_version": "Yosemite" }, - "chrome-27.0": { + "chrome-54.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "27.0", + "browser_version": "54.0", "device": null, "os": "OS X", - "os_version": "Lion" + "os_version": "Yosemite" }, - "chrome-28.0": { + "chrome-53.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "28.0", + "browser_version": "53.0", "device": null, "os": "OS X", - "os_version": "Mountain Lion" + "os_version": "Mojave" }, - "chrome-29.0": { + "chrome-52.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "29.0", + "browser_version": "52.0", "device": null, "os": "OS X", - "os_version": "High Sierra" + "os_version": "El Capitan" }, - "chrome-30.0": { + "chrome-51.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "30.0", + "browser_version": "51.0", "device": null, "os": "OS X", - "os_version": "Yosemite" + "os_version": "High Sierra" }, - "chrome-31.0": { + "chrome-50.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "31.0", + "browser_version": "50.0", "device": null, "os": "Windows", "os_version": "7" }, - "chrome-32.0": { + "chrome-49.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "32.0", + "browser_version": "49.0", "device": null, "os": "OS X", - "os_version": "High Sierra" + "os_version": "Mojave" }, - "chrome-33.0": { + "chrome-48.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "33.0", + "browser_version": "48.0", "device": null, "os": "OS X", - "os_version": "Snow Leopard" + "os_version": "Mojave" }, - "chrome-34.0": { + "chrome-47.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "34.0", + "browser_version": "47.0", "device": null, "os": "OS X", - "os_version": "Yosemite" + "os_version": "Mojave" }, - "chrome-35.0": { + "chrome-46.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "35.0", + "browser_version": "46.0", "device": null, "os": "OS X", - "os_version": "El Capitan" + "os_version": "Snow Leopard" }, - "chrome-36.0": { + "chrome-45.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "36.0", + "browser_version": "45.0", "device": null, "os": "OS X", - "os_version": "Mavericks" + "os_version": "Lion" }, - "chrome-37.0": { + "chrome-44.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "37.0", + "browser_version": "44.0", "device": null, "os": "OS X", - "os_version": "Snow Leopard" + "os_version": "High Sierra" }, - "chrome-38.0": { + "chrome-43.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "38.0", + "browser_version": "43.0", "device": null, "os": "Windows", - "os_version": "7" + "os_version": "XP" }, - "chrome-39.0": { + "chrome-41.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "39.0", + "browser_version": "41.0", "device": null, - "os": "OS X", - "os_version": "El Capitan" + "os": "Windows", + "os_version": "XP" }, "chrome-40.0": { "base": "BrowserStack", "browser": "chrome", "browser_version": "40.0", "device": null, - "os": "OS X", - "os_version": "Lion" + "os": "Windows", + "os_version": "8" }, - "chrome-41.0": { + "chrome-39.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "41.0", + "browser_version": "39.0", "device": null, "os": "Windows", "os_version": "10" }, - "chrome-42.0": { + "chrome-38.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "42.0", + "browser_version": "38.0", "device": null, "os": "Windows", - "os_version": "8.1" + "os_version": "10" }, - "chrome-43.0": { + "chrome-37.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "43.0", + "browser_version": "37.0", "device": null, "os": "OS X", - "os_version": "Lion" + "os_version": "Snow Leopard" }, - "chrome-44.0": { + "chrome-36.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "44.0", + "browser_version": "36.0", "device": null, "os": "OS X", - "os_version": "El Capitan" + "os_version": "Mavericks" }, - "chrome-45.0": { + "chrome-35.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "45.0", + "browser_version": "35.0", "device": null, - "os": "OS X", - "os_version": "El Capitan" + "os": "Windows", + "os_version": "8.1" }, - "chrome-46.0": { + "chrome-34.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "46.0", + "browser_version": "34.0", "device": null, "os": "OS X", - "os_version": "High Sierra" + "os_version": "El Capitan" }, - "chrome-47.0": { + "chrome-33.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "47.0", + "browser_version": "33.0", "device": null, "os": "OS X", - "os_version": "Lion" + "os_version": "El Capitan" }, - "chrome-48.0": { + "chrome-32.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "48.0", + "browser_version": "32.0", "device": null, "os": "OS X", "os_version": "Yosemite" }, - "chrome-49.0": { + "chrome-31.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "49.0", + "browser_version": "31.0", "device": null, - "os": "Windows", - "os_version": "8" + "os": "OS X", + "os_version": "Snow Leopard" }, - "chrome-50.0": { + "chrome-30.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "50.0", + "browser_version": "30.0", "device": null, "os": "OS X", - "os_version": "Yosemite" + "os_version": "Sierra" }, - "chrome-51.0": { + "chrome-29.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "51.0", + "browser_version": "29.0", "device": null, "os": "OS X", - "os_version": "Yosemite" + "os_version": "Mountain Lion" }, - "chrome-52.0": { + "chrome-28.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "52.0", + "browser_version": "28.0", "device": null, "os": "OS X", - "os_version": "El Capitan" + "os_version": "Snow Leopard" }, - "chrome-53.0": { + "chrome-27.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "53.0", + "browser_version": "27.0", "device": null, "os": "OS X", - "os_version": "El Capitan" + "os_version": "Mojave" }, - "chrome-54.0": { + "chrome-26.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "54.0", + "browser_version": "26.0", "device": null, - "os": "Windows", - "os_version": "8" + "os": "OS X", + "os_version": "Mavericks" }, - "chrome-55.0": { + "chrome-25.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "55.0", + "browser_version": "25.0", "device": null, - "os": "Windows", - "os_version": "7" + "os": "OS X", + "os_version": "Mavericks" }, - "chrome-56.0": { + "chrome-24.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "56.0", + "browser_version": "24.0", "device": null, "os": "Windows", - "os_version": "8.1" + "os_version": "8" }, - "chrome-57.0": { + "chrome-23.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "57.0", + "browser_version": "23.0", "device": null, "os": "Windows", "os_version": "8" }, - "chrome-58.0": { + "chrome-22.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "58.0", + "browser_version": "22.0", + "device": null, + "os": "OS X", + "os_version": "Mavericks" + }, + "chrome-21.0": { + "base": "BrowserStack", + "browser": "chrome", + "browser_version": "21.0", + "device": null, + "os": "OS X", + "os_version": "Snow Leopard" + }, + "chrome-20.0": { + "base": "BrowserStack", + "browser": "chrome", + "browser_version": "20.0", + "device": null, + "os": "OS X", + "os_version": "Yosemite" + }, + "chrome-19.0": { + "base": "BrowserStack", + "browser": "chrome", + "browser_version": "19.0", + "device": null, + "os": "OS X", + "os_version": "Mountain Lion" + }, + "chrome-18.0": { + "base": "BrowserStack", + "browser": "chrome", + "browser_version": "18.0", + "device": null, + "os": "OS X", + "os_version": "Mountain Lion" + }, + "chrome-17.0": { + "base": "BrowserStack", + "browser": "chrome", + "browser_version": "17.0", + "device": null, + "os": "OS X", + "os_version": "Yosemite" + }, + "chrome-71.0": { + "base": "BrowserStack", + "browser": "chrome", + "browser_version": "71.0", "device": null, "os": "OS X", "os_version": "High Sierra" }, - "chrome-59.0": { + "chrome-16.0": { "base": "BrowserStack", "browser": "chrome", - "browser_version": "59.0", + "browser_version": "16.0", "device": null, "os": "OS X", - "os_version": "Sierra" + "os_version": "Mountain Lion" + }, + "chrome-15.0": { + "base": "BrowserStack", + "browser": "chrome", + "browser_version": "15.0", + "device": null, + "os": "Windows", + "os_version": "XP" + }, + "chrome-14.0": { + "base": "BrowserStack", + "browser": "chrome", + "browser_version": "14.0", + "device": null, + "os": "OS X", + "os_version": "Mavericks" + }, + "edge-15.0": { + "base": "BrowserStack", + "browser": "edge", + "browser_version": "15.0", + "device": null, + "os": "Windows", + "os_version": "10" }, "edge-16.0": { "base": "BrowserStack", @@ -495,365 +559,445 @@ "os": "Windows", "os_version": "10" }, - "edge-15.0": { + "edge-17.0": { "base": "BrowserStack", "browser": "edge", - "browser_version": "15.0", + "browser_version": "17.0", "device": null, "os": "Windows", "os_version": "10" }, - "edge-14.0": { + "edge-18.0": { "base": "BrowserStack", "browser": "edge", - "browser_version": "14.0", + "browser_version": "18.0", "device": null, "os": "Windows", "os_version": "10" }, - "firefox-13.0": { + "edge-insider preview": { "base": "BrowserStack", - "browser": "firefox", - "browser_version": "13.0", + "browser": "edge", + "browser_version": "insider preview", "device": null, "os": "Windows", - "os_version": "7" + "os_version": "10" }, - "firefox-21.0": { + "firefox-60.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "21.0", + "browser_version": "60.0", "device": null, - "os": "OS X", - "os_version": "Yosemite" + "os": "Windows", + "os_version": "8.1" }, - "firefox-34.0": { + "firefox-40.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "34.0", + "browser_version": "40.0", "device": null, "os": "OS X", - "os_version": "El Capitan" + "os_version": "Mountain Lion" }, - "firefox-35.0": { + "firefox-64.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "35.0", + "browser_version": "64.0", "device": null, "os": "Windows", - "os_version": "8.1" + "os_version": "10" }, - "firefox-14.0": { + "firefox-53.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "14.0", + "browser_version": "53.0", "device": null, "os": "Windows", "os_version": "7" }, - "firefox-7.0": { + "firefox-8.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "7.0", + "browser_version": "8.0", "device": null, - "os": "Windows", - "os_version": "XP" + "os": "OS X", + "os_version": "Mountain Lion" }, - "firefox-22.0": { + "firefox-52.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "22.0", + "browser_version": "52.0", "device": null, - "os": "OS X", - "os_version": "Mavericks" + "os": "Windows", + "os_version": "10" }, - "firefox-36.0": { + "firefox-4.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "36.0", + "browser_version": "4.0", "device": null, "os": "OS X", "os_version": "Lion" }, + "firefox-39.0": { + "base": "BrowserStack", + "browser": "firefox", + "browser_version": "39.0", + "device": null, + "os": "Windows", + "os_version": "8.1" + }, "firefox-9.0": { "base": "BrowserStack", "browser": "firefox", "browser_version": "9.0", "device": null, "os": "Windows", - "os_version": "7" + "os_version": "XP" }, - "firefox-10.0": { + "firefox-51.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "10.0", + "browser_version": "51.0", + "device": null, + "os": "Windows", + "os_version": "8" + }, + "firefox-38.0": { + "base": "BrowserStack", + "browser": "firefox", + "browser_version": "38.0", "device": null, "os": "OS X", - "os_version": "El Capitan" + "os_version": "Sierra" + }, + "firefox-6.0": { + "base": "BrowserStack", + "browser": "firefox", + "browser_version": "6.0", + "device": null, + "os": "OS X", + "os_version": "Snow Leopard" }, "firefox-37.0": { "base": "BrowserStack", "browser": "firefox", "browser_version": "37.0", "device": null, - "os": "Windows", - "os_version": "XP" + "os": "OS X", + "os_version": "High Sierra" }, - "firefox-23.0": { + "firefox-50.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "23.0", + "browser_version": "50.0", "device": null, - "os": "Windows", - "os_version": "8.1" + "os": "OS X", + "os_version": "Sierra" }, - "firefox-38.0": { + "firefox-36.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "38.0", + "browser_version": "36.0", "device": null, - "os": "Windows", - "os_version": "10" + "os": "OS X", + "os_version": "High Sierra" }, - "firefox-39.0": { + "firefox-59.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "39.0", + "browser_version": "59.0", "device": null, - "os": "Windows", - "os_version": "10" + "os": "OS X", + "os_version": "Mojave" }, - "firefox-24.0": { + "firefox-5.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "24.0", + "browser_version": "5.0", "device": null, "os": "OS X", "os_version": "Snow Leopard" }, - "firefox-15.0": { + "firefox-35.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "15.0", + "browser_version": "35.0", "device": null, "os": "OS X", - "os_version": "Mountain Lion" + "os_version": "Sierra" }, - "firefox-4.0": { + "firefox-49.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "4.0", + "browser_version": "49.0", "device": null, "os": "OS X", - "os_version": "Mountain Lion" + "os_version": "El Capitan" }, - "firefox-40.0": { + "firefox-34.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "40.0", + "browser_version": "34.0", + "device": null, + "os": "Windows", + "os_version": "XP" + }, + "firefox-63.0": { + "base": "BrowserStack", + "browser": "firefox", + "browser_version": "63.0", "device": null, "os": "OS X", - "os_version": "Snow Leopard" + "os_version": "Mojave" }, - "firefox-25.0": { + "firefox-58.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "25.0", + "browser_version": "58.0", + "device": null, + "os": "Windows", + "os_version": "8.1" + }, + "firefox-33.0": { + "base": "BrowserStack", + "browser": "firefox", + "browser_version": "33.0", "device": null, "os": "OS X", "os_version": "Lion" }, - "firefox-41.0": { + "firefox-48.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "41.0", + "browser_version": "48.0", + "device": null, + "os": "OS X", + "os_version": "Yosemite" + }, + "firefox-65.0 beta": { + "base": "BrowserStack", + "browser": "firefox", + "browser_version": "65.0 beta", "device": null, "os": "Windows", - "os_version": "10" + "os_version": "8.1" }, - "firefox-42.0": { + "firefox-32.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "42.0", + "browser_version": "32.0", "device": null, "os": "OS X", - "os_version": "Sierra" + "os_version": "Lion" }, - "firefox-16.0": { + "firefox-31.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "16.0", + "browser_version": "31.0", "device": null, "os": "OS X", - "os_version": "Lion" + "os_version": "Mojave" }, - "firefox-11.0": { + "firefox-47.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "11.0", + "browser_version": "47.0", + "device": null, + "os": "Windows", + "os_version": "8.1" + }, + "firefox-57.0": { + "base": "BrowserStack", + "browser": "firefox", + "browser_version": "57.0", + "device": null, + "os": "OS X", + "os_version": "High Sierra" + }, + "firefox-30.0": { + "base": "BrowserStack", + "browser": "firefox", + "browser_version": "30.0", + "device": null, + "os": "OS X", + "os_version": "El Capitan" + }, + "firefox-3.6": { + "base": "BrowserStack", + "browser": "firefox", + "browser_version": "3.6", "device": null, "os": "Windows", "os_version": "XP" }, - "firefox-26.0": { + "firefox-62.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "26.0", + "browser_version": "62.0", "device": null, "os": "OS X", - "os_version": "Sierra" + "os_version": "El Capitan" }, - "firefox-43.0": { + "firefox-29.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "43.0", + "browser_version": "29.0", "device": null, "os": "Windows", - "os_version": "8" + "os_version": "XP" }, - "firefox-44.0": { + "firefox-46.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "44.0", + "browser_version": "46.0", "device": null, "os": "Windows", - "os_version": "10" + "os_version": "XP" + }, + "firefox-28.0": { + "base": "BrowserStack", + "browser": "firefox", + "browser_version": "28.0", + "device": null, + "os": "OS X", + "os_version": "High Sierra" }, "firefox-27.0": { "base": "BrowserStack", "browser": "firefox", "browser_version": "27.0", "device": null, - "os": "Windows", - "os_version": "8" + "os": "OS X", + "os_version": "Snow Leopard" }, - "firefox-45.0": { + "firefox-56.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "45.0", + "browser_version": "56.0", "device": null, "os": "Windows", - "os_version": "10" + "os_version": "8.1" }, - "firefox-17.0": { + "firefox-45.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "17.0", + "browser_version": "45.0", "device": null, "os": "OS X", - "os_version": "Lion" + "os_version": "Mountain Lion" }, - "firefox-46.0": { + "firefox-26.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "46.0", + "browser_version": "26.0", "device": null, "os": "OS X", - "os_version": "High Sierra" + "os_version": "Mavericks" }, - "firefox-28.0": { + "firefox-25.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "28.0", + "browser_version": "25.0", "device": null, "os": "OS X", - "os_version": "Lion" + "os_version": "Snow Leopard" }, - "firefox-47.0": { + "firefox-44.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "47.0", + "browser_version": "44.0", "device": null, "os": "OS X", - "os_version": "El Capitan" + "os_version": "Yosemite" }, - "firefox-12.0": { + "firefox-24.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "12.0", + "browser_version": "24.0", "device": null, "os": "OS X", - "os_version": "High Sierra" + "os_version": "El Capitan" }, - "firefox-29.0": { + "firefox-42.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "29.0", + "browser_version": "42.0", "device": null, - "os": "Windows", - "os_version": "XP" + "os": "OS X", + "os_version": "Snow Leopard" }, - "firefox-48.0": { + "firefox-55.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "48.0", + "browser_version": "55.0", "device": null, "os": "OS X", - "os_version": "Sierra" + "os_version": "El Capitan" }, - "firefox-18.0": { + "firefox-7.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "18.0", + "browser_version": "7.0", "device": null, "os": "OS X", - "os_version": "High Sierra" + "os_version": "El Capitan" }, - "firefox-49.0": { + "firefox-61.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "49.0", + "browser_version": "61.0", "device": null, "os": "Windows", "os_version": "8" }, - "firefox-3.6": { + "firefox-23.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "3.6", + "browser_version": "23.0", "device": null, "os": "OS X", - "os_version": "Yosemite" + "os_version": "Mojave" }, - "firefox-5.0": { + "firefox-22.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "5.0", + "browser_version": "22.0", "device": null, "os": "OS X", - "os_version": "Lion" + "os_version": "Mountain Lion" }, - "firefox-50.0": { + "firefox-43.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "50.0", + "browser_version": "43.0", "device": null, "os": "OS X", - "os_version": "High Sierra" + "os_version": "El Capitan" }, - "firefox-30.0": { + "firefox-21.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "30.0", + "browser_version": "21.0", "device": null, - "os": "Windows", - "os_version": "8.1" + "os": "OS X", + "os_version": "Mountain Lion" }, - "firefox-51.0": { + "firefox-20.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "51.0", + "browser_version": "20.0", "device": null, "os": "Windows", - "os_version": "10" + "os_version": "8" }, - "firefox-8.0": { + "firefox-54.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "8.0", + "browser_version": "54.0", "device": null, - "os": "Windows", - "os_version": "XP" + "os": "OS X", + "os_version": "El Capitan" }, "firefox-19.0": { "base": "BrowserStack", @@ -861,100 +1005,92 @@ "browser_version": "19.0", "device": null, "os": "Windows", - "os_version": "7" + "os_version": "8" }, - "firefox-52.0": { + "firefox-18.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "52.0", + "browser_version": "18.0", "device": null, "os": "OS X", - "os_version": "El Capitan" + "os_version": "Snow Leopard" }, - "firefox-53.0": { + "firefox-17.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "53.0", + "browser_version": "17.0", "device": null, - "os": "Windows", - "os_version": "8" + "os": "OS X", + "os_version": "Snow Leopard" }, - "firefox-31.0": { + "firefox-16.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "31.0", + "browser_version": "16.0", "device": null, - "os": "Windows", - "os_version": "XP" + "os": "OS X", + "os_version": "Sierra" }, - "firefox-54.0": { + "firefox-41.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "54.0", + "browser_version": "41.0", "device": null, - "os": "Windows", - "os_version": "7" + "os": "OS X", + "os_version": "Lion" }, - "firefox-55.0": { + "firefox-15.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "55.0", + "browser_version": "15.0", "device": null, "os": "OS X", "os_version": "Mavericks" }, - "firefox-32.0": { - "base": "BrowserStack", - "browser": "firefox", - "browser_version": "32.0", - "device": null, - "os": "Windows", - "os_version": "8.1" - }, - "firefox-56.0": { + "firefox-14.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "56.0", + "browser_version": "14.0", "device": null, "os": "OS X", - "os_version": "Yosemite" + "os_version": "Snow Leopard" }, - "firefox-57.0": { + "firefox-13.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "57.0", + "browser_version": "13.0", "device": null, - "os": "Windows", - "os_version": "8" + "os": "OS X", + "os_version": "Snow Leopard" }, - "firefox-20.0": { + "firefox-10.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "20.0", + "browser_version": "10.0", "device": null, - "os": "Windows", - "os_version": "7" + "os": "OS X", + "os_version": "Yosemite" }, - "firefox-33.0": { + "firefox-12.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "33.0", + "browser_version": "12.0", "device": null, "os": "OS X", - "os_version": "Yosemite" + "os_version": "Snow Leopard" }, - "firefox-58.0 beta": { + "firefox-11.0": { "base": "BrowserStack", "browser": "firefox", - "browser_version": "58.0 beta", + "browser_version": "11.0", "device": null, "os": "OS X", - "os_version": "High Sierra" + "os_version": "Snow Leopard" }, - "firefox-6.0": { + "ie-7.0": { "base": "BrowserStack", - "browser": "firefox", - "browser_version": "6.0", + "browser": "ie", + "browser_version": "7.0", "device": null, "os": "Windows", "os_version": "XP" @@ -965,7 +1101,7 @@ "browser_version": "11.0", "device": null, "os": "Windows", - "os_version": "7" + "os_version": "8.1" }, "ie-9.0": { "base": "BrowserStack", @@ -975,18 +1111,18 @@ "os": "Windows", "os_version": "7" }, - "ie-8.0": { + "ie-10.0": { "base": "BrowserStack", "browser": "ie", - "browser_version": "8.0", + "browser_version": "10.0", "device": null, "os": "Windows", "os_version": "7" }, - "ie-10.0": { + "ie-8.0": { "base": "BrowserStack", "browser": "ie", - "browser_version": "10.0", + "browser_version": "8.0", "device": null, "os": "Windows", "os_version": "7" @@ -999,61 +1135,13 @@ "os": "Windows", "os_version": "XP" }, - "ie-7.0": { - "base": "BrowserStack", - "browser": "ie", - "browser_version": "7.0", - "device": null, - "os": "Windows", - "os_version": "XP" - }, - "ipad-8.3": { - "base": "BrowserStack", - "browser": "ipad", - "browser_version": null, - "device": "iPad Mini 2", - "os": "ios", - "os_version": "8.3" - }, - "ipad-5.0": { - "base": "BrowserStack", - "browser": "ipad", - "browser_version": null, - "device": "iPad 2 (5.0)", - "os": "ios", - "os_version": "5.0" - }, - "ipad-9.1": { - "base": "BrowserStack", - "browser": "ipad", - "browser_version": null, - "device": "iPad Mini 4", - "os": "ios", - "os_version": "9.1" - }, - "ipad-6.0": { - "base": "BrowserStack", - "browser": "ipad", - "browser_version": null, - "device": "iPad 3rd (6.0)", - "os": "ios", - "os_version": "6.0" - }, - "ipad-7.0": { - "base": "BrowserStack", - "browser": "ipad", - "browser_version": null, - "device": "iPad 4th", - "os": "ios", - "os_version": "7.0" - }, - "ipad-5.1": { + "ipad-11.3": { "base": "BrowserStack", "browser": "ipad", "browser_version": null, - "device": "iPad 3rd", + "device": "iPad 6th", "os": "ios", - "os_version": "5.1" + "os_version": "11.3" }, "ipad-11.0": { "base": "BrowserStack", @@ -1071,148 +1159,148 @@ "os": "ios", "os_version": "11.2" }, - "iphone-11.0": { + "ipad-11.4": { "base": "BrowserStack", - "browser": "iphone", + "browser": "ipad", "browser_version": null, - "device": "iPhone 8 Plus", + "device": "iPad Pro 12.9", "os": "ios", - "os_version": "11.0" + "os_version": "11.4" }, - "iphone-6.0": { + "iphone-12.1": { "base": "BrowserStack", "browser": "iphone", "browser_version": null, - "device": "iPhone 4S (6.0)", + "device": "iPhone XR", "os": "ios", - "os_version": "6.0" + "os_version": "12.1" }, - "iphone-8.3": { + "iphone-11.0": { "base": "BrowserStack", "browser": "iphone", "browser_version": null, - "device": "iPhone 6", + "device": "iPhone X", "os": "ios", - "os_version": "8.3" + "os_version": "11.0" }, - "iphone-5.1": { + "iphone-11.2": { "base": "BrowserStack", "browser": "iphone", "browser_version": null, - "device": "iPhone 4S", + "device": "iPhone SE", "os": "ios", - "os_version": "5.1" + "os_version": "11.2" }, - "iphone-7.0": { + "iphone-10.3": { "base": "BrowserStack", "browser": "iphone", "browser_version": null, - "device": "iPhone 5S", + "device": "iPhone 7", "os": "ios", - "os_version": "7.0" + "os_version": "10.3" }, - "iphone-11.2": { + "iphone-11.4": { "base": "BrowserStack", "browser": "iphone", "browser_version": null, - "device": "iPhone SE", + "device": "iPhone 6S Plus", "os": "ios", - "os_version": "11.2" + "os_version": "11.4" }, - "iphone-10.3": { + "iphone-12.0": { "base": "BrowserStack", "browser": "iphone", "browser_version": null, - "device": "iPhone 7 Plus", + "device": "iPhone XS Max", "os": "ios", - "os_version": "10.3" + "os_version": "12.0" }, - "iphone-9.1": { + "opera-12.16": { "base": "BrowserStack", - "browser": "iphone", - "browser_version": null, - "device": "iPhone 6S Plus", - "os": "ios", - "os_version": "9.1" + "browser": "opera", + "browser_version": "12.16", + "device": null, + "os": "Windows", + "os_version": "8" }, "opera-12.15": { "base": "BrowserStack", "browser": "opera", "browser_version": "12.15", "device": null, - "os": "OS X", - "os_version": "Mavericks" + "os": "Windows", + "os_version": "8" }, - "opera-12.16": { + "safari-6.0": { "base": "BrowserStack", - "browser": "opera", - "browser_version": "12.16", + "browser": "safari", + "browser_version": "6.0", "device": null, - "os": "Windows", - "os_version": "7" + "os": "OS X", + "os_version": "Lion" }, - "safari-7.1": { + "safari-5.1": { "base": "BrowserStack", "browser": "safari", - "browser_version": "7.1", + "browser_version": "5.1", "device": null, "os": "OS X", - "os_version": "Mavericks" + "os_version": "Snow Leopard" }, - "safari-11.0": { + "safari-6.2": { "base": "BrowserStack", "browser": "safari", - "browser_version": "11.0", + "browser_version": "6.2", "device": null, "os": "OS X", - "os_version": "High Sierra" + "os_version": "Mountain Lion" }, - "safari-10.1": { + "safari-9.1": { "base": "BrowserStack", "browser": "safari", - "browser_version": "10.1", + "browser_version": "9.1", "device": null, "os": "OS X", - "os_version": "Sierra" + "os_version": "El Capitan" }, - "safari-6.0": { + "safari-7.1": { "base": "BrowserStack", "browser": "safari", - "browser_version": "6.0", + "browser_version": "7.1", "device": null, "os": "OS X", - "os_version": "Lion" + "os_version": "Mavericks" }, - "safari-8.0": { + "safari-12.0": { "base": "BrowserStack", "browser": "safari", - "browser_version": "8.0", + "browser_version": "12.0", "device": null, "os": "OS X", - "os_version": "Yosemite" + "os_version": "Mojave" }, - "safari-6.2": { + "safari-8.0": { "base": "BrowserStack", "browser": "safari", - "browser_version": "6.2", + "browser_version": "8.0", "device": null, "os": "OS X", - "os_version": "Mountain Lion" + "os_version": "Yosemite" }, - "safari-5.1": { + "safari-11.1": { "base": "BrowserStack", "browser": "safari", - "browser_version": "5.1", + "browser_version": "11.1", "device": null, "os": "OS X", - "os_version": "Snow Leopard" + "os_version": "High Sierra" }, - "safari-9.1": { + "safari-10.1": { "base": "BrowserStack", "browser": "safari", - "browser_version": "9.1", + "browser_version": "10.1", "device": null, "os": "OS X", - "os_version": "El Capitan" + "os_version": "Sierra" } -} +} \ No newline at end of file diff --git a/karma/cloud.conf.js b/karma/cloud.conf.js index 658f90d..b77de2f 100644 --- a/karma/cloud.conf.js +++ b/karma/cloud.conf.js @@ -3,11 +3,7 @@ const baseConfig = require('./base.conf'); module.exports = function(config) { baseConfig({ set(base) { - base.browserDisconnectTimeout = 10000; // Default 2000 - base.browserDisconnectTolerance = 10; // Default 0 - base.browserNoActivityTimeout = 4 * 60 * 1000; // Default 10000 base.browsers = []; - base.captureTimeout = 4 * 60 * 1000; // Default 60000 base.customLaunchers = null; base.forceJSONP = true; base.logLevel = config.LOG_DEBUG; diff --git a/package.json b/package.json index 68f089f..bdf3297 100644 --- a/package.json +++ b/package.json @@ -69,12 +69,12 @@ "main": "src/index.js", "repository": "JamieMason/Jasmine-Matchers", "scripts": { - "browserstack:android": "echo 'TEMPORARILY DISABLED: karma start karma/browserstack-android.conf.js'", + "browserstack:android": "# karma start karma/browserstack-android.conf.js", "browserstack:chrome": "karma start karma/browserstack-chrome.conf.js", "browserstack:firefox": "karma start karma/browserstack-firefox.conf.js", "browserstack:ie": "karma start karma/browserstack-ie.conf.js", - "browserstack:ios": "karma start karma/browserstack-ios.conf.js", - "browserstack:opera": "karma start karma/browserstack-opera.conf.js", + "browserstack:ios": "# karma start karma/browserstack-ios.conf.js", + "browserstack:opera": "# karma start karma/browserstack-opera.conf.js", "browserstack:safari": "karma start karma/browserstack-safari.conf.js", "build": "webpack", "build:readme": "node ./scripts/generate-readme.js", diff --git a/karma/browserstack.update.js b/scripts/update-browserstack.js similarity index 69% rename from karma/browserstack.update.js rename to scripts/update-browserstack.js index 6d719e0..8d0f88f 100644 --- a/karma/browserstack.update.js +++ b/scripts/update-browserstack.js @@ -1,21 +1,19 @@ +/* + * USERNAME=$BROWSERSTACK_USERNAME ACCESS_KEY=$BROWSERSTACK_ACCESS_KEY node scripts/update-browserstack.js + */ const childProcess = require('child_process'); const fs = require('fs'); const path = require('path'); -const res = childProcess.execSync( - 'curl -u "' + - process.env.BROWSERSTACK_USERNAME + - ':' + - process.env.BROWSERSTACK_ACCESS_KEY + - '" https://www.browserstack.com/automate/browsers.json', - { - encoding: 'utf8' - } -); +const { USERNAME, ACCESS_KEY } = process.env; +const url = 'https://www.browserstack.com/automate/browsers.json'; +const command = `curl -u "${USERNAME}:${ACCESS_KEY}" ${url}`; +const res = childProcess.execSync(command, { encoding: 'utf8' }); + const browsers = JSON.parse(res); -const location = path.join(__dirname, 'browserstack.json'); +const location = path.resolve(__dirname, '../karma/browserstack.json'); const config = browsers - .sort(sortBy('browser_version')) + .sort(sortBy('browser_version', true)) .sort(sortBy('browser')) .reduce(addBrowser, {}); const json = JSON.stringify(config, null, 2);