Skip to content

Commit db1d9d1

Browse files
improve ViewQueue action
1 parent e0cd14d commit db1d9d1

File tree

2 files changed

+5
-14
lines changed

2 files changed

+5
-14
lines changed

app/selenium_ui/jsm/pages/agent_pages.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -236,10 +236,6 @@ def create_new_schema(self):
236236

237237
class InsightNewObject(BasePage):
238238

239-
def __init__(self, driver):
240-
super().__init__(driver)
241-
self.is_jsm_10 = False
242-
243239
def wait_for_page_loaded(self):
244240
self.wait_until_visible(InsightNewSchemaLocators.create_object_schemas)
245241

@@ -260,8 +256,6 @@ def insight_create_new_objects(self):
260256
self.get_element(InsightNewObjectLocators.object_name_field).send_keys(self.generate_random_string(10))
261257
self.wait_until_visible(InsightNewObjectLocators.create_another)
262258
if not self.get_elements(InsightNewObjectLocators.create_button):
263-
self.is_jsm_10 = True
264-
if self.is_jsm_10:
265259
self.wait_until_visible(InsightNewObjectLocators.create_button_jsm10)
266260
self.wait_until_clickable(InsightNewObjectLocators.create_button_jsm10).click()
267261
else:
@@ -274,7 +268,6 @@ class InsightDeleteSchema(BasePage):
274268

275269
def __init__(self, driver):
276270
BasePage.__init__(self, driver)
277-
self.is_jsm_10 = False
278271
url_manager = UrlManager()
279272
self.page_url = url_manager.view_insight_all_schemas()
280273

@@ -293,8 +286,6 @@ def delete_new_schema(self, schema_name):
293286
new_object_schema_delete_button_locator(schema_name)).click()
294287
self.wait_until_visible(InsightDeleteSchemaLocators.delete_window_selector)
295288
if not self.get_elements(InsightNewObjectLocators.create_button):
296-
self.is_jsm_10 = True
297-
if self.is_jsm_10:
298289
self.wait_until_clickable(InsightDeleteSchemaLocators.submit_delete_button_jsm10).click()
299290
self.wait_until_clickable(InsightDeleteSchemaLocators.submit_delete_button_jsm10).click()
300291
self.wait_until_invisible(InsightDeleteSchemaLocators.submit_delete_button_jsm10)
@@ -315,8 +306,8 @@ def wait_for_page_loaded(self):
315306
self.wait_until_visible(InsightViewQueueLocators.view_queue_page)
316307

317308
def view_random_queue_with_insight(self):
318-
self.wait_until_visible(InsightViewQueueLocators.presentation_key)
319-
if not self.get_elements(InsightViewQueueLocators.add_to_starred_button):
309+
self.wait_until_visible(InsightViewQueueLocators.table_container)
310+
if not self.get_elements(InsightViewQueueLocators.navigation):
320311
self.wait_until_visible(InsightViewQueueLocators.view_queue_insight_column)
321312
else:
322313
self.wait_until_visible(InsightViewQueueLocators.view_queue_insight_column_jsm10)

app/selenium_ui/jsm/pages/agent_selectors.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,9 @@ class InsightNewObjectLocators:
170170
class InsightViewQueueLocators:
171171
view_queue_page = (By.XPATH, "//section[@id='sd-page-panel']")
172172
view_queue_insight_column = (By.XPATH, "//span[contains(text(),'Insight')]")
173-
presentation_key = (By.XPATH, "//div[@data-column-name='Key']//div[@role='presentation']")
174-
add_to_starred_button = (By.XPATH, "//button[@data-testid='star-unstar-button-standalone']//span[@aria-label='Add to Starred']")
175-
view_queue_insight_column_jsm10 = (By.XPATH, "(//a[normalize-space()='Insight'])[1]")
173+
table_container = (By.XPATH, "//div[@class='queue-react-table-container']")
174+
navigation = (By.XPATH, "//div[@role='navigation']")
175+
view_queue_insight_column_jsm10 = (By.XPATH, "//a[normalize-space()='Insight']")
176176

177177

178178
class InsightSearchObjectIql:

0 commit comments

Comments
 (0)