Merge branch 'rc-fixup-mattermost-test-runner' into 'master'

Fix test selection in Test::Integration::Mattermost See merge request gitlab-org/gitlab-ce!15278

Merge branch 'rc-fixup-mattermost-test-runner' into 'master'
6f045671 · Grzegorz Bizon · 92249f1a · e1f03798 · 6f045671
Commit 6f045671 authored Nov 08, 2017 by Grzegorz Bizon
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mattermost.rb qa/qa/scenario/test/integration/mattermost.rb +2 -2

No files found.
--- a/qa/qa/scenario/test/integration/mattermost.rb
+++ b/qa/qa/scenario/test/integration/mattermost.rb
@@ -7,11 +7,11 @@ module QA
        # including staging and on-premises installation.
        #
        class Mattermost < Scenario::Entrypoint
-          tags :mattermost
+          tags :core, :mattermost

          def perform(address, mattermost, *files)
            Runtime::Scenario.mattermost = mattermost
-            super(address, files)
+            super(address, *files)
          end
        end
      end