summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-07-05 12:19:13 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-07-05 12:19:13 +0000
commit3f0e37f6d41ebca5dd63b955e1375df17a23b190 (patch)
tree245cfaeed7a804ec9a0d7c5f3e36de63acb03ece
parent491110d633c17b3515756dcacf1666a2ea12fe81 (diff)
parent4818f904c2150411e4d84e67abe2fcaa45448abe (diff)
downloadgitlab-ce-3f0e37f6d41ebca5dd63b955e1375df17a23b190.tar.gz
Merge branch '34648-use-stub_application_setting-to-test-support_url' into 'master'
Use stub_application_setting when testing ApplicationHelper#support_url Closes #34648 See merge request !12627
-rw-r--r--spec/helpers/application_helper_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 56daeffde27..f161dbb4cf0 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -292,7 +292,7 @@ describe ApplicationHelper do
let(:alternate_url) { 'http://company.example.com/getting-help' }
before do
- allow(current_application_settings).to receive(:help_page_support_url) { alternate_url }
+ stub_application_setting(help_page_support_url: alternate_url)
end
it 'returns the alternate support url' do