summaryrefslogtreecommitdiff
path: root/spec/controllers/profiles/preferences_controller_spec.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-06 15:07:26 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-06 15:07:26 +0000
commit506159637da758f448818b834f8482238a9eb4eb (patch)
treee114c46da6c1b98451a228b7559f5a6039c5df29 /spec/controllers/profiles/preferences_controller_spec.rb
parent045c0f9554a99c80d0a127540da168e272a9f977 (diff)
downloadgitlab-ce-506159637da758f448818b834f8482238a9eb4eb.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/profiles/preferences_controller_spec.rb')
-rw-r--r--spec/controllers/profiles/preferences_controller_spec.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/controllers/profiles/preferences_controller_spec.rb b/spec/controllers/profiles/preferences_controller_spec.rb
index e0e6d78bdcd..77e7b32af25 100644
--- a/spec/controllers/profiles/preferences_controller_spec.rb
+++ b/spec/controllers/profiles/preferences_controller_spec.rb
@@ -46,7 +46,8 @@ describe Profiles::PreferencesController do
dashboard: 'stars',
theme_id: '2',
first_day_of_week: '1',
- preferred_language: 'jp'
+ preferred_language: 'jp',
+ render_whitespace_in_code: 'true'
}.with_indifferent_access
expect(user).to receive(:assign_attributes).with(ActionController::Parameters.new(prefs).permit!)