Merge branch 'master' into greenkeeper/tslint-5.0.0

iyegoroff · Apr 2, 2017 · e0ca747 · e0ca747
2 parents bdad1cf + 47b2c49
commit e0ca747
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -34,9 +34,9 @@
     "eslint": "^3.11.1",
     "intern": "^3.4.2",
     "remap-istanbul": "^0.9.1",
-    "semistandard": "^9.1.0",
     "tslint": "^5.0.0",
-    "tslint-config-standard": "^3.0.0",
+    "semistandard": "^10.0.0",
+    "tslint-config-standard": "^4.0.0",
     "typescript": "^2.1.4",
     "uglify-js": "^2.7.5"
   },

diff --git a/tests/intern-browser.js b/tests/intern-browser.js
@@ -1,27 +1,35 @@
 define({
     environments: [
         {
-            browserName: 'iphone',
-            version: ['8.1', '9.2'],
+            browserName: 'Safari',
+            appiumVersion: '1.6.3',
             recordVideo: false,
-            recordScreenshots: false
+            recordScreenshots: false,
+            deviceName: 'iPhone Simulator',
+            deviceOrientation: 'portrait',
+            platformVersion: ['9.3', '10.2'],
+            platformName: 'iOS'
         },
         {
-            browserName: 'android',
-            version: ['4.4', '5.1'],
+            browserName: 'Browser',
+            appiumVersion: '1.6.3',
             recordVideo: false,
-            recordScreenshots: false
+            recordScreenshots: false,
+            deviceName: 'Android Emulator',
+            deviceOrientation: 'portrait',
+            platformVersion: ['4.4', '5.1', '6.0'],
+            platformName: 'Android'
         },
         {
             browserName: 'chrome',
-            version: ['31', '32', '54'],
+            version: ['31', '32', '57'],
             platform: ['Windows 10'],
             recordVideo: false,
             recordScreenshots: false
         },
         {
             browserName: 'firefox',
-            version: ['28', '29', '50'],
+            version: ['28', '29', '52'],
             platform: ['Windows 10'],
             recordVideo: false,
             recordScreenshots: false