Refactoring miscellaneous UI test compatibility (v3.10.x & v3.11.x) for RTA (#362)

Author: MDAlFattah

release_tester/selenium_ui_test/pages/analyzers_page.py

@@ -39,12 +39,7 @@ def select_help_filter_btn(self):
         help_sitem = self.locator_finder_by_xpath(help_filter)
         help_sitem.click()
         time.sleep(3)
-
-        print("Closing Analyzers help filter \n")
-        help_filter_close = '//button[@class="button-close"][1]'
-        help_close_sitem = self.locator_finder_by_xpath(help_filter_close)
-        help_close_sitem.click()
-        time.sleep(2)
+        self.webdriver.refresh()
 
     def select_built_in_analyzers_open(self):
         """Checking in-built analyzers list and description"""
@@ -215,7 +210,7 @@ def checking_all_built_in_analyzer(self):
         self.select_built_in_analyzers_close()
 
 
-    def add_new_analyzer(self, name, test_data_dir=None):
+    def add_new_analyzer(self, name, ui_data_dir=None):
         """Adding analyzer type delimiter with necessary features"""
         # pylint: disable=too-many-locals disable=too-many-branches disable=too-many-statements
         index = self.index
@@ -281,9 +276,7 @@ def add_new_analyzer(self, name, test_data_dir=None):
         frequency = '//div[label[text()="Frequency"]]/input[not(@disabled)]'
         norm = '//div[label[text()="Norm"]]/input[not(@disabled)]'
         position = '//div[label[text()="Position"]]/input[not(@disabled)]'
-        switch_view_btn = '//*[@id="modal-content-add-analyzer"]/div[1]/div/div[2]/div/div[2]/button'
-        switch_form_btn = '//*[@id="modal-content-add-analyzer"]/div[1]/div/div[2]/div/div[2]/button'
-        create = '//*[@id="modal-content-add-analyzer"]/div[3]/button[2]'
+        switch_form_btn = "//*[text()='Switch to form view']"
         local_placeholder = '//div[label[text()="Locale"]]//input[not(@disabled)]'
         case_placeholder = '//div[label[text()="Case"]]//select[not(@disabled)]'
 
@@ -538,7 +531,7 @@ def add_new_analyzer(self, name, test_data_dir=None):
 
         # for nearest neighbor analyzer introduced on 3.10.x
         elif name == "My_Nearest_Neighbor_Analyzer":
-            location = test_data_dir / "makedata_suites" / "610_model_cooking.bin"
+            location = ui_data_dir / "ui_data" / "analyzer_page" / "610_model_cooking.bin"
             print(f'Selecting model location for {name} \n')
             model_location = '//div[label[text()="Model Location"]]//input[not(@disabled)]'
             model_location_sitem = self.locator_finder_by_xpath(model_location)
@@ -553,7 +546,7 @@ def add_new_analyzer(self, name, test_data_dir=None):
 
         # for classification analyzer introduced on 3.10.x
         elif name == "My_Classification_Analyzer":
-            location = test_data_dir / "makedata_suites" / "610_model_cooking.bin"
+            location = ui_data_dir / "ui_data" / "analyzer_page" / "610_model_cooking.bin"
             print(f'Selecting model location for {name} \n')
             model_location = '//div[label[text()="Model Location"]]//input[not(@disabled)]'
             model_location_sitem = self.locator_finder_by_xpath(model_location)
@@ -717,18 +710,23 @@ def add_new_analyzer(self, name, test_data_dir=None):
             time.sleep(2)
 
         print(f'Switching current view to form view for {name}\n')
+        switch_view_btn = '//*[@id="modal-content-add-analyzer"]/div[1]/div/div[2]/div/div[2]/button'
         code_view_sitem = self.locator_finder_by_xpath(switch_view_btn)
         code_view_sitem.click()
         time.sleep(3)
 
         print(f'Switching current view to code view for {name}\n')
-        form_view_sitem = self.locator_finder_by_xpath(switch_form_btn)
+        form_view_sitem = self.locator_finder_by_xpath(switch_view_btn)
         form_view_sitem.click()
         time.sleep(3)
 
         print(f"Selecting the create button for the {name} \n")
-        create_btn = create
-        create_btn_sitem = self.locator_finder_by_xpath(create_btn)
+        if self.package_version >= semver.VersionInfo.parse('3.11.0'):
+            create = '//*[@id="chakra-modal-2"]/footer/button[2]'
+        else:
+            create = "//*[text()='Create']"
+
+        create_btn_sitem = self.locator_finder_by_xpath(create)
         create_btn_sitem.click()
         time.sleep(2)
 

release_tester/selenium_ui_test/pages/base_page.py

@@ -323,6 +323,7 @@ def locator_finder_by_link_text(self, locator_name):
         )
         if self.locator is None:
             print("UI-Test: ", locator_name, " locator has not found.")
+            return None
         else:
             return self.locator
 
@@ -392,7 +393,7 @@ def locator_finder_by_css_selectors(self, locator_name, timeout=10):
 
     # pylint: disable=too-many-arguments
     def check_expected_error_messages_for_analyzer(
-        self, error_input, print_statement, error_message, locators_id, error_message_id
+            self, error_input, print_statement, error_message, locators_id, error_message_id
         ):
         """This method will take three lists and check for expected error condition against user's inputs"""
         i = 0
@@ -438,7 +439,7 @@ def check_expected_error_messages_for_analyzer(
 
     # pylint: disable=too-many-arguments
     def check_expected_error_messages_for_database(
-        self, error_input, print_statement, error_message, locators_id, error_message_id, value=False
+            self, error_input, print_statement, error_message, locators_id, error_message_id, value=False
     ):
         """This method will take three lists and check for expected error condition against user's inputs"""
         # value represent true because cluster rf and write concern has different wat to catch the error

release_tester/selenium_ui_test/pages/query_page.py

@@ -28,7 +28,7 @@ def __init__(self, driver, cfg):
         self.save_current_query_id = "saveCurrentQuery"
         self.new_query_name_id = "new-query-name"
         self.select_query_size_id = "querySize"
-        self.json_to_table_span_it = "switchTypes"
+        # self.json_to_table_span_it = "switchTypes"
         self.collection_settings_id = "//*[@id='subNavigationBarPage']/ul[2]/li[4]/a"
         self.graph_page = "graphs"
         self.select_create_graph_id = "createGraph"
@@ -201,6 +201,13 @@ def spot_light_function(self, search):
         self.send_key_action(Keys.ENTER)
         time.sleep(2)
 
+    def navigate_to_col_content_tab(self):
+        """ this method will take to collection content tab"""
+        content = "//div[@id='subNavigationBar']/ul[2]//a[.='Content']"
+        content_sitem = self.locator_finder_by_xpath(content)
+        content_sitem.click()
+        time.sleep(1)
+
     def update_documents(self):
         """update some documents"""
         print("Navigating to Collection page \n")
@@ -214,6 +221,8 @@ def update_documents(self):
         col_name = self.locator_finder_by_xpath(col_name)
         col_name.click()
         time.sleep(1)
+        
+        self.navigate_to_col_content_tab()
 
         # get key text from the first row
         row_id = "//div[@id='docPureTable']/div[2]/div[1]"
@@ -322,16 +331,16 @@ def bind_parameters_query(self):
 
         self.scroll()
 
-        json = self.json_to_table_span_it
-        table = self.json_to_table_span_it
+        json = "//*[text()='JSON']"
+        table = "//*[text()='Table']"
 
         print("Changing execution format JSON format to Table format\n")
-        json = self.locator_finder_by_id(json)
+        json = self.locator_finder_by_xpath(json)
         json.click()
         time.sleep(3)
 
         print("Changing execution format Table format to JSON format\n")
-        table = self.locator_finder_by_id(table)
+        table = self.locator_finder_by_xpath(table)
         table.click()
         time.sleep(3)
 

release_tester/selenium_ui_test/pages/service_page.py

@@ -190,7 +190,7 @@ def checking_demo_geo_s2_service_github(self):
         assert page_title == expected_title, f"Expected text {expected_title} but got {page_title}"
         self.webdriver.back()
 
-    def install_demo_geo_s2_service(self, mount_path, test_data_dir):
+    def install_demo_geo_s2_service(self, mount_path, ui_data_dir):
         """Installing demo geo s2 service from the list"""
         self.select_demo_geo_s2_service()
 
@@ -250,12 +250,19 @@ def install_demo_geo_s2_service(self, mount_path, test_data_dir):
                 if neighbourhoods_collection_sitem.text == 'neighborhoods':
                     print('open it and populate necessary data into it \n')
                     neighbourhoods_collection_sitem.click()
+
+                    # selecting content submenu
+                    content = "//div[@id='subNavigationBar']/ul[2]//a[.='Content']"
+                    content_sitem = self.locator_finder_by_xpath(content)
+                    content_sitem.click()
+                    time.sleep(1)
+
                     print('select upload button \n')
                     upload = '//*[@id="importCollection"]/span/i'
                     self.locator_finder_by_xpath(upload).click()
                     time.sleep(1)
 
-                    path1 = test_data_dir / "ui_data" / "service_page" / "demo_geo_s2" / "neighborhoods.json"
+                    path1 = ui_data_dir / "ui_data" / "service_page" / "demo_geo_s2" / "neighborhoods.json"
                     print(f'Providing neighborhood collection path {path1} \n')
                     choose_file_btn = 'importDocuments'
                     choose_file_btn_sitem = self.locator_finder_by_id(choose_file_btn)
@@ -272,6 +279,10 @@ def install_demo_geo_s2_service(self, mount_path, test_data_dir):
                 else:
                     raise Exception('neighbourhood Collection not found!')
 
+                collection_page = 'collections'
+                self.locator_finder_by_id(collection_page).click()
+                time.sleep(1)
+                
                 # looking for restaurants collection has been created or not
                 restaurants_collection = '//*[@id="collection_restaurants"]/div/h5'
                 restaurants_collection_sitem = self.locator_finder_by_xpath(restaurants_collection)
@@ -280,12 +291,18 @@ def install_demo_geo_s2_service(self, mount_path, test_data_dir):
                 if restaurants_collection_sitem.text == 'restaurants':
                     print('open it and populate necessary data into it \n')
                     restaurants_collection_sitem.click()
+                    # selecting content submenu
+                    content = "//div[@id='subNavigationBar']/ul[2]//a[.='Content']"
+                    content_sitem = self.locator_finder_by_xpath(content)
+                    content_sitem.click()
+                    time.sleep(1)
+
                     print('select upload button \n')
                     upload = '//*[@id="importCollection"]/span/i'
                     self.locator_finder_by_xpath(upload).click()
                     time.sleep(1)
 
-                    path2 = test_data_dir / "ui_data" / "service_page" / "demo_geo_s2" / "neighborhoods.json"
+                    path2 = ui_data_dir / "ui_data" / "service_page" / "demo_geo_s2" / "neighborhoods.json"
                     print(f'Providing restaurants collection path {path2} \n')
                     choose_file_btn = 'importDocuments'
                     choose_file_btn_sitem = self.locator_finder_by_id(choose_file_btn)

release_tester/selenium_ui_test/pages/views_page.py

@@ -32,9 +32,9 @@ def __init__(self, driver, cfg):
         super().__init__(driver, cfg)
         self.current_version = self.current_package_version()
         self.testing_version = semver.VersionInfo.parse("3.9.100")
-        self.select_views_tab_id = "/html//a[@id='views']"
-        self.create_new_views_id = "/html//a[@id='createView']"
-        self.naming_new_view_id = "/html//input[@id='newName']"
+        self.select_views_tab_id = "views"
+        self.create_new_view = 'createView'
+        self.naming_new_view_id = '//input[@id="name"]'
         self.select_create_btn_id = "//div[@id='modal-dialog']//button[@class='button-success']"
         self.select_views_settings_id = "//a[@id='viewsToggle']/span[@title='Settings']"
         self.select_sorting_views_id = '//*[@id="viewsDropdown"]/ul/li[2]/a/label/i'
@@ -63,8 +63,8 @@ def __init__(self, driver, cfg):
 
     def select_views_tab(self):
         """selecting views tab"""
-        select_views_tab_sitem = self.locator_finder_by_xpath(self.select_views_tab_id)
-        select_views_tab_sitem.click()
+        create_new_views_sitem = self.locator_finder_by_id(self.select_views_tab_id)
+        create_new_views_sitem.click()
 
     def create_new_views(self, name):
         """creating new views tab"""
@@ -253,13 +253,13 @@ def create_improved_views(self, view_name, types):
         This method will create the improved views for v3.9+
         """
         print("Selecting views create button \n")
-        create_new_views_id = self.locator_finder_by_xpath(self.create_new_views_id)
+        create_new_views_id = self.locator_finder_by_id(self.create_new_view)
         create_new_views_id.click()
         time.sleep(2)
 
         self.wait_for_ajax()
         print(f"Select name for the {view_name} \n")
-        name_id = "newName"
+        name_id = 'newName'
         name_id_sitem = self.locator_finder_by_id(name_id)
         name_id_sitem.click()
         name_id_sitem.clear()
@@ -785,7 +785,7 @@ def checking_views_negative_scenario_for_views(self):
         """This method will check negative input for views name during creation"""
         self.select_views_tab()
         print('Selecting views create button \n')
-        create_new_views_id = self.locator_finder_by_xpath(self.create_new_views_id)
+        create_new_views_id = self.locator_finder_by_id(self.create_new_view)
         create_new_views_id.click()
         time.sleep(2)
         self.wait_for_ajax()

release_tester/selenium_ui_test/test_suites/analyzers_test_suite.py

@@ -35,7 +35,7 @@ def test_analyzers(self):
                 analyzers.checking_all_built_in_analyzer()
 
                 print('Creating all supported analyzers\n')
-                analyzers.creating_all_supported_analyzer(self.is_enterprise, self.test_data_dir)
+                analyzers.creating_all_supported_analyzer(self.is_enterprise, self.ui_data_dir)
 
                 print('Checking expected negative scenarios for analyzers\n')
                 analyzers.analyzer_expected_error_check()

release_tester/selenium_ui_test/test_suites/base_selenium_test_suite.py

@@ -38,7 +38,7 @@ def __init__(self, selenium_runner):
         self.cfg = selenium_runner.cfg
         self.importer = selenium_runner.importer
         self.restore = selenium_runner.restorer
-        self.test_data_dir = selenium_runner.cfg.ui_data_dir.resolve()
+        self.ui_data_dir = selenium_runner.cfg.ui_data_dir.resolve()
         self.is_enterprise = selenium_runner.cfg.enterprise
         self.is_headless = selenium_runner.is_headless
         self.sub_suite_name = self.__doc__ or self.__class__.__name__

release_tester/selenium_ui_test/test_suites/graph_test_suite.py

@@ -28,7 +28,7 @@ def test_graph(self):
                 print("Creating '%s' Graph" % graph.get_name())
                 this_graph.navbar_goto("graphs")
                 self.webdriver.refresh()
-                this_graph.create_graph(graph_id, self.importer, self.test_data_dir)
+                this_graph.create_graph(graph_id, self.importer, self.ui_data_dir)
                 this_graph.check_required_collections(graph_id)
 
                 this_graph.select_graph_page()
@@ -48,7 +48,7 @@ def test_graph(self):
                 this_graph.navbar_goto("graphs")
                 self.webdriver.refresh()
                 print("Creating '%s' Graph" % graph.get_name())
-                this_graph.create_graph(graph_id, self.importer, self.test_data_dir)
+                this_graph.create_graph(graph_id, self.importer, self.ui_data_dir)
                 this_graph.check_required_collections(graph_id)
 
                 this_graph.select_graph_page()

release_tester/selenium_ui_test/test_suites/query_test_suite.py

@@ -26,7 +26,7 @@ def test_query(self):
             query_page.saved_query_check()
 
         print("Importing IMDB collections \n")
-        query_page.import_collections(self.restore, self.test_data_dir, self.is_cluster)
+        query_page.import_collections(self.restore, self.ui_data_dir, self.is_cluster)
 
         print("Selecting Query page for basic CRUD operation \n")
         query_page.selecting_query_page()
@@ -59,7 +59,7 @@ def test_query(self):
         query_page.navbar_goto("graphs")
         self.webdriver.refresh()
         print("Creating '%s' Graph" % get_graph(graph).get_name())
-        graph_page.create_graph(graph, self.importer, self.test_data_dir)
+        graph_page.create_graph(graph, self.importer, self.ui_data_dir)
         graph_page.check_required_collections(graph)
         query_page.world_country_graph_query()
         query_page.navbar_goto("graphs")
@@ -71,7 +71,7 @@ def test_query(self):
         query_page.navbar_goto("graphs")
         self.webdriver.refresh()
         print("Creating '%s' Graph" % get_graph(graph).get_name())
-        graph_page.create_graph(graph, self.importer, self.test_data_dir)
+        graph_page.create_graph(graph, self.importer, self.ui_data_dir)
         graph_page.check_required_collections(graph)
         query_page.k_shortest_paths_graph_query()
         query_page.navbar_goto("graphs")
@@ -83,7 +83,7 @@ def test_query(self):
         graph_page.navbar_goto("graphs")
         self.webdriver.refresh()
         print("Creating '%s' Graph" % get_graph(graph).get_name())
-        graph_page.create_graph(graph, self.importer, self.test_data_dir)
+        graph_page.create_graph(graph, self.importer, self.ui_data_dir)
         graph_page.check_required_collections(graph)
         print("Executing City Graph query \n")
         query_page.city_graph()
@@ -95,7 +95,7 @@ def test_query(self):
         self.webdriver.refresh()
 
         print("Importing new queries \n")
-        query_page.import_queries(str(self.test_data_dir / "ui_data" / "query_page" / "imported_query.json"))
+        query_page.import_queries(str(self.ui_data_dir / "ui_data" / "query_page" / "imported_query.json"))
         print("Saving Current query as custom query\n")
         query_page.custom_query()
         print("Changing the number of results from 1000 to 100\n")

release_tester/selenium_ui_test/test_suites/support_test_suite.py

@@ -32,8 +32,8 @@ def test_support(self):
         support.driver_and_integration_link()
         print("Checking Community Support tab \n")
         support.community_support_link()
-        print("Checking Rest API tab \n")
-        support.rest_api()
+        # print("Checking Rest API tab \n")
+        # # support.rest_api()
 
         # logging out from the current user
         # login.logout_button()

release_tester/selenium_ui_test/test_suites/views_test_suite.py

@@ -26,7 +26,7 @@ def test_views(self):
 
         try:
             print("Selecting Views tab\n")
-            views.select_views_tab()
+            views.navbar_goto("views")
 
             # creating v3.9.x and v3.10.x for improved views
             if views.current_package_version() >= semver.VersionInfo.parse("3.9.0"):
@@ -130,7 +130,7 @@ def test_views(self):
             # deleting improved views for v3.10.x
             elif views.current_package_version() > semver.VersionInfo.parse("3.9.100"):
                 print("Selecting Views tab\n")
-                views.select_views_tab()
+                views.navbar_goto("views")
 
                 print('Deleting views started for >= v3.10.x\n')
                 views.delete_new_views('improved_arangosearch_view_01')