From 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 20 Sep 2021 13:18:24 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-3-stable-ee --- qa/spec/specs/helpers/context_selector_spec.rb | 4 ++-- qa/spec/specs/helpers/quarantine_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'qa/spec/specs/helpers') diff --git a/qa/spec/specs/helpers/context_selector_spec.rb b/qa/spec/specs/helpers/context_selector_spec.rb index cbdbe6698ae..0152fee6f5b 100644 --- a/qa/spec/specs/helpers/context_selector_spec.rb +++ b/qa/spec/specs/helpers/context_selector_spec.rb @@ -3,14 +3,14 @@ require 'rspec/core/sandbox' RSpec.describe QA::Specs::Helpers::ContextSelector do - include Helpers::StubENV + include QA::Support::Helpers::StubEnv include QA::Specs::Helpers::RSpec around do |ex| QA::Runtime::Scenario.define(:gitlab_address, 'https://staging.gitlab.com') RSpec::Core::Sandbox.sandboxed do |config| - config.formatter = QA::Specs::Helpers::ContextFormatter + config.formatter = QA::Support::Formatters::ContextFormatter # If there is an example-within-an-example, we want to make sure the inner example # does not get a reference to the outer example (the real spec) if it calls diff --git a/qa/spec/specs/helpers/quarantine_spec.rb b/qa/spec/specs/helpers/quarantine_spec.rb index 548a8510988..8ea375cdb05 100644 --- a/qa/spec/specs/helpers/quarantine_spec.rb +++ b/qa/spec/specs/helpers/quarantine_spec.rb @@ -3,12 +3,12 @@ require 'rspec/core/sandbox' RSpec.describe QA::Specs::Helpers::Quarantine do - include Helpers::StubENV + include QA::Support::Helpers::StubEnv include QA::Specs::Helpers::RSpec around do |ex| RSpec::Core::Sandbox.sandboxed do |config| - config.formatter = QA::Specs::Helpers::QuarantineFormatter + config.formatter = QA::Support::Formatters::QuarantineFormatter # If there is an example-within-an-example, we want to make sure the inner example # does not get a reference to the outer example (the real spec) if it calls -- cgit v1.2.3