Remove Alertify from pgAdmin completely. Fixes #7619

web/regression/feature_utils/locators.py

@@ -24,7 +24,7 @@ class BrowserToolBarLocators():
     filter_data_button_css = \
         ".wcFrameButton[title='Filtered Rows']:not(.disabled)"
 
-    filter_alertify_box_css = "//*[@id='0']/div[contains(text()," \
+    filter_box_css = "//*[@id='0']/div[contains(text()," \
                               "'Data Filter')]"
 
 
@@ -271,14 +271,13 @@ class ConnectToServerDiv:
     password_field = "//input[@id='password']"
 
     ok_button = \
-        "//button[@class='ajs-button btn btn-primary fa fa-check " \
-        "pg-alertify-button']"
+        "//button[@class='ajs-button btn btn-primary fa fa-check']"
 
     error_message = \
         "//form[@id='frmPassword']/div/div//div[@class='alert-text']"
 
     cancel_button = \
-        "//div [@class='alertify  ajs-modeless ajs-movable ajs-zoom']" \
+        "//div [@class='ajs-modeless ajs-movable ajs-zoom']" \
         "//button[text()='Cancel']"
 
 

web/regression/feature_utils/pgadmin_page.py

@@ -83,18 +83,12 @@ class PgadminPage:
 
     def click_modal(self, button_text, react_dialog=False):
         time.sleep(0.5)
-        # Find active alertify dialog in case of multiple alertify dialog
+        # Find active dialog in case of multiple dialog
         # & click on that dialog
 
         # In case of react dialog we use different xpath
-        if react_dialog:
-            modal_button = self.find_by_xpath(
-                "//span[text()='{}']".format(button_text))
-        else:
-            modal_button = self.find_by_xpath(
-                "//div[contains(@class, 'alertify') and "
-                "not(contains(@class, 'ajs-hidden'))]//button[.='%s']"
-                % button_text)
+        modal_button = self.find_by_xpath(
+            "//span[text()='{}']".format(button_text))
 
         self.click_element(modal_button)