Merge pull request #479 from arangodb/feature/fix_312_compatibility

Feature/fix 312 compatibility

Author: MDAlFattah

release_tester/selenium_ui_test/pages/collection_page.py

@@ -255,21 +255,25 @@ def create_new_collections(self, name, doc_type, is_cluster):
                 advance_option_sitem.click()
                 time.sleep(1)
 
-                print(f"selecting number of Shards for the {name} \n")
-                shards = "numberOfShards"
-                shards_sitem = self.locator_finder_by_id(shards)
-                shards_sitem.click()
-                shards_sitem.clear()
-                shards_sitem.send_keys(Keys.BACKSPACE, "9")
-                time.sleep(2)
-
-                print(f"selecting number of replication factor for {name} \n")
-                rf = "replicationFactor"
-                rf_sitem = self.locator_finder_by_id(rf)
-                rf_sitem.click()
-                rf_sitem.clear()
-                rf_sitem.send_keys(Keys.BACKSPACE, "3")
-                time.sleep(2)
+                try:
+                    print(f"selecting number of Shards for the {name} \n")
+                    shards = "numberOfShards"
+                    shards_sitem = self.locator_finder_by_id(shards)
+                    shards_sitem.click()
+                    shards_sitem.clear()
+                    shards_sitem.send_keys(Keys.BACKSPACE, "9")
+                    time.sleep(2)
+
+                    print(f"selecting number of replication factor for {name} \n")
+                    rf = "replicationFactor"
+                    rf_sitem = self.locator_finder_by_id(rf)
+                    rf_sitem.click()
+                    rf_sitem.clear()
+                    rf_sitem.send_keys(Keys.BACKSPACE, "3")
+                    time.sleep(2)
+                except Exception as e:
+                    print("Might be failed due to forced-one-shard option is enabled, need a fix \n")
+                    print(str(e))
             else:
                 print(f"selecting number of Shards for the {name} \n")
                 shards = "new-collection-shards"
@@ -1174,8 +1178,9 @@ def create_new_index(self, index_name, value, is_cluster, check=False):
 
         print(f"Creating {index_name} index completed \n")
 
-    def delete_all_index(self, check=False):
-        """this method will delete all the indexes one by one"""
+    def delete_index_311(self, check=False):
+        """this method will delete all the indexes one by one for =<3.11.99"""
+        self.webdriver.maximize_window()
         try:
             delete = '//*[@id="collectionEditIndexTable"]/tbody/tr[2]/th[10]/span'
             if check:
@@ -1191,9 +1196,11 @@ def delete_all_index(self, check=False):
             self.webdriver.refresh()
         except TimeoutException as e:
             print('Something went wrong', e, '\n')
+        self.webdriver.set_window_size(1600, 900)
 
-    def delete_index(self, index):
-        """this method will delete all the indexes one by one"""
+    def delete_index_312(self, index):
+        """this method will delete all the indexes one by one for >= 3.12.0"""
+        self.webdriver.maximize_window()
         try:
             self.webdriver.refresh()
             self.wait_for_ajax()
@@ -1206,10 +1213,19 @@ def delete_index(self, index):
             delete_sitem = self.locator_finder_by_xpath(delete)
             delete_sitem.click()
             time.sleep(1)
+            self.wait_for_ajax()
+            
             delete_confirmation = "(//button[normalize-space()='Delete'])[1]"
             delete_confirmation_sitem = self.locator_finder_by_xpath(delete_confirmation)
             delete_confirmation_sitem.click()
             time.sleep(1)
+            self.wait_for_ajax()
+            
+            delete_final_confirmation = "(//button[@class='chakra-button css-flye6g'])[1]"
+            delete_final_confirmation_sitem = self.locator_finder_by_xpath(delete_final_confirmation)
+            delete_final_confirmation_sitem.click()
+            time.sleep(1)
+            self.wait_for_ajax()
 
         except TimeoutException as e:
             try:
@@ -1226,7 +1242,9 @@ def delete_index(self, index):
                 delete_confirmation_sitem.click()
 
             except BaseException as e:
-                print('Something went wrong, moving on \n')
+                print('Something went wrong', e, '\n')
+                self.navbar_goto
+        self.webdriver.set_window_size(1600, 900)
 
     def select_info_tab(self):
         """Selecting info tab from the collection submenu"""

release_tester/selenium_ui_test/test_suites/collections_test_suite.py

@@ -32,11 +32,11 @@ def test_collection(self):
             col.create_new_collections('Test', 0, self.is_cluster)
             col.create_new_collections('ComputedValueCol', 0, self.is_cluster)
 
-            if col.current_package_version() >= semver.VersionInfo.parse("3.9.100"):
+            if col.version_is_newer_than("3.9.99"):
                 col.test_computed_values()
 
             print("checking Search options\n")
-            if col.current_package_version() >= semver.VersionInfo.parse("3.11.100"):
+            if col.version_is_newer_than("3.11.99"):
                 col.checking_search_options()
             else:
                 print("Searching using keyword 'Doc'\n")
@@ -50,9 +50,9 @@ def test_collection(self):
                 self.webdriver.refresh()
 
             # basic collection page feature check for
-            if col.current_package_version() >= semver.VersionInfo.parse("3.9.99"):
+            if col.version_is_newer_than("3.9.99"):
                 col.select_collection_page()
-                if col.current_package_version() >= semver.VersionInfo.parse("3.11.99"):
+                if col.version_is_newer_than("3.11.99"):
                     print("basic feature will be added later on!")
                 else:
                     print("Selecting Settings\n")
@@ -140,7 +140,7 @@ def test_collection(self):
                 print("Create new index\n")
                 version = col.current_package_version()
 
-                if version >= semver.VersionInfo.parse("3.11.0"):
+                if col.version_is_newer_than("3.11.0"):
                     col.create_index('Persistent')
                     col.create_index('Geo')
                     col.create_index('Fulltext')
@@ -155,15 +155,15 @@ def test_collection(self):
                     col.create_new_index("Fulltext", 3, self.is_cluster)
                     col.create_new_index("TTL", 4, self.is_cluster)
 
-                if version <= semver.VersionInfo.parse("3.10.99"):
-                    if version > semver.VersionInfo.parse("3.9.99"):
+                if col.version_is_older_than("3.10.99"):
+                    if col.version_is_newer_than("3.9.99"):
                         col.create_new_index('ZKD', 5, self.is_cluster, True)
                     else:
                         col.create_new_index('ZKD', 5, self.is_cluster)
 
                     print("Deleting all index started for < v3.11.x\n")
                     for i in range(4):
-                        col.delete_all_index(True)
+                        col.delete_index_311(True)
                     print("Deleting all index completed\n")
                 else:
                     print("Deleting all index started for > v3.11.x\n")
@@ -172,10 +172,10 @@ def test_collection(self):
                     col.select_doc_collection()
                     col.select_index_menu()
                     for index in range(4):
-                        col.delete_index(index)
+                        col.delete_index_312(index)
                     print("Deleting all index completed\n")
 
-                if col.current_package_version() >= semver.VersionInfo.parse("3.11.99"):
+                if col.version_is_newer_than("3.11.99"):
                     print("basic feature will be added later on!")
                 else:
                     print("Select Info tab\n")

release_tester/selenium_ui_test/test_suites/support_test_suite.py

@@ -27,12 +27,13 @@ def test_support(self):
             support.manual_link()
         print("Checking all AQL Query Language link\n")
         support.aql_query_language_link()
-        print("Checking all Fox Framework link \n")
-        support.fox_framework_link()
-        print("Checking all Drivers and Integration links\n")
-        support.driver_and_integration_link()
-        print("Checking Community Support tab \n")
-        support.community_support_link()
+        if support.version_is_newer_than("3.11.99") and self.is_enterprise:
+            print("Checking all Fox Framework link \n")
+            support.fox_framework_link()
+            print("Checking all Drivers and Integration links\n")
+            support.driver_and_integration_link()
+            print("Checking Community Support tab \n")
+            support.community_support_link()
         # print("Checking Rest API tab \n")
         # # support.rest_api()