diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-17 11:34:09 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-17 11:34:09 +0000 |
| commit | aa792b91bbddeeb61ce77f9525fcaf238a9ad331 (patch) | |
| tree | af0eb491f8bb405955255ab632d15860d6a14906 /spec/controllers | |
| parent | 5d8f5328baca93b9134f10ae593e71834578a9f8 (diff) | |
| parent | 7203826b54bb3944736057436fe8a13011801ecf (diff) | |
| download | gitlab-ce-aa792b91bbddeeb61ce77f9525fcaf238a9ad331.tar.gz | |
Merge branch '26200-convert-sidebar-to-dropdown' into 'master'
Resolve "Update global sidebar to dropdown"
Closes #26200
See merge request !9199
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/profiles/preferences_controller_spec.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/spec/controllers/profiles/preferences_controller_spec.rb b/spec/controllers/profiles/preferences_controller_spec.rb index 8f02003992a..7b3aa0491c7 100644 --- a/spec/controllers/profiles/preferences_controller_spec.rb +++ b/spec/controllers/profiles/preferences_controller_spec.rb @@ -25,8 +25,7 @@ describe Profiles::PreferencesController do def go(params: {}, format: :js) params.reverse_merge!( color_scheme_id: '1', - dashboard: 'stars', - theme_id: '1' + dashboard: 'stars' ) patch :update, user: params, format: format @@ -41,8 +40,7 @@ describe Profiles::PreferencesController do it "changes the user's preferences" do prefs = { color_scheme_id: '1', - dashboard: 'stars', - theme_id: '2' + dashboard: 'stars' }.with_indifferent_access expect(user).to receive(:update_attributes).with(prefs) |
