Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 24 insertions, 0 deletions

diff --git a/spec/controllers/profiles/preferences_controller_spec.rb b/spec/controllers/profiles/preferences_controller_spec.rb
index b7870a63f9d..7add3a72337 100644
--- a/spec/controllers/profiles/preferences_controller_spec.rb
+++ b/spec/controllers/profiles/preferences_controller_spec.rb
@@ -46,6 +46,8 @@ RSpec.describe Profiles::PreferencesController do
       it "changes the user's preferences" do
         prefs = {
           color_scheme_id: '1',
+          diffs_deletion_color: '#123456',
+          diffs_addition_color: '#abcdef',
           dashboard: 'stars',
           theme_id: '2',
           first_day_of_week: '1',
@@ -84,5 +86,27 @@ RSpec.describe Profiles::PreferencesController do
         expect(response.parsed_body['type']).to eq('alert')
       end
     end
+
+    context 'on invalid diffs colors setting' do
+      it 'responds with error for diffs_deletion_color' do
+        prefs = { diffs_deletion_color: '#1234567' }
+
+        go params: prefs
+
+        expect(response).to have_gitlab_http_status(:bad_request)
+        expect(response.parsed_body['message']).to eq _('Failed to save preferences.')
+        expect(response.parsed_body['type']).to eq('alert')
+      end
+
+      it 'responds with error for diffs_addition_color' do
+        prefs = { diffs_addition_color: '#1234567' }
+
+        go params: prefs
+
+        expect(response).to have_gitlab_http_status(:bad_request)
+        expect(response.parsed_body['message']).to eq _('Failed to save preferences.')
+        expect(response.parsed_body['type']).to eq('alert')
+      end
+    end
   end
 end