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

(cherry picked from commit 78dcdc87)

35193d5c Using find_elements instead of all_elements

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)

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