Un-break the feature tests. Fixes from Surinder and myself.

web/pgadmin/feature_tests/copy_selected_query_results_feature_test.py

@@ -44,7 +44,7 @@ class CopySelectedQueryResultsFeatureTest(BaseFeatureTest):
         time.sleep(5)
         self.page.find_by_partial_link_text("Tools").click()
         self.page.find_by_partial_link_text("Query Tool").click()
-        self.page.click_tab('Query-1')
+        self.page.click_tab('Query -')
         time.sleep(5)
         ActionChains(self.page.driver).send_keys("SELECT * FROM test_table ORDER BY some_column").perform()
         self.page.driver.switch_to_frame(self.page.driver.find_element_by_tag_name("iframe"))

web/pgadmin/feature_tests/query_tool_journey_test.py

@@ -90,7 +90,7 @@ class QueryToolJourneyTest(BaseFeatureTest):
         time.sleep(5)
         self.page.find_by_partial_link_text("Tools").click()
         self.page.find_by_partial_link_text("Query Tool").click()
-        self.page.click_tab('Query-1')
+        self.page.click_tab('Query -')
         time.sleep(5)
 
     def _execute_query(self, query):

web/regression/feature_utils/pgadmin_page.py

@@ -113,7 +113,7 @@ class PgadminPage:
         try:
             self.driver.find_element_by_id("frmPassword")
             # Enter password here if needed
-            self.click_modal_ok()
+            self.click_modal('OK')
         except WebDriverException:
             return