e2e: separated tests to run in PRs

ci/tests/Jenkinsfile.e2e-nightly

@@ -99,7 +99,7 @@ pipeline {
                 --rerun_count=2 \
                 --testrail_report=True \
                 -m testrail_id \
-                -m \"new_ui_critical or new_ui_medium\" \
+                -m \"nightly\" \
                 -k \"${params.KEYWORD_EXPRESSION}\" \
                 --apk=${params.APK_URL ?: apk_path}
             """

ci/tests/Jenkinsfile.e2e-prs

@@ -35,13 +35,11 @@ pipeline {
       description: 'OBSOLETE ARGUMENT TO BE REMOVED',
       defaultValue: 'DUMMY',
     )
-    /* Commented to use TEST_MARKERS values from job params
     string(
       name: 'TEST_MARKERS',
       description: 'Marker expression for matching tests to run.',
-      defaultValue: 'new_ui_critical',
+      defaultValue: 'smoke',
     )
-    */
   }
 
   options {

test/appium/pytest.ini

@@ -12,4 +12,6 @@ markers =
     testrail_case_id: case ID in testrail
     flaky: flaky tests for re-run if necessary
     transaction: all cases that are related to transaction completion in Ropsten network
-    new_ui_critical: PR tests in new UI
+    smoke: PR tests
+    nightly: nightly tests
+    secured: tests where SauceLabs session link is not posted in PR comments

test/appium/support/testrail_report.py

@@ -108,51 +108,23 @@ class TestrailReport(BaseTestReport):
         test_cases['pr'] = dict()
         test_cases['nightly'] = dict()
         test_cases['upgrade'] = dict()
-        ## PR e2e old UI
-        # test_cases['pr']['critical'] = 730
-        # test_cases['pr']['contacts'] = 50831
-        # test_cases['pr']['public_chat'] = 50654
-        # test_cases['pr']['one_to_one_chat'] = 50655
-        # test_cases['pr']['group_chat'] = 50656
-        # test_cases['pr']['onboarding'] = 50659
-        # test_cases['pr']['recovery'] = 50660
-        # test_cases['pr']['wallet'] = 50661
-        # test_cases['pr']['send_tx'] = 50662
-        # test_cases['pr']['keycard_tx'] = 50663
-        # test_cases['pr']['1_1_chat_commands'] = 50825
-        # test_cases['pr']['ens'] = 50827
-        # test_cases['pr']['sync'] = 50834
-        # test_cases['pr']['browser'] = 50812
 
+        # PR e2e
         test_cases['pr']['critical'] = 50955
-        test_cases['pr']['one_to_one_chat'] = 50956
-        test_cases['pr']['deep_links'] = 51535
-        test_cases['pr']['group_chat'] = 50964
-        test_cases['pr']['community_single'] = 50983
-        test_cases['pr']['community_multiple'] = 50982
-        test_cases['pr']['activity_centre_contact_request'] = 50984
-        test_cases['pr']['activity_centre_other'] = 51005
+        # test_cases['pr']['one_to_one_chat'] = 50956
+        # test_cases['pr']['community_single'] = 50983
         test_cases['pr']['wallet'] = 59443
 
-        ## Nightly e2e
-        # test_cases['nightly']['activity_center'] = 736
-        # test_cases['nightly']['chat'] = 50811
-        # test_cases['nightly']['browser'] = 50826
-        # test_cases['nightly']['profile'] = 50828
-        # test_cases['nightly']['deep_link'] = 50836
-        # test_cases['nightly']['share_profile'] = 50837
-        # test_cases['nightly']['chat_2'] = 50838
-        # test_cases['nightly']['group_chat'] = 50839
-        # test_cases['nightly']['pairing'] = 50840
-        # test_cases['nightly']['activity_center'] = 50833
-        # test_cases['nightly']['timeline'] = 50842
-        # test_cases['nightly']['community'] = 50841
-        # test_cases['nightly']['permissions'] = 50843
-        # test_cases['nightly']['scan qr'] = 50844
-        # test_cases['nightly']['mentions'] = 50845
-        # test_cases['nightly']['mutual_contact_requests'] = 50857
-        # test_cases['nightly']['keycard'] = 50850
-        # test_cases['nightly']['wallet'] = 50851
+        # Nightly e2e
+        test_cases['nightly']['critical'] = 50955
+        test_cases['nightly']['one_to_one_chat'] = 50956
+        test_cases['nightly']['deep_links'] = 51535
+        test_cases['nightly']['group_chat'] = 50964
+        test_cases['nightly']['community_single'] = 50983
+        test_cases['nightly']['community_multiple'] = 50982
+        test_cases['nightly']['activity_centre_contact_request'] = 50984
+        test_cases['nightly']['activity_centre_other'] = 51005
+        test_cases['nightly']['wallet'] = 59443
 
         ## Upgrade e2e
         # test_cases['upgrade']['general'] = 881
@@ -163,11 +135,15 @@ class TestrailReport(BaseTestReport):
                 key, value = arg.split('=')
                 case_ids = value.split(',')
         if len(case_ids) == 0:
-            # if 'critical' in argv:
-            if 'new_ui_critical' in argv:
+            if 'smoke' in argv:
                 for category in test_cases['pr']:
                     for case in self.get_cases([test_cases['pr'][category]]):
                         case_ids.append(case['id'])
+                case_ids.extend([703133, 702742, 702745])
+            elif 'nightly' in argv:
+                for category in test_cases['nightly']:
+                    for case in self.get_cases([test_cases['nightly'][category]]):
+                        case_ids.append(case['id'])
             elif 'upgrade' in argv and 'not upgrade' not in argv:
                 for case in self.get_cases([test_cases['upgrade']['general']]):
                     case_ids.append(case['id'])

test/appium/tests/activity_center/test_activity_center.py

@@ -11,7 +11,7 @@ from views.sign_in_view import SignInView
 
 
 @pytest.mark.xdist_group(name="new_two_2")
-@marks.new_ui_critical
+@marks.nightly
 class TestActivityCenterContactRequestMultipleDevicePR(MultipleSharedDeviceTestCase):
 
     def prepare_devices(self):
@@ -238,7 +238,7 @@ class TestActivityCenterContactRequestMultipleDevicePR(MultipleSharedDeviceTestC
 
 
 @pytest.mark.xdist_group(name="new_four_2")
-@marks.new_ui_critical
+@marks.nightly
 class TestActivityMultipleDevicePR(MultipleSharedDeviceTestCase):
 
     def prepare_devices(self):
@@ -378,7 +378,7 @@ class TestActivityMultipleDevicePR(MultipleSharedDeviceTestCase):
 
 
 @pytest.mark.xdist_group(name="new_six_2")
-@marks.new_ui_critical
+@marks.nightly
 class TestActivityMultipleDevicePRTwo(MultipleSharedDeviceTestCase):
 
     def prepare_devices(self):

test/appium/tests/critical/chats/test_1_1_public_chats.py

@@ -13,7 +13,7 @@ from views.sign_in_view import SignInView
 
 
 @pytest.mark.xdist_group(name="new_one_2")
-@marks.new_ui_critical
+@marks.nightly
 class TestOneToOneChatMultipleSharedDevicesNewUi(MultipleSharedDeviceTestCase):
 
     def prepare_devices(self):
@@ -271,6 +271,7 @@ class TestOneToOneChatMultipleSharedDevicesNewUi(MultipleSharedDeviceTestCase):
         self.errors.verify_no_errors()
 
     @marks.testrail_id(702745)
+    @marks.smoke
     def test_1_1_chat_non_latin_messages_stack_update_profile_photo(self):
         self.home_1.navigate_back_to_home_view()
         self.home_1.profile_button.click()
@@ -533,7 +534,7 @@ class TestOneToOneChatMultipleSharedDevicesNewUi(MultipleSharedDeviceTestCase):
 
 
 @pytest.mark.xdist_group(name="new_six_2")
-@marks.new_ui_critical
+@marks.nightly
 class TestOneToOneChatMultipleSharedDevicesNewUiTwo(MultipleSharedDeviceTestCase):
 
     def prepare_devices(self):

test/appium/tests/critical/chats/test_group_chat.py

@@ -12,7 +12,7 @@ from views.sign_in_view import SignInView
 
 
 @pytest.mark.xdist_group(name="new_one_3")
-@marks.new_ui_critical
+@marks.nightly
 class TestGroupChatMultipleDeviceMergedNewUI(MultipleSharedDeviceTestCase):
 
     def prepare_devices(self):

test/appium/tests/critical/chats/test_public_chat_browsing.py

@@ -15,7 +15,7 @@ from views.sign_in_view import SignInView
 
 
 @pytest.mark.xdist_group(name="new_one_1")
-@marks.new_ui_critical
+@marks.nightly
 class TestCommunityOneDeviceMerged(MultipleSharedDeviceTestCase):
 
     def prepare_devices(self):
@@ -47,6 +47,7 @@ class TestCommunityOneDeviceMerged(MultipleSharedDeviceTestCase):
             self.drivers[0].fail("Not navigated to channel view after reopening app")
 
     @marks.testrail_id(702742)
+    @marks.smoke
     def test_community_copy_and_paste_message_in_chat_input(self):
         message_texts = ['mmmeowesage_text', 'https://status.im']
         if not self.channel.chat_message_input.is_element_displayed():
@@ -152,6 +153,7 @@ class TestCommunityOneDeviceMerged(MultipleSharedDeviceTestCase):
         self.errors.verify_no_errors()
 
     @marks.testrail_id(703133)
+    @marks.smoke
     def test_restore_multiaccount_with_waku_backup_remove_switch(self):
         self.home.reopen_app(sign_in=False)
         self.home.just_fyi("Restore user with predefined communities and contacts")
@@ -261,7 +263,7 @@ class TestCommunityOneDeviceMerged(MultipleSharedDeviceTestCase):
         self.home.community_card_item.wait_for_elements(seconds=120)
 
         expected_communities = {
-            ' 0xUX': ['Design', 'Ethereum', 'Collaboration'],
+            # ' 0xUX': ['Design', 'Ethereum', 'Collaboration'],
             'Status': ['Web3', 'Blockchain', 'Ethereum'],
             'Status Inu': ['News', 'Social', 'Web3'],
         }
@@ -301,7 +303,7 @@ class TestCommunityOneDeviceMerged(MultipleSharedDeviceTestCase):
 
 
 @pytest.mark.xdist_group(name="new_three_2")
-@marks.new_ui_critical
+@marks.nightly
 class TestCommunityMultipleDeviceMerged(MultipleSharedDeviceTestCase):
 
     def prepare_devices(self):
@@ -826,7 +828,7 @@ class TestCommunityMultipleDeviceMerged(MultipleSharedDeviceTestCase):
 
 
 @pytest.mark.xdist_group(name="new_five_2")
-@marks.new_ui_critical
+@marks.nightly
 class TestCommunityMultipleDeviceMergedTwo(MultipleSharedDeviceTestCase):
 
     def prepare_devices(self):

test/appium/tests/critical/test_deep_and_universal_links.py

@@ -6,7 +6,7 @@ from views.sign_in_view import SignInView
 
 
 @pytest.mark.xdist_group(name="new_one_1")
-@marks.new_ui_critical
+@marks.nightly
 class TestDeepLinksOneDevice(MultipleSharedDeviceTestCase):
 
     def prepare_devices(self):

test/appium/tests/critical/test_wallet.py

@@ -13,8 +13,9 @@ from views.sign_in_view import SignInView
 
 
 @pytest.mark.xdist_group(name="new_four_2")
-@marks.new_ui_critical
+@marks.nightly
 @marks.secured
+@marks.smoke
 class TestWalletMultipleDevice(MultipleSharedDeviceTestCase):
 
     def prepare_devices(self):
@@ -174,7 +175,8 @@ class TestWalletMultipleDevice(MultipleSharedDeviceTestCase):
 
 
 @pytest.mark.xdist_group(name="new_one_2")
-@marks.new_ui_critical
+@marks.nightly
+@marks.smoke
 class TestWalletOneDevice(MultipleSharedDeviceTestCase):
 
     def prepare_devices(self):

test/appium/tests/marks.py

@@ -5,8 +5,8 @@ testrail_id = pytest.mark.testrail_id  # atomic tests
 critical = pytest.mark.critical
 medium = pytest.mark.medium
 # new ui
-new_ui_critical = pytest.mark.new_ui_critical
-new_ui_medium = pytest.mark.new_ui_medium
+nightly = pytest.mark.nightly
+smoke = pytest.mark.smoke
 
 flaky = pytest.mark.flaky
 upgrade = pytest.mark.upgrade