Merge pull request #21 from webdriverio/fix/fix-ios-android-tests

Fix/fix ios android tests
webdriverio · Mar 8, 2019 · 051ae7a · 051ae7a
2 parents 38d56f5 + bd60cb5
commit 051ae7a
Show file tree

Hide file tree

Showing 13 changed files with 493 additions and 598 deletions.
diff --git a/config/saucelabs/wdio.android.rdc.app.conf.js b/config/saucelabs/wdio.android.rdc.app.conf.js
@@ -14,19 +14,19 @@ config.specs = [
 // http://appium.io/docs/en/writing-running-appium/caps/#general-capabilities
 config.capabilities = [
     {
-        deviceName: 'Google Pixel',
+        deviceName: 'Samsung Galaxy S9*',
         automationName: 'UiAutomator2',
         // The reference to the app
-        testobject_app_id: '1',
+        testobject_app_id: '4',
         // The api key that has a reference to the app-project in the TO cloud
-        testobject_api_key: process.env.SAUCE_RDC_EU_ACCESS_KEY_ANDROID,
+        testobject_api_key: process.env.SAUCE_RDC_EU_ACCESS_KEY_ANDROID_WDIO,
         // The name of the test for in the cloud
         testobject_test_name: 'wdio-demo-app-test',
         // Some default settings
         // You can find more info in the TO Appium Basic Setup section
         platformName: 'Android',
         idleTimeout: 180,
-        maxInstances: 2,
+        maxInstances: 6,
         testobject_cache_device: true,
         noReset: true,
         orientation: 'PORTRAIT',

diff --git a/config/saucelabs/wdio.ios.rdc.app.conf.js b/config/saucelabs/wdio.ios.rdc.app.conf.js
@@ -14,19 +14,19 @@ config.specs = [
 // http://appium.io/docs/en/writing-running-appium/caps/#general-capabilities
 config.capabilities = [
     {
-        deviceName: 'iPhone 8',
+        deviceName: 'iPhone X*',
         // The reference to the app
-        testobject_app_id: '2',
+        testobject_app_id: '3',
         // The api key that has a reference to the app-project in the TO cloud
-        testobject_api_key: process.env.SAUCE_RDC_EU_ACCESS_KEY_IOS,
+        testobject_api_key: process.env.SAUCE_RDC_EU_ACCESS_KEY_IOS_WDIO,
         // The name of the test for in the cloud
         testobject_test_name: 'wdio-demo-app-test',
         // Some default settings
         // You can find more info in the TO Appium Basic Setup section
         platformName: 'iOS',
         idleTimeout: 180,
-        maxInstances: 1,
-        testobject_cache_device: true,
+        maxInstances: 6,
+        // testobject_cache_device: true,
         noReset: true,
         orientation: 'PORTRAIT',
         newCommandTimeout: 180,

diff --git a/config/wdio.android.app.conf.js b/config/wdio.android.app.conf.js
@@ -17,11 +17,12 @@ config.capabilities = [
     {
         // The defaults you need to have in your config
         automationName: 'UiAutomator2',
-        deviceName: 'Nexus_5_7.1.1',
+        deviceName: 'Pixel_8.1',
         platformName: 'Android',
-        platformVersion: '7.1.1',
+        platformVersion: '8.1',
         orientation: 'PORTRAIT',
-        app: join(process.cwd(), './apps/Android-NativeDemoApp-0.2.0.apk'),
+        maxInstances: 1,
+        app: join(process.cwd(), './apps/Android-NativeDemoApp-0.2.1.apk'),
         // Read the reset strategies very well, they differ per platform, see
         // http://appium.io/docs/en/writing-running-appium/other/reset-strategies/
         noReset: true,

diff --git a/config/wdio.android.browser.conf.js b/config/wdio.android.browser.conf.js
@@ -16,11 +16,12 @@ config.capabilities = [
     {
         // The defaults you need to have in your config
         automationName: 'UiAutomator2',
-        deviceName: 'Nexus_5_7.1.1',
+        deviceName: 'Pixel_8.1',
         platformName: 'Android',
-        platformVersion: '7.1.1',
+        platformVersion: '8.1',
+        maxInstances: 1,
         browserName: 'chrome',
-        // Add this option to prevent the anoying "Welcome"-message
+        // Add this option to prevent the annoying "Welcome"-message
         chromeOptions: {
             args: [ '--no-first-run' ],
         },

diff --git a/config/wdio.ios.app.conf.js b/config/wdio.ios.app.conf.js
@@ -16,12 +16,13 @@ config.specs = [
 config.capabilities = [
     {
         // The defaults you need to have in your config
-        deviceName: 'iPhone 6',
+        deviceName: 'iPhone X',
         platformName: 'iOS',
-        platformVersion: '11.4',
+        platformVersion: '12.1',
         orientation: 'PORTRAIT',
+        maxInstances: 1,
         // The path to the app
-        app: join(process.cwd(), './apps/iOS-NativeDemoApp-0.2.0.app.zip'),
+        app: join(process.cwd(), './apps/iOS-Simulator-NativeDemoApp-0.2.1.app.zip'),
         // Read the reset strategies very well, they differ per platform, see
         // http://appium.io/docs/en/writing-running-appium/other/reset-strategies/
         noReset: true,

diff --git a/config/wdio.ios.browser.conf.js b/config/wdio.ios.browser.conf.js
@@ -15,9 +15,11 @@ config.specs = [
 config.capabilities = [
     {
         // The defaults you need to have in your config
-        deviceName: 'iPhone 6',
+        deviceName: 'iPhone X',
         platformName: 'iOS',
-        platformVersion: '11.4',
+        platformVersion: '12.1',
+        orientation: 'PORTRAIT',
+        maxInstances: 1,
         browserName: 'safari',
         newCommandTimeout: 240,
     },

diff --git a/config/wdio.shared.conf.js b/config/wdio.shared.conf.js
@@ -8,7 +8,7 @@ exports.config = {
     jasmineNodeOpts: {
         // Updated the timeout to 30 seconds due to possible longer appium calls
         // When using XPATH
-        defaultTimeoutInterval: 30000,
+        defaultTimeoutInterval: 90000,
     },
     sync: true,
     logLevel: 'silent',