summaryrefslogtreecommitdiff
path: root/qa/spec
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-17 18:08:41 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-17 18:08:41 +0000
commit22a0d312ae82e7dda3073d5d1a5a766d7641738d (patch)
tree41a677a7212f24e2f29c2fbd5623430f92fb2b45 /qa/spec
parent37eff29d5ce44899e34c7c2ac319b314f2f26d15 (diff)
downloadgitlab-ce-22a0d312ae82e7dda3073d5d1a5a766d7641738d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/spec')
-rw-r--r--qa/spec/page/base_spec.rb2
-rw-r--r--qa/spec/spec_helper.rb6
-rw-r--r--qa/spec/support/helpers/stub_env.rb (renamed from qa/spec/helpers/stub_env.rb)0
-rw-r--r--qa/spec/support/shared_examples/scenario_shared_examples.rb (renamed from qa/spec/shared_examples/scenario_shared_examples.rb)6
4 files changed, 4 insertions, 10 deletions
diff --git a/qa/spec/page/base_spec.rb b/qa/spec/page/base_spec.rb
index 717112b12ce..2d13889d26d 100644
--- a/qa/spec/page/base_spec.rb
+++ b/qa/spec/page/base_spec.rb
@@ -62,7 +62,7 @@ describe QA::Page::Base do
end
end
- describe '#wait' do
+ describe '#wait_until' do
subject { Class.new(described_class).new }
context 'when the condition is true' do
diff --git a/qa/spec/spec_helper.rb b/qa/spec/spec_helper.rb
index 3a26ed89e9c..1336bea16bc 100644
--- a/qa/spec/spec_helper.rb
+++ b/qa/spec/spec_helper.rb
@@ -12,9 +12,9 @@ QA::Runtime::Browser.configure!
QA::Runtime::Scenario.from_env(QA::Runtime::Env.runtime_scenario_attributes) if QA::Runtime::Env.runtime_scenario_attributes
-%w[helpers shared_examples].each do |d|
- Dir[::File.join(__dir__, d, '**', '*.rb')].each { |f| require f }
-end
+Dir[::File.join(__dir__, "support/helpers/*.rb")].each { |f| require f }
+Dir[::File.join(__dir__, "support/shared_contexts/*.rb")].each { |f| require f }
+Dir[::File.join(__dir__, "support/shared_examples/*.rb")].each { |f| require f }
RSpec.configure do |config|
QA::Specs::Helpers::Quarantine.configure_rspec
diff --git a/qa/spec/helpers/stub_env.rb b/qa/spec/support/helpers/stub_env.rb
index 8ad864dbec8..8ad864dbec8 100644
--- a/qa/spec/helpers/stub_env.rb
+++ b/qa/spec/support/helpers/stub_env.rb
diff --git a/qa/spec/shared_examples/scenario_shared_examples.rb b/qa/spec/support/shared_examples/scenario_shared_examples.rb
index 697e6cb39c8..17469ea470c 100644
--- a/qa/spec/shared_examples/scenario_shared_examples.rb
+++ b/qa/spec/support/shared_examples/scenario_shared_examples.rb
@@ -31,12 +31,6 @@ shared_examples 'a QA scenario class' do
expect(attributes).to have_received(:define).with(:gitlab_address, 'http://gitlab_address').at_least(:once)
end
- it 'performs before hooks' do
- subject.perform(args)
-
- expect(release).to have_received(:perform_before_hooks)
- end
-
it 'sets tags on runner' do
subject.perform(args)