Merge branch 'qa-issues-filter-history-only' into 'master'

Fix for the filter spec failure

Closes gitlab-org/quality/nightly#34 and gitlab-org/quality/nightly#30

See merge request gitlab-org/gitlab-ce!22862

qa/qa/page/project/issue/show.rb

@@ -36,6 +36,11 @@ module QA
           end
 
           def select_comments_only_filter
+            click_element :discussion_filter
+            all_elements(:filter_options)[1].click
+          end
+
+          def select_history_only_filter
             click_element :discussion_filter
             all_elements(:filter_options).last.click
           end

qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb

@@ -31,6 +31,7 @@ module QA
           create_issue
 
           Page::Project::Issue::Show.perform do |show|
+            show.select_all_activities_filter
             show.comment('See attached banana for scale', attachment: file_to_attach)
 
             show.refresh

qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb

@@ -27,6 +27,11 @@ module QA
 
           expect(show_page).to have_content("made the issue confidential")
           expect(show_page).to have_content("My own comment")
+
+          show_page.select_history_only_filter
+
+          expect(show_page).to have_content("made the issue confidential")
+          expect(show_page).not_to have_content("My own comment")
         end
       end
     end