cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make preferences page editable without clicking 'Edit Preferences'

Browse source
This commit is contained in:
Anton Khorev 2024-12-29 20:08:17 +03:00
parent 99af52b478
commit 967e6d4d86
8 changed files with 35 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

25
test/controllers/preferences_controller_test.rb
View file

@ -9,11 +9,6 @@ class PreferencesControllerTest < ActionDispatch::IntegrationTest
{ :controller => "preferences", :action => "show" }
)
assert_routing(
{ :path => "/preferences/edit", :method => :get },
{ :controller => "preferences", :action => "edit" }
)
assert_routing(
{ :path => "/preferences", :method => :put },
{ :controller => "preferences", :action => "update" }
@ -27,35 +22,35 @@ class PreferencesControllerTest < ActionDispatch::IntegrationTest
session_for(user)
# Changing to a invalid editor should fail
user.preferred_editor = "unknown"
put preferences_path, :params => { :user => user.attributes }
put preferences_path, :params => { :user => { :preferred_editor => "unknown", :languages => [] } }
assert_response :success
assert_template :edit
assert_template :show
assert_select ".alert-success", false
assert_select ".alert-danger", true
assert_select "form > div > select#user_preferred_editor > option[selected]", false
user.reload
assert_nil user.preferred_editor
assert_equal "light", user.preferences.find_by(:k => "site.color_scheme")&.v
assert_equal "light", user.preferences.find_by(:k => "map.color_scheme")&.v
# Changing to a valid editor should work
user.preferred_editor = "id"
put preferences_path, :params => { :user => user.attributes }
put preferences_path, :params => { :user => { :preferred_editor => "id", :languages => [] } }
assert_redirected_to preferences_path
follow_redirect!
assert_template :show
assert_select ".alert-success", /^Preferences updated/
assert_select "dd", "iD (in-browser editor)"
user.reload
assert_equal "id", user.preferred_editor
assert_equal "light", user.preferences.find_by(:k => "site.color_scheme")&.v
assert_equal "light", user.preferences.find_by(:k => "map.color_scheme")&.v
# Changing to the default editor should work
user.preferred_editor = "default"
put preferences_path, :params => { :user => user.attributes }
put preferences_path, :params => { :user => { :preferred_editor => "default", :languages => [] } }
assert_redirected_to preferences_path
follow_redirect!
assert_template :show
assert_select ".alert-success", /^Preferences updated/
assert_select "dd", "Default (currently iD)"
user.reload
assert_nil user.preferred_editor
assert_equal "light", user.preferences.find_by(:k => "site.color_scheme")&.v
assert_equal "light", user.preferences.find_by(:k => "map.color_scheme")&.v
end