kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'qa-fix-select-activities' into 'master' 

Using find_elements instead of all_elements

Closes gitlab-org/quality/staging#18

See merge request gitlab-org/gitlab-ce!23977
This commit is contained in:
Mark Lapierre 2018-12-26 10:45:35 +00:00
parent 145079b354 35193d5c05
commit 78dcdc871a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qa/qa/page/base.rb
View File

@ -80,8 +80,8 @@ module QA
page.evaluate_script('xhr.status') == 200 page.evaluate_script('xhr.status') == 200
end end
def find_element(name, wait: Capybara.default_max_wait_time) def find_element(name, text_filter = nil, wait: Capybara.default_max_wait_time)
find(element_selector_css(name), wait: wait) find(element_selector_css(name), wait: wait, text: text_filter)
end end
def all_elements(name) def all_elements(name)

6
qa/qa/page/project/issue/show.rb
View File

@ -37,17 +37,17 @@ module QA
def select_comments_only_filter def select_comments_only_filter
click_element :discussion_filter click_element :discussion_filter
all_elements(:filter_options)[1].click find_element(:filter_options, "Show comments only").click
end end
def select_history_only_filter def select_history_only_filter
click_element :discussion_filter click_element :discussion_filter
all_elements(:filter_options).last.click find_element(:filter_options, "Show history only").click
end end
def select_all_activities_filter def select_all_activities_filter
click_element :discussion_filter click_element :discussion_filter
all_elements(:filter_options).first.click find_element(:filter_options, "Show all activity").click
end end
end end
end end