diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-11 15:44:42 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-11 15:44:42 +0000 |
| commit | 9b177bb7c94df6c7d3868235f75939a41acf8718 (patch) | |
| tree | ef8541d3ef8047f2ac6711b6e030244f812b7b49 /spec/controllers | |
| parent | 73a913f2b5f2a5dd36e13e09d74264d1da218d6a (diff) | |
| download | gitlab-ce-9b177bb7c94df6c7d3868235f75939a41acf8718.tar.gz | |
Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8
This reverts merge request !14148
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/profiles/preferences_controller_spec.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/controllers/profiles/preferences_controller_spec.rb b/spec/controllers/profiles/preferences_controller_spec.rb index a5f544b4f92..a66b4ab0902 100644 --- a/spec/controllers/profiles/preferences_controller_spec.rb +++ b/spec/controllers/profiles/preferences_controller_spec.rb @@ -25,7 +25,8 @@ describe Profiles::PreferencesController do def go(params: {}, format: :js) params.reverse_merge!( color_scheme_id: '1', - dashboard: 'stars' + dashboard: 'stars', + theme_id: '1' ) patch :update, user: params, format: format @@ -40,7 +41,8 @@ describe Profiles::PreferencesController do it "changes the user's preferences" do prefs = { color_scheme_id: '1', - dashboard: 'stars' + dashboard: 'stars', + theme_id: '2' }.with_indifferent_access expect(user).to receive(:assign_attributes).with(prefs) |