refactor

Author: prashanth-sams

.env

@@ -1 +1 @@
-SLACK_TOKEN = XXXXXXX/XXXXXXXXXXXXXX/XXXXXXXXXXXXXXXXXXXXXXXXXXXX
+SLACK_TOKEN=XXXXXXX/XXXXXXXXXXXXXX/XXXXXXXXXXXXXXXXXXXXXXXXXXXX

app.log

@@ -1,2 +1,2 @@
-07/11/2020 11:28:29 PM - INFO: Configuring desired capabilities
-07/11/2020 11:28:29 PM - INFO: Initiating Appium driver
+07/16/2020 12:09:02 PM - INFO: Configuring desired capabilities
+07/16/2020 12:09:02 PM - INFO: Initiating Appium driver

conftest.py

@@ -3,13 +3,19 @@
 @pytest.hookimpl
 def pytest_addoption(parser):
     parser.addoption('--app', action='store', default="ios", help="Choose App: ios or android")
+    parser.addoption('--device', action='store', default="emulator", help="Choose Device: simulator / emulator / real "
+                                                                          "device")
 
 
 @pytest.fixture(scope="session")
 def app(request):
     return request.config.getoption("--app")
 
 
+@pytest.fixture(scope="session")
+def device(request):
+    return request.config.getoption("--device")
+
 # @pytest.fixture(scope='session', autouse=True)
 # def session_setup_teardown():
 #     yield

pytest.ini

@@ -1,2 +1,5 @@
 [pytest]
-json_report = report/json/report.json
+json_report = report/json/report.json
+markers =
+    login: mark as login tests
+    home: mark as home tests

requirements.txt

@@ -1,4 +1,4 @@
-Appium-Python-Client~=1.0.1
+Appium-Python-Client~=1.0.2
 selenium~=3.141.0
 pytest~=5.4.3
 allure-pytest
@@ -8,7 +8,7 @@ pytest-xdist
 pytest-rerunfailures
 pytest-sugar
 pytest-json
-pymysql~=0.9.3
+pymysql~=0.10.0
 sshtunnel~=0.1.5
 requests~=2.24.0
 invoke~=1.4.1

runner/android/smoke_run.sh

@@ -1,2 +1,2 @@
-invoke test --env='staging' --lang='en' --slack='on' --app='android'
+invoke test --env='staging' --lang='en' --app='android' --device='emulator'
 invoke slack --env='staging' --lang='en' --slack='on' --app='android'

runner/ios/smoke_run.sh

@@ -1,2 +1,2 @@
-invoke test --env='staging' --lang='en' --slack='on' --app='ios'
+invoke test --env='staging' --lang='en' --app='ios' --device='simulator'
 invoke slack --env='staging' --lang='en' --slack='on' --app='ios'

src/helpers/app.py

@@ -180,6 +180,9 @@ def close(self):
     def reset(self):
         self.driver.reset()
 
+    def launch_app(self):
+        self.driver.launch_app()
+
 
 class CustomCall:
 

src/helpers/appiumdriver.py

@@ -25,7 +25,6 @@ def setUp(self):
         This method instantiates the appium driver
         """
         global desired_caps
-        Driver.cli
 
         logging.info("Configuring desired capabilities")
         if os.getenv('PYTEST_XDIST_WORKER'):
@@ -51,30 +50,34 @@ def setUp(self):
 
         else:
             if self.app == 'ios':
-                desired_caps = {
-                    'deviceName': 'iPhone 6S',
-                    'platformName': 'iOS',
-                    'udid': 'xxxxxxxxxxxxxx',
-                    'platformVersion': '13.3',
-                    'automationName': 'XCUITest',
-                    'app': '/Users/prashanth/Projects/apps/iOS-RealDevice-NativeDemoApp-0.2.1.ipa'
-                }
+                desired_caps = self.ios()
 
             elif self.app == 'android':
-                desired_caps = {
-                    'platformName': 'Android',
-                    'platformVersion': '',
-                    'deviceName': 'PF',
-                    'app': '/Users/prashanth/Projects/apps/app-staging-debug.apk',
-                    'noReset': True
-                }
+                desired_caps = self.android()
 
         logging.info("Initiating Appium driver")
         self.driver = webdriver.Remote("http://0.0.0.0:4723/wd/hub", desired_caps)
 
         # set waits
         self.driver.implicitly_wait(5)  # waits 5 seconds
 
+    def android(self):
+        if self.device == 'emulator':
+            return dict(platformName='Android', platformVersion='', deviceName='PF',
+                        app='/Users/prashanth/Projects/apps/Android-NativeDemoApp-0.2.1.apk', noReset=True)
+        elif self.device == 'real device':
+            return dict(platformName='Android', platformVersion='', deviceName='PF',
+                        app='/Users/prashanth/Projects/apps/Android-NativeDemoApp-0.2.1.apk', noReset=True)
+
+    def ios(self):
+        if self.device == 'simulator':
+            return dict(platformName='iOS', platformVersion='13.3', deviceName='iPhone 11',
+                        app='/Users/prashanth/Projects/apps/iOS-RealDevice-NativeDemoApp-0.2.1.app', automationName='XCUITest')
+        elif self.device == 'real device':
+            return dict(platformName='iOS', platformVersion='14.0', deviceName='iPhone X',
+                        udid='xxxxxxxxxxxxxxxxxxxxxxxxxxxx', useNewWDA=True,
+                        app='/Users/prashanth/Projects/apps/iOS-RealDevice-NativeDemoApp-0.2.1.ipa', automationName='XCUITest')
+
     def tearDown(self):
         Driver.screenshot_on_failure(self)
         self.driver.quit()
@@ -91,8 +94,9 @@ def screenshot_on_failure(self):
                 self.driver.save_screenshot(f"screenshots/{test_name}_{now}.png")
 
     @pytest.fixture(autouse=True)
-    def cli(self, app):
+    def cli(self, app, device):
         self.app = app
+        self.device = device
 
     def wda_port(self):
         if os.getenv('PYTEST_XDIST_WORKER') == 'gw1':

src/spec/android/home_test.py

@@ -1,3 +1,4 @@
+import pytest
 from src.helpers.appiumdriver import Driver
 from src.screens.android.home_screen import HomeScreen
 from src.helpers.app import App
@@ -7,14 +8,16 @@ class TestHome(Driver):
 
     def __init__(self, driver):
         super().__init__(driver)
-    
+
+    @pytest.mark.home
     def test_home_1(self):
         App.element(self, HomeScreen.homeMenu)
         App.element(self, HomeScreen.loginMenu)
         App.element(self, HomeScreen.formsMenu)
         App.element(self, HomeScreen.swipeMenu)
         # App.assert_text(self, HomeLocators.loginMenu, 'Leads')
 
+    @pytest.mark.home
     def test_home_2(self):
         App.element(self, HomeScreen.homeMenu)
         App.element(self, HomeScreen.loginMenu)

src/spec/android/login_test.py

@@ -1,3 +1,4 @@
+import pytest
 from src.helpers.appiumdriver import Driver
 from src.screens.android.home_screen import HomeScreen
 from src.screens.android.login_screen import LoginScreen
@@ -9,6 +10,7 @@ class TestLogin(Driver):
     def __init__(self, driver):
         super().__init__(driver)
 
+    @pytest.mark.login
     def test_login(self):
         App.click(self, HomeScreen.loginMenu)
         App.send_keys(self, LoginScreen.inputField, "[email protected]")

src/spec/ios/home_test.py

@@ -1,3 +1,4 @@
+import pytest
 from src.helpers.appiumdriver import Driver
 from src.screens.ios.home_screen import HomeScreen
 from src.helpers.app import App
@@ -7,13 +8,15 @@ class TestHome(Driver):
 
     def __init__(self, driver):
         super().__init__(driver)
-    
+
+    @pytest.mark.home
     def test_home_1(self):
         App.is_displayed(self, HomeScreen.homeMenu, True)
         App.is_displayed(self, HomeScreen.loginMenu, True)
         App.is_displayed(self, HomeScreen.formsMenu, True)
         App.is_displayed(self, HomeScreen.swipeMenu, True)
 
+    @pytest.mark.home
     def test_home_2(self):
         App.is_displayed(self, HomeScreen.homeMenu, True)
         App.is_displayed(self, HomeScreen.loginMenu, True)

src/spec/ios/login_test.py

@@ -1,3 +1,4 @@
+import pytest
 from src.helpers.appiumdriver import Driver
 from src.screens.ios.home_screen import HomeScreen
 from src.screens.ios.login_screen import LoginScreen
@@ -9,6 +10,7 @@ class TestLogin(Driver):
     def __init__(self, driver):
         super().__init__(driver)
 
+    @pytest.mark.login
     def test_login(self):
         App.click(self, HomeScreen.loginMenu)
         App.send_keys(self, LoginScreen.inputField, "[email protected]")

tasks.py

@@ -4,13 +4,13 @@
 
 
 @task
-def test(c, env='staging', lang='en', slack='on', app='android'):
+def test(c, env='staging', lang='en', app='android', device='emulator'):
     """
     update local storage
     Enable and modify this to add local storage
     """
     # os.system("adb push $(pwd)/data/<your_app_prefs_file>.xml /data/data/<packageName>/shared_prefs")
-    c.run(f'python3 -m pytest src/spec/{app}/login_test.py --app={app}')
+    c.run(f'python3 -m pytest src/spec/{app}/login_test.py --app={app} --device={device}')
 
 @task
 def slack(c, env='staging', country='AE', slack='on', app='android'):