Skip to content

Commit 3fe0362

Browse files
committed
move around some page objects + create new ones for reolved issues
1 parent 59529ea commit 3fe0362

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

tests/acceptance/page_objects/base.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ def __init__(self, browser):
1111
def driver(self):
1212
return self.browser.driver
1313

14+
def wait_until_loaded(self):
15+
self.browser.wait_until_not('.loading-indicator')
16+
1417

1518
class BaseElement(object):
1619
def __init__(self, element):

tests/acceptance/page_objects/issue_list.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,9 @@ def resolve_issues(self):
2222
self.browser.click('[aria-label="Resolve"]')
2323
self.browser.click('[data-test-id="confirm-modal"]')
2424

25-
def wait_until_loaded(self):
26-
self.browser.wait_until_not('.loading-indicator')
25+
def wait_for_resolved_issue(self):
26+
self.browser.wait_until('[data-test-id="resolved-issue"]')
27+
28+
def find_resolved_issues(self):
29+
self.browser.find_elements_by_css_selector(
30+
'[data-test-id="resolved-issue"]')

tests/acceptance/test_organization_group_index.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,9 @@ def test_resolve_issues(self, mock_now):
9191
self.page.select_issue(1)
9292
self.page.select_issue(2)
9393
self.page.resolve_issues()
94+
self.page.wait_for_resolved_issue()
95+
resolved_groups = self.page.find_resolved_issues()
9496

95-
self.browser.wait_until('[data-test-id="resolved-issue"]')
96-
resolved_groups = self.browser.find_elements_by_css_selector(
97-
'[data-test-id="resolved-issue"]')
9897
assert len(resolved_groups) == 2
9998

10099
@patch('django.utils.timezone.now')
@@ -109,8 +108,7 @@ def test_resolve_issues_multi_projects(self, mock_now):
109108
self.page.select_issue(1)
110109
self.page.select_issue(2)
111110
self.page.resolve_issues()
111+
self.page.wait_for_resolved_issue()
112+
resolved_groups = self.page.find_resolved_issues()
112113

113-
self.browser.wait_until('[data-test-id="resolved-issue"]')
114-
resolved_groups = self.browser.find_elements_by_css_selector(
115-
'[data-test-id="resolved-issue"]')
116114
assert len(resolved_groups) == 2

0 commit comments

Comments
 (0)