summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorat.ramya <rauthappan@gitlab.com>2018-12-21 14:29:59 +0530
committerat.ramya <rauthappan@gitlab.com>2018-12-21 14:29:59 +0530
commit35193d5c05b39de1dbcaf41d567b023038dbb7df (patch)
tree287af2ead30006a1e1e554733e7153d4e041f08b
parent80ff142c1cb8b11e6e1eda27dfc09cf0253e824b (diff)
downloadgitlab-ce-35193d5c05b39de1dbcaf41d567b023038dbb7df.tar.gz
Using find_elements instead of all_elements
-rw-r--r--qa/qa/page/base.rb4
-rw-r--r--qa/qa/page/project/issue/show.rb6
2 files changed, 5 insertions, 5 deletions
diff --git a/qa/qa/page/base.rb b/qa/qa/page/base.rb
index 88ade66f47d..e1c713b4e97 100644
--- a/qa/qa/page/base.rb
+++ b/qa/qa/page/base.rb
@@ -80,8 +80,8 @@ module QA
page.evaluate_script('xhr.status') == 200
end
- def find_element(name, wait: Capybara.default_max_wait_time)
- find(element_selector_css(name), wait: wait)
+ def find_element(name, text_filter = nil, wait: Capybara.default_max_wait_time)
+ find(element_selector_css(name), wait: wait, text: text_filter)
end
def all_elements(name)
diff --git a/qa/qa/page/project/issue/show.rb b/qa/qa/page/project/issue/show.rb
index 23def93c7dd..9ec6d90719e 100644
--- a/qa/qa/page/project/issue/show.rb
+++ b/qa/qa/page/project/issue/show.rb
@@ -37,17 +37,17 @@ module QA
def select_comments_only_filter
click_element :discussion_filter
- all_elements(:filter_options)[1].click
+ find_element(:filter_options, "Show comments only").click
end
def select_history_only_filter
click_element :discussion_filter
- all_elements(:filter_options).last.click
+ find_element(:filter_options, "Show history only").click
end
def select_all_activities_filter
click_element :discussion_filter
- all_elements(:filter_options).first.click
+ find_element(:filter_options, "Show all activity").click
end
end
end