Commit 1c95c5ec authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'qa-317' into 'master'

[QA] Fix a 'superclass must be a Class' error

Closes gitlab-qa#317

See merge request gitlab-org/gitlab-ce!21340
parents e0372801 2fd1dcdb
...@@ -2,7 +2,7 @@ module QA ...@@ -2,7 +2,7 @@ module QA
module Scenario module Scenario
module Test module Test
module Integration module Integration
class Github < Test::Instance class Github < Test::Instance::All
tags :github tags :github
def perform(address, *rspec_options) def perform(address, *rspec_options)
......
...@@ -2,7 +2,7 @@ module QA ...@@ -2,7 +2,7 @@ module QA
module Scenario module Scenario
module Test module Test
module Integration module Integration
class Kubernetes < Test::Instance class Kubernetes < Test::Instance::All
tags :kubernetes tags :kubernetes
end end
end end
......
...@@ -2,7 +2,7 @@ module QA ...@@ -2,7 +2,7 @@ module QA
module Scenario module Scenario
module Test module Test
module Integration module Integration
class LDAP < Test::Instance class LDAP < Test::Instance::All
tags :ldap tags :ldap
end end
end end
......
...@@ -6,7 +6,7 @@ module QA ...@@ -6,7 +6,7 @@ module QA
# Run test suite against any GitLab instance where mattermost is enabled, # Run test suite against any GitLab instance where mattermost is enabled,
# including staging and on-premises installation. # including staging and on-premises installation.
# #
class Mattermost < Test::Instance class Mattermost < Test::Instance::All
tags :core, :mattermost tags :core, :mattermost
def perform(address, mattermost, *rspec_options) def perform(address, mattermost, *rspec_options)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment