Merge pull request #1 from browserstack/master

changes

Author: SaranshBS

karma.conf.js

@@ -39,10 +39,10 @@ module.exports = function(config) {
     // test results reporter to use
     // possible values: 'dots', 'progress'
     // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-    reporters: ['progress'],
+    reporters: ['progress', 'BrowserStack'],
 
 
-    // web server port
+    // web server host and port
     port: 9876,
 
 
@@ -57,30 +57,38 @@ module.exports = function(config) {
 
     // enable / disable watching file and executing tests whenever any file changes
     autoWatch: false,
-    
+
     browserStack: {
       username: process.env.BROWSERSTACK_USERNAME,
-      accessKey: process.env.BROWSERSTACK_KEY
+      accessKey: process.env.BROWSERSTACK_KEY,
+      apiClientEndpoint: 'https://api.browserstack.com'
     },
 
     // define browsers
     customLaunchers: {
       bs_firefox_mac: {
         base: 'BrowserStack',
         browser: 'firefox',
-        browser_version: '21.0',
+        browser_version: '70.0',
         os: 'OS X',
-        os_version: 'Mountain Lion'
+        os_version: 'High Sierra'
       },
-      bs_iphone5: {
+      bs_iphoneX: {
         base: 'BrowserStack',
-        device: 'iPhone 5',
+        device: 'iPhone X',
         os: 'ios',
-        os_version: '6.0'
+        real_mobile: true,
+        os_version: '11.0'
       }
     },
 
-    browsers: ['bs_firefox_mac', 'bs_iphone5'],
+    captureTimeout: 3e5,
+    browserDisconnectTolerance: 0,
+    browserDisconnectTimeout: 3e5,
+    browserSocketTimeout: 1.2e5,
+    browserNoActivityTimeout: 3e5,
+
+    browsers: ['bs_firefox_mac', 'bs_iphoneX'],
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
 

package.json

@@ -20,8 +20,8 @@
   },
   "homepage": "https://github.com/browserstack/karma-browserstack-example#readme",
   "dependencies": {
-    "karma": "^0.13.11",
-    "karma-browserstack-launcher": "^0.1.5",
+    "karma": "^4.4.1",
+    "karma-browserstack-launcher": "^1.5.1",
     "karma-qunit": "^0.1.5",
     "qunitjs": "^1.19.0"
   }