Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb

1 files changed, 46 insertions, 0 deletions

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