diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-11-08 15:28:32 +0300 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2017-11-10 01:12:32 +0300 |
| commit | bb4d9927f10025a5abb56835b644ad7e1cc92528 (patch) | |
| tree | c319c00010999fd343137fdeecc38f878992d5f7 /qa | |
| parent | d1825985d4bd197ff58c7de6f1a64b7871a48365 (diff) | |
Merge branch 'rc-fixup-mattermost-test-runner' into 'master'
Fix test selection in Test::Integration::Mattermost
See merge request gitlab-org/gitlab-ce!15278
(cherry picked from commit 6f045671e665e42c7f354541e6804dda3c03438f)
Diffstat (limited to 'qa')
| -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 |