diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-08-22 08:43:39 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-08-22 08:43:39 +0000 |
| commit | 1c95c5ec867b31389b513bd09a9cadc5f3fb6836 (patch) | |
| tree | a149c6b8534100b0f29aa089a2e98c9fb67db721 | |
| parent | e03728013db9956c1749efa38f69d9a6f3f7ecf1 (diff) | |
| parent | 2fd1dcdbb764947041e904768283fc8308dea66d (diff) | |
| download | gitlab-ce-1c95c5ec867b31389b513bd09a9cadc5f3fb6836.tar.gz | |
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
| -rw-r--r-- | qa/qa/scenario/test/integration/github.rb | 2 | ||||
| -rw-r--r-- | qa/qa/scenario/test/integration/kubernetes.rb | 2 | ||||
| -rw-r--r-- | qa/qa/scenario/test/integration/ldap.rb | 2 | ||||
| -rw-r--r-- | qa/qa/scenario/test/integration/mattermost.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/qa/qa/scenario/test/integration/github.rb b/qa/qa/scenario/test/integration/github.rb index 1d22b532aa5..76c3923d68a 100644 --- a/qa/qa/scenario/test/integration/github.rb +++ b/qa/qa/scenario/test/integration/github.rb @@ -2,7 +2,7 @@ module QA module Scenario module Test module Integration - class Github < Test::Instance + class Github < Test::Instance::All tags :github def perform(address, *rspec_options) diff --git a/qa/qa/scenario/test/integration/kubernetes.rb b/qa/qa/scenario/test/integration/kubernetes.rb index 7479073e979..405962caeed 100644 --- a/qa/qa/scenario/test/integration/kubernetes.rb +++ b/qa/qa/scenario/test/integration/kubernetes.rb @@ -2,7 +2,7 @@ module QA module Scenario module Test module Integration - class Kubernetes < Test::Instance + class Kubernetes < Test::Instance::All tags :kubernetes end end diff --git a/qa/qa/scenario/test/integration/ldap.rb b/qa/qa/scenario/test/integration/ldap.rb index 257ed81d9e1..769fa389785 100644 --- a/qa/qa/scenario/test/integration/ldap.rb +++ b/qa/qa/scenario/test/integration/ldap.rb @@ -2,7 +2,7 @@ module QA module Scenario module Test module Integration - class LDAP < Test::Instance + class LDAP < Test::Instance::All tags :ldap end end diff --git a/qa/qa/scenario/test/integration/mattermost.rb b/qa/qa/scenario/test/integration/mattermost.rb index 13bfad28b0b..831c6a9fcff 100644 --- a/qa/qa/scenario/test/integration/mattermost.rb +++ b/qa/qa/scenario/test/integration/mattermost.rb @@ -6,7 +6,7 @@ module QA # Run test suite against any GitLab instance where mattermost is enabled, # including staging and on-premises installation. # - class Mattermost < Test::Instance + class Mattermost < Test::Instance::All tags :core, :mattermost def perform(address, mattermost, *rspec_options) |