diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-23 22:10:51 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-26 16:01:59 +0100 |
| commit | fcce135d271276aa38576ed36a113ec3f6161e0a (patch) | |
| tree | f8faef20945cd7f114d8b718c46901fb10fd3c0f /spec/controllers/admin | |
| parent | 9f56511860493b770c2e535be0f8ce4777c8d373 (diff) | |
| parent | 9ec98893f4974bb022a722c3163a7e578b1d5ce9 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/admin/settings_controller.rb - app/models/form/admin_settings.rb Conflicts caused by upstream refactoring, while we have flavours and skins, with the flavour_and_skin pseudo-setting.
Diffstat (limited to 'spec/controllers/admin')
| -rw-r--r-- | spec/controllers/admin/settings_controller_spec.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/controllers/admin/settings_controller_spec.rb b/spec/controllers/admin/settings_controller_spec.rb index 34f6bbdae..6cf0ee20a 100644 --- a/spec/controllers/admin/settings_controller_spec.rb +++ b/spec/controllers/admin/settings_controller_spec.rb @@ -19,6 +19,10 @@ RSpec.describe Admin::SettingsController, type: :controller do end describe 'PUT #update' do + before do + allow_any_instance_of(Form::AdminSettings).to receive(:valid?).and_return(true) + end + describe 'for a record that doesnt exist' do around do |example| before = Setting.site_extended_description |