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
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2018-02-03 03:56:11 +0300
committerMatija Čupić <matteeyah@gmail.com>2018-02-03 14:20:59 +0300
commit56bcb3e8c87bf25cb33ed02832c146e966cc4d7d (patch)
treebb8aadd524ab052da693ef28e0cfc390024edb70 /spec/models/project_auto_devops_spec.rb
parentbf278f791b0f112c79e8cdeaa82db91ae2af4fe4 (diff)
Use Gitlab::CurrentSettings instead of current_application_settings
Diffstat (limited to 'spec/models/project_auto_devops_spec.rb')
-rw-r--r--spec/models/project_auto_devops_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/models/project_auto_devops_spec.rb b/spec/models/project_auto_devops_spec.rb
index de90080b4b8..296b91a771c 100644
--- a/spec/models/project_auto_devops_spec.rb
+++ b/spec/models/project_auto_devops_spec.rb
@@ -20,7 +20,7 @@ describe ProjectAutoDevops do
context 'when there is an instance domain specified' do
before do
- stub_application_setting(auto_devops_domain: 'example.com')
+ allow(Gitlab::CurrentSettings).to receive(:auto_devops_domain).and_return('example.com')
end
it { expect(auto_devops).to have_domain }
@@ -28,7 +28,7 @@ describe ProjectAutoDevops do
context 'when there is no instance domain specified' do
before do
- stub_application_setting(auto_devops_domain: nil)
+ allow(Gitlab::CurrentSettings).to receive(:auto_devops_domain).and_return(nil)
end
it { expect(auto_devops).not_to have_domain }
@@ -52,7 +52,7 @@ describe ProjectAutoDevops do
context 'when there is an instance domain specified' do
before do
- stub_application_setting(auto_devops_domain: 'example.com')
+ allow(Gitlab::CurrentSettings).to receive(:auto_devops_domain).and_return('example.com')
end
it { expect(auto_devops.variables).to include(domain_variable) }
@@ -60,7 +60,7 @@ describe ProjectAutoDevops do
context 'when there is no instance domain specified' do
before do
- stub_application_setting(auto_devops_domain: nil)
+ allow(Gitlab::CurrentSettings).to receive(:auto_devops_domain).and_return(nil)
end
it { expect(auto_devops.variables).not_to include(domain_variable) }