diff options
| author | Nick Thomas <nick@gitlab.com> | 2017-12-15 16:12:57 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2017-12-15 16:12:57 +0000 |
| commit | dc17e7d7a9a6a246cd8c69a7d06ff1dcfefd8384 (patch) | |
| tree | f57148780afc0b0dcb3d0f1963cc8c29e07723ba /spec/support/stub_configuration.rb | |
| parent | 86d056c8e7d2e3d14cc5ed9a0b6d6b7bfcae180e (diff) | |
| parent | 10885edf227bb6de865c73914783f2709ebae177 (diff) | |
| download | gitlab-ce-dc17e7d7a9a6a246cd8c69a7d06ff1dcfefd8384.tar.gz | |
Merge branch 'ignore-markdown-cache-when-stubbing-application-settings' into 'master'
Don't use Markdown cache for stubbed settings in specs
Closes #41130
See merge request gitlab-org/gitlab-ce!15954
Diffstat (limited to 'spec/support/stub_configuration.rb')
| -rw-r--r-- | spec/support/stub_configuration.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/support/stub_configuration.rb b/spec/support/stub_configuration.rb index b36cf3c544c..9f08c139322 100644 --- a/spec/support/stub_configuration.rb +++ b/spec/support/stub_configuration.rb @@ -7,6 +7,9 @@ module StubConfiguration allow_any_instance_of(ApplicationSetting).to receive_messages(to_settings(messages)) allow(Gitlab::CurrentSettings.current_application_settings) .to receive_messages(to_settings(messages)) + + # Ensure that we don't use the Markdown cache when stubbing these values + allow_any_instance_of(ApplicationSetting).to receive(:cached_html_up_to_date?).and_return(false) end def stub_not_protect_default_branch |