From 560ec24e585face30ee99d5bba39a02948fd118f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Jun 2019 16:51:08 +0200
Subject: Change /settings/preferences to redirect to appearance, add
 /settings/preferences/other (#10988)

---
 .../settings/preferences/other_controller_spec.rb  | 46 ++++++++++++++++++++++
 .../settings/preferences_controller_spec.rb        | 46 ----------------------
 2 files changed, 46 insertions(+), 46 deletions(-)
 create mode 100644 spec/controllers/settings/preferences/other_controller_spec.rb
 delete mode 100644 spec/controllers/settings/preferences_controller_spec.rb

(limited to 'spec/controllers')

diff --git a/spec/controllers/settings/preferences/other_controller_spec.rb b/spec/controllers/settings/preferences/other_controller_spec.rb
new file mode 100644
index 000000000..1b556ac7f
--- /dev/null
+++ b/spec/controllers/settings/preferences/other_controller_spec.rb
@@ -0,0 +1,46 @@
+require 'rails_helper'
+
+describe Settings::Preferences::OtherController do
+  render_views
+
+  let(:user) { Fabricate(:user, filtered_languages: []) }
+
+  before do
+    sign_in user, scope: :user
+  end
+
+  describe 'GET #show' do
+    it 'returns http success' do
+      get :show
+      expect(response).to have_http_status(200)
+    end
+  end
+
+  describe 'PUT #update' do
+    it 'updates the user record' do
+      put :update, params: { user: { locale: 'en', chosen_languages: ['es', 'fr', ''] } }
+
+      expect(response).to redirect_to(settings_preferences_other_path)
+      user.reload
+      expect(user.locale).to eq 'en'
+      expect(user.chosen_languages).to eq ['es', 'fr']
+    end
+
+    it 'updates user settings' do
+      user.settings['boost_modal'] = false
+      user.settings['delete_modal'] = true
+
+      put :update, params: {
+        user: {
+          setting_boost_modal: '1',
+          setting_delete_modal: '0',
+        }
+      }
+
+      expect(response).to redirect_to(settings_preferences_other_path)
+      user.reload
+      expect(user.settings['boost_modal']).to be true
+      expect(user.settings['delete_modal']).to be false
+    end
+  end
+end
diff --git a/spec/controllers/settings/preferences_controller_spec.rb b/spec/controllers/settings/preferences_controller_spec.rb
deleted file mode 100644
index f2028cf39..000000000
--- a/spec/controllers/settings/preferences_controller_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require 'rails_helper'
-
-describe Settings::PreferencesController do
-  render_views
-
-  let(:user) { Fabricate(:user, filtered_languages: []) }
-
-  before do
-    sign_in user, scope: :user
-  end
-
-  describe 'GET #show' do
-    it 'returns http success' do
-      get :show
-      expect(response).to have_http_status(200)
-    end
-  end
-
-  describe 'PUT #update' do
-    it 'updates the user record' do
-      put :update, params: { user: { locale: 'en', chosen_languages: ['es', 'fr', ''] } }
-
-      expect(response).to redirect_to(settings_preferences_path)
-      user.reload
-      expect(user.locale).to eq 'en'
-      expect(user.chosen_languages).to eq ['es', 'fr']
-    end
-
-    it 'updates user settings' do
-      user.settings['boost_modal'] = false
-      user.settings['delete_modal'] = true
-
-      put :update, params: {
-        user: {
-          setting_boost_modal: '1',
-          setting_delete_modal: '0',
-        }
-      }
-
-      expect(response).to redirect_to(settings_preferences_path)
-      user.reload
-      expect(user.settings['boost_modal']).to be true
-      expect(user.settings['delete_modal']).to be false
-    end
-  end
-end
-- 
cgit