IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed API test cases.

Browse Source 
refs #7428
This commit is contained in:
Yogesh Mahajan
2022-07-18 18:15:46 +05:30
committed by Akshay Joshi
parent 8f2bda2309
commit 8f73956d1e
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
web/pgadmin/feature_tests/view_data_dml_queries.py
View File

@@ -54,7 +54,7 @@ class CheckForViewDataTest(BaseFeatureTest):
dict()) dict())
] ]
TIMEOUT_STRING = "Timed out waiting for div element to appear" TIMEOUT_STRING = "5"
# query for creating 'defaults_text' table # query for creating 'defaults_text' table
defaults_query = """ defaults_query = """
@@ -220,7 +220,7 @@ CREATE TABLE public.nonintpkey
""" """
cell_type = data[2] cell_type = data[2]
value = data[0] value = data[0]
retry = 2 retry = 3
while retry > 0: while retry > 0:
self.wait.until(EC.visibility_of_element_located( self.wait.until(EC.visibility_of_element_located(
(By.XPATH, xpath)), CheckForViewDataTest.TIMEOUT_STRING (By.XPATH, xpath)), CheckForViewDataTest.TIMEOUT_STRING
@@ -228,11 +228,12 @@ CREATE TABLE public.nonintpkey
cell_el = self.page.find_by_xpath(xpath) cell_el = self.page.find_by_xpath(xpath)
self.page.driver.execute_script( self.page.driver.execute_script(
"arguments[0].scrollIntoView(false)", cell_el) "arguments[0].scrollIntoView(false)", cell_el)
time.sleep(0.2)
ActionChains(self.driver).move_to_element(cell_el).perform() ActionChains(self.driver).move_to_element(cell_el).perform()
ActionChains(self.driver).double_click(cell_el).perform() ActionChains(self.driver).double_click(cell_el).perform()
if cell_type in ['int', 'int[]'] and \ if cell_type in ['int', 'int[]'] and \
self._update_numeric_cell(cell_el, value): self._update_numeric_cell(xpath, value):
break break
elif cell_type in ['text', 'text[]', 'boolean[]'] and \ elif cell_type in ['text', 'text[]', 'boolean[]'] and \
self._update_text_cell(cell_el, value): self._update_text_cell(cell_el, value):
@@ -248,8 +249,9 @@ CREATE TABLE public.nonintpkey
file=sys.stderr) file=sys.stderr)
retry -= 1 retry -= 1
def _update_numeric_cell(self, cell_el, value): def _update_numeric_cell(self, cell_el_xpath, value):
try: try:
cell_el = self.page.find_by_xpath(cell_el_xpath)
if value == 'clear': if value == 'clear':
cell_el.find_element(By.CSS_SELECTOR, 'input').clear() cell_el.find_element(By.CSS_SELECTOR, 'input').clear()
else: else:
@@ -264,7 +266,7 @@ CREATE TABLE public.nonintpkey
def _update_text_cell(self, cell_el, value): def _update_text_cell(self, cell_el, value):
try: try:
text_area_ele = WebDriverWait(self.driver, 2).until( text_area_ele = WebDriverWait(self.driver, 3).until(
EC.visibility_of_element_located( EC.visibility_of_element_located(
(By.CSS_SELECTOR, (By.CSS_SELECTOR,
QueryToolLocators.row_editor_text_area_css))) QueryToolLocators.row_editor_text_area_css)))
@@ -293,7 +295,7 @@ CREATE TABLE public.nonintpkey
else: else:
key_to_press = Keys.CONTROL key_to_press = Keys.CONTROL
try: try:
WebDriverWait(self.driver, 2).until( WebDriverWait(self.driver, 3).until(
EC.visibility_of_element_located( EC.visibility_of_element_located(
(By.CSS_SELECTOR, (By.CSS_SELECTOR,
QueryToolLocators.json_editor_text_area_css))) QueryToolLocators.json_editor_text_area_css)))

6
web/pgadmin/tools/import_export/__init__.py
View File

@@ -240,8 +240,10 @@ def _get_required_column_list(data, driver, conn):
def _save_import_export_settings(settings): def _save_import_export_settings(settings):
[settings.pop(key) for key in ['icolumns', 'columns', 'database', settings = {key: settings[key] for key in settings if key not in
'schema', 'table', 'save_btn_icon']] ['icolumns', 'columns', 'database', 'schema', 'table',
'save_btn_icon']}
if settings['is_import']: if settings['is_import']:
settings['import_file_name'] = settings['filename'] settings['import_file_name'] = settings['filename']
else: else: