diff options
author | Rubén Dávila <ruben@gitlab.com> | 2017-09-08 14:48:44 +0000 |
---|---|---|
committer | Rubén Dávila <ruben@gitlab.com> | 2017-09-08 14:48:44 +0000 |
commit | 52a2423e373e6552023faaff43ae07dbb7423c00 (patch) | |
tree | f6855f30c1f0ec08583707d54191e20c2e561e37 /spec/controllers | |
parent | af930b83a097f4ab83e6361bc3c210462e507cd9 (diff) | |
download | gitlab-ce-52a2423e373e6552023faaff43ae07dbb7423c00.tar.gz |
Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'"revert-f2421b2b
This reverts merge request !13619
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 a66b4ab0902..a5f544b4f92 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(:assign_attributes).with(prefs) |