diff options
| author | ThibG <thib@sitedethib.com> | 2019-09-15 14:45:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-15 14:45:24 +0200 |
| commit | 221bb05cf8d30d7912fd1f860af2552ff7914fd2 (patch) | |
| tree | 88ac4e45536fe772a1c47bdf6df27c6ad19a016f /spec/controllers/application_controller_spec.rb | |
| parent | c7f71b974f1a57cd93f86e5a678018d4aea8e728 (diff) | |
| parent | b83e2df6b59ccd7cbe8f9145e06b75547dc1101a (diff) | |
Merge pull request #1219 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/controllers/application_controller_spec.rb')
| -rw-r--r-- | spec/controllers/application_controller_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb index 67d3c1ce9..4ac69b719 100644 --- a/spec/controllers/application_controller_spec.rb +++ b/spec/controllers/application_controller_spec.rb @@ -113,6 +113,7 @@ describe ApplicationController, type: :controller do allow(Setting).to receive(:[]).with('skin').and_return 'default' allow(Setting).to receive(:[]).with('flavour').and_return 'vanilla' + allow(Setting).to receive(:[]).with('noindex').and_return false expect(controller.view_context.current_flavour).to eq 'vanilla' end |