diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-06-01 13:55:00 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-06-02 14:30:00 +0300 |
| commit | ef205c885b6ea61af3dcf7b6f4770538ff88b968 (patch) | |
| tree | 8b28408839914f7b6862d06dfbfca436c091b4ab /spec/lib/gitlab/akismet_helper_spec.rb | |
| parent | ac538743305b4de60cb3177103a66c83df406fd6 (diff) | |
Merge branch 'current-settings-use-request-store-during-request'
Diffstat (limited to 'spec/lib/gitlab/akismet_helper_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/akismet_helper_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/akismet_helper_spec.rb b/spec/lib/gitlab/akismet_helper_spec.rb index 53f5d6c5c80..88a71528867 100644 --- a/spec/lib/gitlab/akismet_helper_spec.rb +++ b/spec/lib/gitlab/akismet_helper_spec.rb @@ -6,8 +6,8 @@ describe Gitlab::AkismetHelper, type: :helper do before do allow(Gitlab.config.gitlab).to receive(:url).and_return(Settings.send(:build_gitlab_url)) - current_application_settings.akismet_enabled = true - current_application_settings.akismet_api_key = '12345' + allow_any_instance_of(ApplicationSetting).to receive(:akismet_enabled).and_return(true) + allow_any_instance_of(ApplicationSetting).to receive(:akismet_api_key).and_return('12345') end describe '#check_for_spam?' do |