Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/qa/spec
diff options
context:
space:
mode:
authorMark Lapierre <mlapierre@gitlab.com>2018-12-28 15:06:18 +0300
committerMark Lapierre <mlapierre@gitlab.com>2019-01-08 18:45:37 +0300
commite5a81aec1f2e08d69c45c062c8dfd04cb5607570 (patch)
tree30dc05162698a22043aeba7e3733acafe90e558f /qa/spec
parent89a7928235ce83f570bf45ca0ee227f05d461a61 (diff)
Revert "Allow tests to be quarantined"
This reverts commit 8ef418d57c5a9511b862bf0711aadbb977086c91.
Diffstat (limited to 'qa/spec')
-rw-r--r--qa/spec/specs/runner_spec.rb91
1 files changed, 14 insertions, 77 deletions
diff --git a/qa/spec/specs/runner_spec.rb b/qa/spec/specs/runner_spec.rb
index 8e2b852510a..741821ddf8c 100644
--- a/qa/spec/specs/runner_spec.rb
+++ b/qa/spec/specs/runner_spec.rb
@@ -6,12 +6,8 @@ describe QA::Specs::Runner do
allow(QA::Runtime::Browser).to receive(:configure!)
end
- it 'excludes the orchestrated and quarantine tags by default' do
- expect_rspec_runner_arguments([
- '--tag', '~orchestrated',
- '--tag', '~quarantine',
- *described_class::DEFAULT_TEST_PATH_ARGS
- ])
+ it 'excludes the orchestrated tag by default' do
+ expect_rspec_runner_arguments(['--tag', '~orchestrated', *described_class::DEFAULT_TEST_PATH_ARGS])
subject.perform
end
@@ -20,12 +16,7 @@ describe QA::Specs::Runner do
subject { described_class.new.tap { |runner| runner.tty = true } }
it 'sets the `--tty` flag' do
- expect_rspec_runner_arguments([
- '--tty',
- '--tag', '~orchestrated',
- '--tag', '~quarantine',
- *described_class::DEFAULT_TEST_PATH_ARGS
- ])
+ expect_rspec_runner_arguments(['--tty', '--tag', '~orchestrated', *described_class::DEFAULT_TEST_PATH_ARGS])
subject.perform
end
@@ -34,54 +25,18 @@ describe QA::Specs::Runner do
context 'when tags are set' do
subject { described_class.new.tap { |runner| runner.tags = %i[orchestrated github] } }
- it 'focuses on the given tags, plus the ~quarantine tag' do
- expect_rspec_runner_arguments([
- '--tag', 'orchestrated',
- '--tag', 'github',
- '--tag', '~quarantine',
- *described_class::DEFAULT_TEST_PATH_ARGS
- ])
+ it 'focuses on the given tags' do
+ expect_rspec_runner_arguments(['--tag', 'orchestrated', '--tag', 'github', *described_class::DEFAULT_TEST_PATH_ARGS])
subject.perform
end
end
- context 'when only "--tag quarantine" is set as options' do
- subject { described_class.new.tap { |runner| runner.options = %w[--tag quarantine] } }
-
- it 'focuses on the given tags without the default args' do
- expect_rspec_runner_arguments([
- '--tag', 'quarantine',
- *described_class::DEFAULT_TEST_PATH_ARGS
- ])
-
- subject.perform
- end
- end
-
- context 'when only "--tag smoke" is set as options' do
+ context 'when "--tag smoke" is set as options' do
subject { described_class.new.tap { |runner| runner.options = %w[--tag smoke] } }
- it 'focuses on the given tag without the default args, but with the ~quarantine tag' do
- expect_rspec_runner_arguments([
- '--tag', '~quarantine',
- '--tag', 'smoke',
- *described_class::DEFAULT_TEST_PATH_ARGS
- ])
-
- subject.perform
- end
- end
-
- context 'when "--tag smoke" and "--tag quarantine" are set as options' do
- subject { described_class.new.tap { |runner| runner.options = %w[--tag smoke --tag quarantine] } }
-
- it 'focuses on the given tags without the default args' do
- expect_rspec_runner_arguments([
- '--tag', 'smoke',
- '--tag', 'quarantine',
- *described_class::DEFAULT_TEST_PATH_ARGS
- ])
+ it 'focuses on the given tag without excluded the orchestrated tag' do
+ expect_rspec_runner_arguments(['--tag', 'smoke', *described_class::DEFAULT_TEST_PATH_ARGS])
subject.perform
end
@@ -90,12 +45,8 @@ describe QA::Specs::Runner do
context 'when "qa/specs/features/foo" is set as options' do
subject { described_class.new.tap { |runner| runner.options = %w[qa/specs/features/foo] } }
- it 'passes the given tests path and excludes the default args' do
- expect_rspec_runner_arguments([
- '--tag', '~orchestrated',
- '--tag', '~quarantine',
- 'qa/specs/features/foo'
- ])
+ it 'passes the given tests path and excludes the orchestrated tag' do
+ expect_rspec_runner_arguments(['--tag', '~orchestrated', 'qa/specs/features/foo'])
subject.perform
end
@@ -104,12 +55,8 @@ describe QA::Specs::Runner do
context 'when "-- qa/specs/features/foo" is set as options' do
subject { described_class.new.tap { |runner| runner.options = %w[-- qa/specs/features/foo] } }
- it 'passes the given tests path and excludes the default args' do
- expect_rspec_runner_arguments([
- '--tag', '~orchestrated',
- '--tag', '~quarantine',
- '--', 'qa/specs/features/foo'
- ])
+ it 'passes the given tests path and excludes the orchestrated tag' do
+ expect_rspec_runner_arguments(['--tag', '~orchestrated', '--', 'qa/specs/features/foo'])
subject.perform
end
@@ -123,12 +70,7 @@ describe QA::Specs::Runner do
subject { described_class.new }
it 'it includes default args and excludes the skip_signup_disabled tag' do
- expect_rspec_runner_arguments([
- '--tag', '~orchestrated',
- '--tag', '~quarantine',
- '--tag', '~skip_signup_disabled',
- *described_class::DEFAULT_TEST_PATH_ARGS
- ])
+ expect_rspec_runner_arguments(['--tag', '~orchestrated', '--tag', '~skip_signup_disabled', *described_class::DEFAULT_TEST_PATH_ARGS])
subject.perform
end
@@ -142,12 +84,7 @@ describe QA::Specs::Runner do
subject { described_class.new }
it 'it includes default args and excludes the requires_git_protocol_v2 tag' do
- expect_rspec_runner_arguments([
- '--tag', '~orchestrated',
- '--tag', '~quarantine',
- '--tag', '~requires_git_protocol_v2',
- *described_class::DEFAULT_TEST_PATH_ARGS
- ])
+ expect_rspec_runner_arguments(['--tag', '~orchestrated', '--tag', '~requires_git_protocol_v2', *described_class::DEFAULT_TEST_PATH_ARGS])
subject.perform
end