diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-11-08 12:28:32 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-11-08 12:28:32 +0000 |
commit | 6f045671e665e42c7f354541e6804dda3c03438f (patch) | |
tree | c319c00010999fd343137fdeecc38f878992d5f7 | |
parent | 92249f1ac883c2a861235ec49526cbafca73b362 (diff) | |
parent | e1f037980fda1620c2ba6ed407c35349989275fa (diff) | |
download | gitlab-ce-6f045671e665e42c7f354541e6804dda3c03438f.tar.gz |
Merge branch 'rc-fixup-mattermost-test-runner' into 'master'
Fix test selection in Test::Integration::Mattermost
See merge request gitlab-org/gitlab-ce!15278
-rw-r--r-- | qa/qa/scenario/test/integration/mattermost.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qa/qa/scenario/test/integration/mattermost.rb b/qa/qa/scenario/test/integration/mattermost.rb index 59d7dcd3d23..0220da929ce 100644 --- 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 |