Pārlūkot izejas kodu

add iOS and Android

Artur Paikin 7 gadi atpakaļ
vecāks
revīzija
65f0553bd3

+ 2 - 1
test/endtoend/specs/uppy.test.js

@@ -19,7 +19,8 @@ function uppySelectFakeFile (uppyID) {
 function browserSupportsChooseFile (capabilities) {
 function browserSupportsChooseFile (capabilities) {
   // Webdriver for Safari and Edge doesn’t support .chooseFile
   // Webdriver for Safari and Edge doesn’t support .chooseFile
   return capabilities.browserName !== 'safari' &&
   return capabilities.browserName !== 'safari' &&
-         capabilities.browserName !== 'MicrosoftEdge'
+         capabilities.browserName !== 'MicrosoftEdge' &&
+         capabilities.platformName !== 'Android'
 }
 }
 
 
 browser.url(testURL)
 browser.url(testURL)

+ 3 - 3
test/endtoend/wdio.remote.conf.js

@@ -43,9 +43,9 @@ exports.config = {
         { browserName: 'internet explorer', version: '10.0', platform: 'Windows 7', 'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER, build: process.env.TRAVIS_BUILD_NUMBER },
         { browserName: 'internet explorer', version: '10.0', platform: 'Windows 7', 'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER, build: process.env.TRAVIS_BUILD_NUMBER },
         { browserName: 'chrome', version: '50.0', platform: 'Windows 7', 'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER, build: process.env.TRAVIS_BUILD_NUMBER },
         { browserName: 'chrome', version: '50.0', platform: 'Windows 7', 'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER, build: process.env.TRAVIS_BUILD_NUMBER },
         { browserName: 'MicrosoftEdge', version: '14.14393', platform: 'Windows 10', 'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER, build: process.env.TRAVIS_BUILD_NUMBER },
         { browserName: 'MicrosoftEdge', version: '14.14393', platform: 'Windows 10', 'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER, build: process.env.TRAVIS_BUILD_NUMBER },
-        { browserName: 'safari', version: '11.0', platform: 'macOS 10.12', 'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER, build: process.env.TRAVIS_BUILD_NUMBER }
-        // { browserName: 'safari', version: '11.0', platformName: 'iOS', platformVersion: '10.0', deviceOrientation: 'portrait', deviceName: 'iPhone 6 Simulator', appiumVersion: '1.7.1' },
-        // { browserName: 'chrome', platformName: 'Android', platformVersion: '6.0', deviceOrientation: 'portrait', deviceName: 'Android Emulator', appiumVersion: '1.7.1' }
+        { browserName: 'safari', version: '11.0', platform: 'macOS 10.12', 'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER, build: process.env.TRAVIS_BUILD_NUMBER },
+        { browserName: 'safari', version: '11.0', platformName: 'iOS', platformVersion: '10.0', deviceOrientation: 'portrait', deviceName: 'iPhone 6 Simulator', appiumVersion: '1.7.1', 'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER, build: process.env.TRAVIS_BUILD_NUMBER },
+        { browserName: 'chrome', platformName: 'Android', platformVersion: '6.0', deviceOrientation: 'portrait', deviceName: 'Android Emulator', appiumVersion: '1.7.1', 'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER, build: process.env.TRAVIS_BUILD_NUMBER }
   ],
   ],
     //
     //
     // ===================
     // ===================