Merge branch 'qa-nightly-107-fix-comment-on-issue-ce' into 'master'

CE port of "Comment will select all activites filter by default" See merge request gitlab-org/gitlab-ce!29496

Merge branch 'qa-nightly-107-fix-comment-on-issue-ce' into 'master'
CE port of "Comment will select all activites filter by default" See merge request gitlab-org/gitlab-ce!29496
c24e524a · Mark Lapierre · b05de5a5 · a154d9db · c24e524a · c24e524a
--- a/qa/qa/page/project/issue/show.rb
+++ b/qa/qa/page/project/issue/show.rb
@@ -29,7 +29,8 @@ class Show < Page::Base

          # Adds a comment to an issue
          # attachment option should be an absolute path
-          def comment(text, attachment: nil)
+          def comment(text, attachment: nil, filter: :all_activities)
+            method("select_#{filter}_filter").call
            fill_element :comment_input, text

            unless attachment.nil?

--- a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
@@ -23,7 +23,6 @@ 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

--- a/qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb
@@ -16,9 +16,8 @@ module QA
        expect(page).to have_content(issue_title)

        Page::Project::Issue::Show.perform do |show_page|
-          show_page.select_comments_only_filter
-          show_page.comment('/confidential')
-          show_page.comment('My own comment')
+          show_page.comment('/confidential', filter: :comments_only)
+          show_page.comment('My own comment', filter: :comments_only)

          expect(show_page).not_to have_content("made the issue confidential")
          expect(show_page).to have_content("My own comment")