appium-safari-driver 3.2.1 → 3.2.2

package/.github/workflows/publish.js.yml

@@ -10,18 +10,25 @@ jobs:
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Use Node.js 14.x
+    - name: Use Node.js 16.x
       uses: actions/setup-node@v1
       with:
-        node-version: 14.x
+        node-version: 16.x
     - name: install newer npm
       run: npm install -g npm
     - run: npm install
       name: Install dependencies
-    - run: rm -rf package-lock.json
-    - run: npm shrinkwrap
     - run: npm test
       name: Run NPM Test
+    - run: |
+        rm -rf package-lock.json
+        npm prune --production
+        rm -rf node_modules/appium
+      name: Remove dev dependencies and appium peer dependencies
+    - run: npm shrinkwrap
+      name: Create shrinkwrap
+    - run: npm install --only=dev
+      name: Install dev dependencies for the release
     - run: npx semantic-release
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package/README.md

@@ -49,43 +49,40 @@ import pytest
 import time
 
 from appium import webdriver
+# Options are available in Python client since v2.6.0
+from appium.options.ios import SafariOptions
 from selenium.webdriver.common.by import By
 
 
-def generate_caps():
+def generate_options():
     common_caps = {
         # It does not really matter what to put there, although setting 'Safari' might cause a failure
         # depending on the particular client library
         'browserName': 'AppiumSafari',
-        # automationName capability presence is mandatory for this Safari Driver to be selected
-        'automationName': 'Safari',
     }
-    real_device_caps = {
-        **common_caps,
-        'platformName': 'iOS',
-        # This capability is optional
-        'safari:deviceType': 'iPhone',
-        # Do not forget to verify that Remote Automation is enabled for this device
-        'safari:deviceUDID': '<MyDeviceUDID>',
-        'safari:useSimulator': False,
-    }
-    simulator_caps = {
-        **common_caps,
-        'platformName': 'iOS',
-        'safari:platformVersion': '14.1',
-        'safari:deviceName': 'iPad Air 2',
-        'safari:useSimulator': True,
-    }
-    desktop_browser_caps = {
+    real_device_opts = SafariOptions().load_capabilities(common_caps)
+    # This is optional
+    real_device_opts.device_type = 'iPhone'
+    # Do not forget to verify that Remote Automation is enabled for this device
+    real_device_opts.device_udid = '<MyDeviceUDID>'
+    real_device_opts.use_simulator = False
+
+    simulator_opts = SafariOptions().load_capabilities(common_caps)
+    simulator_opts.platform_version = '14.1'
+    simulator_opts.device_name = 'iPad Air 2'
+    simulator_opts.use_simulator = True
+
+    desktop_browser_opts = SafariOptions().load_capabilities({
         **common_caps,
         'platformName': 'Mac',
-    }
-    return [real_device_caps, simulator_caps, desktop_browser_caps]
+    })
+    return [real_device_opts, simulator_opts, desktop_browser_opts]
 
 
-@pytest.fixture(params=generate_caps())
+@pytest.fixture(params=generate_options())
 def driver(request):
-    drv = webdriver.Remote('http://localhost:4723/wd/hub', request.param)
+    # The default URL is http://127.0.0.1:4723/wd/hub in Appium1
+    drv = webdriver.Remote('http://127.0.0.1:4723', options=request.param)
     yield drv
     drv.quit()