pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed feature test cases for maintenance dialog.

pull/67/head
Nikhil Mohite 2022-01-18 14:51:02 +05:30 committed by Akshay Joshi
parent 9f836f5433
commit e7e4d5cf0a
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/feature_tests/pg_utilities_maintenance_test.py
View File

@ -79,7 +79,7 @@ class PGUtilitiesMaintenanceFeatureTest(BaseFeatureTest):
def runTest(self): def runTest(self):
self._open_maintenance_dialogue() self._open_maintenance_dialogue()
self.page.click_modal('OK') self.page.click_modal('OK', True)
self.page.wait_for_element_to_disappear( self.page.wait_for_element_to_disappear(
lambda driver: driver.find_element( lambda driver: driver.find_element(
By.XPATH, NavMenuLocators.maintenance_operation)) By.XPATH, NavMenuLocators.maintenance_operation))

4
web/pgadmin/tools/maintenance/static/js/maintenance.js
View File

@ -99,6 +99,10 @@ define([
setExtraParameters(treeInfo) { setExtraParameters(treeInfo) {
var extraData = {}; var extraData = {};
extraData['database'] = treeInfo.database._label; extraData['database'] = treeInfo.database._label;
if(treeInfo?.schema) {
extraData['schema'] = treeInfo?.schema._label;
extraData['table'] = treeInfo?.table._label;
}
extraData['save_btn_icon'] = 'done'; extraData['save_btn_icon'] = 'done';
return extraData; return extraData;
}, },

2
web/regression/feature_utils/pgadmin_page.py
View File

@ -88,7 +88,7 @@ class PgadminPage:
# In case of react dialog we use different xpath # In case of react dialog we use different xpath
if react_dialog: if react_dialog:
modal_button = self.find_by_xpath( modal_button = self.find_by_xpath(
"//div[@class ='MuiDialogContent-root']" "//button[contains(@class,'MuiButtonBase-root')]"
"//span[text()='%s']" % button_text) "//span[text()='%s']" % button_text)
else: else:
modal_button = self.find_by_xpath( modal_button = self.find_by_xpath(