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

Refactor account form to use bootstrap

Browse source 
There's further refactoring that could be done, but this is sufficient for now.
This commit is contained in:
Andy Allan 2021-01-27 15:36:59 +00:00
parent f737d2d34a
commit a7d959e588
3 changed files with 97 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

200
app/views/users/account.html.erb
View file

@ -10,158 +10,96 @@
</ul> </ul>
<% end %> <% end %>
<%= error_messages_for current_user %> <%= bootstrap_form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => "accountForm", :autocomplete => :off } do |f| %>
<%= form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => "accountForm", :class => "standard-form", :autocomplete => :off } do |f| %>
<fieldset> <%= f.text_field :display_name %>
<div class="standard-form-row"> <%= f.email_field :email, :disabled => true, :label => t(".current email address") %>
<label class="standard-label"><%= t "users.new.display name" %></label> <%= f.email_field :new_email, :autocomplete => :off %>
<%= f.text_field :display_name %> <%= f.password_field :pass_crypt, :value => "", :autocomplete => :off %>
<%= f.password_field :pass_crypt_confirmation, :value => "", :autocomplete => :off %>
<fieldset class="form-group">
<label for="user_auth_provider"><%= t(".external auth") %></label>
<div class="form-row">
<%= f.select(:auth_provider, Auth.providers, :hide_label => "true", :wrapper => { :class => "col-auto mb-0" }) %>
<%= f.text_field(:auth_uid, :hide_label => true, :wrapper => { :class => "col mb-0" }) %>
</div> </div>
<small class="form-text text-muted">(<a href="<%= t ".openid.link" %>" target="_new"><%= t ".openid.link text" %></a>)</small>
</fieldset> </fieldset>
<fieldset> <div class="form-group">
<div class="standard-form-row"> <label><%= t ".public editing.heading" %></label>
<label class="standard-label"><%= t ".current email address" %></label> <span class="form-text text-muted">
<input type="email" disabled value="<%= current_user.email %>" /> <% if current_user.data_public? %>
<span class="form-help deemphasize"><%= t ".email never displayed publicly" %></span> <%= t ".public editing.enabled" %>
</div> (<a href="<%= t ".public editing.enabled link" %>" target="_new"><%= t ".public editing.enabled link text" %></a>)
<% else %>
<%= t ".public editing.disabled" %>
(<a href="#public"><%= t ".public editing.disabled link text" %></a>)
<% end %>
</span>
</div>
<div class="standard-form-row"> <div class="form-group">
<label class="standard-label"><%= t ".new email address" %></label> <label><%= t ".contributor terms.heading" %></label>
<%= f.email_field :new_email, :autocomplete => :off %> <span class="form-text text-muted">
<span class="form-help deemphasize"><%= t ".email never displayed publicly" %></span> <% if current_user.terms_agreed? %>
</div> <%= t ".contributor terms.agreed" %>
</fieldset> (<a href="<%= t ".contributor terms.link" %>" target="_new"><%= t ".contributor terms.link text" %></a>)
<% if current_user.consider_pd? %>
<fieldset> <%= t ".contributor terms.agreed_with_pd" %>
<div class="standard-form-row">
<label class="standard-label"><%= t "users.new.password" %></label>
<%= f.password_field :pass_crypt, :value => "", :autocomplete => :off %>
</div>
<div class="standard-form-row">
<label class="standard-label"><%= t "users.new.confirm password" %></label>
<%= f.password_field :pass_crypt_confirmation, :value => "", :autocomplete => :off %>
</div>
</fieldset>
<fieldset>
<div class="standard-form-row">
<label class="standard-label"><%= t ".external auth" %></label>
<%= f.select :auth_provider, Auth.providers %>
<%= f.text_field :auth_uid %>
<span class="form-help deemphasize">(<a href="<%= t ".openid.link" %>" target="_new"><%= t ".openid.link text" %></a>)</span>
</div>
</fieldset>
<fieldset class="form-divider">
<div class="standard-form-row">
<label class="standard-label"><%= t ".public editing.heading" %></label>
<span class="form-help deemphasize">
<% if current_user.data_public? %>
<%= t ".public editing.enabled" %>
(<a href="<%= t ".public editing.enabled link" %>" target="_new"><%= t ".public editing.enabled link text" %></a>)
<% else %>
<%= t ".public editing.disabled" %>
(<a href="#public"><%= t ".public editing.disabled link text" %></a>)
<% end %> <% end %>
</span> <% else %>
</div> <%= t ".contributor terms.not yet agreed" %>
<%= link_to t(".contributor terms.review link text"), :controller => "users", :action => "terms" %>
<% end %>
</span>
</div>
<div class="standard-form-row"> <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{Settings.default_editor}.name")), "default"]] + Editors::AVAILABLE_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
<label class="standard-label"><%= t ".contributor terms.heading" %></label> <%= f.richtext_field :description, :cols => 80, :rows => 20 %>
<span class="form-help deemphasize"> <%= f.text_field :languages %>
<% if current_user.terms_agreed? %>
<%= t ".contributor terms.agreed" %>
(<a href="<%= t ".contributor terms.link" %>" target="_new"><%= t ".contributor terms.link text" %></a>)
<% if current_user.consider_pd? %>
<%= t ".contributor terms.agreed_with_pd" %>
<% end %>
<% else %>
<%= t ".contributor terms.not yet agreed" %>
<%= link_to t(".contributor terms.review link text"), :controller => "users", :action => "terms" %>
<% end %>
</span>
</div>
<div class="standard-form-row">
<label class="standard-label"><%= t ".preferred editor" %></label>
<%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{Settings.default_editor}.name")), "default"]] + Editors::AVAILABLE_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
</div>
</fieldset>
<fieldset class="form-divider"> <fieldset class="form-group">
<div class='standard-form-row'> <%= f.label t(".image") %>
<label class="standard-label"><%= t ".profile description" %></label> <div class="form-row">
<%= richtext_area :user, :description, :object => current_user, :cols => 80, :rows => 20 %> <div class="col-sm-2">
</div>
<div class="standard-form-row">
<label class="standard-label"><%= t ".preferred languages" %></label>
<%= f.text_field :languages %>
</div>
<div class='standard-form-row accountImage'>
<label class="standard-label"><%= t ".image" %></label>
<%= user_image current_user %> <%= user_image current_user %>
<ul class='form-list accountImage-options'> </div>
<div class="col-sm-10">
<% if current_user.avatar.attached? %> <% if current_user.avatar.attached? %>
<li> <%= f.radio_button "avatar_action", "keep", :name => "avatar_action", :label => t(".keep image"), :checked => !current_user.image_use_gravatar %>
<%= radio_button_tag "avatar_action", "keep", !current_user.image_use_gravatar %>
<label class='standard-label' for='avatar_action_keep'><%= t ".keep image" %></label>
</li>
<% end %> <% end %>
<% if current_user.avatar.attached? || current_user.image_use_gravatar? %> <% if current_user.avatar.attached? || current_user.image_use_gravatar? %>
<li> <%= f.radio_button "avatar_action", "delete", :name => "avatar_action", :label => t(".delete image"), :checked => false %>
<%= radio_button_tag "avatar_action", "delete" %>
<label class='standard-label' for='avatar_action_delete'><%= t ".delete image" %></label>
</li>
<% end %> <% end %>
<% if current_user.avatar.attached? %> <% if current_user.avatar.attached? %>
<li> <%= f.form_group :help => t(".image size hint"), :class => "mb-0" do %>
<%= radio_button_tag "avatar_action", "new" %> <%= f.radio_button "avatar_action", "new", :name => "avatar_action", :label => t(".replace image"), :checked => false %>
<label class='standard-label' for='avatar_action_new'> <%= f.file_field :avatar, :hide_label => true, :wrapper => { :class => "mb-0" } %>
<%= t ".replace image" %> <% end %>
<span class="form-help deemphasize"><%= t ".image size hint" %></span>
</label>
<%= f.file_field :avatar %>
</li>
<% else %> <% else %>
<li> <%= f.form_group :help => t(".image size hint"), :class => "mb-0" do %>
<%= radio_button_tag "avatar_action", "new" %> <%= f.radio_button "avatar_action", "new", :name => "avatar_action", :label => t(".new image"), :checked => false %>
<label class='standard-label' for='avatar_action_new'> <%= f.file_field :avatar, :hide_label => true, :wrapper => { :class => "mb-0" } %>
<%= t ".new image" %> <% end %>
<span class="form-help deemphasize"><%= t ".image size hint" %></span>
</label>
<%= f.file_field :avatar %>
</li>
<% end %> <% end %>
<li> <%= f.form_group :help => link_to(t(".gravatar.what_is_gravatar"), t(".gravatar.link")) do %>
<%= radio_button_tag "avatar_action", "gravatar", current_user.image_use_gravatar %> <%= f.radio_button "avatar_action", "gravatar", :name => "avatar_action", :label => t(".gravatar.gravatar"), :checked => current_user.image_use_gravatar %>
<label class='standard-label' for='avatar_action_gravatar'> <% end %>
<%= t ".gravatar.gravatar" %> </div>
<span class='form-help deemphasize'> (<a href="<%= t ".gravatar.link" %>" target="_new"><%= t ".gravatar.link text" %></a>)</span>
</label>
</li>
</ul>
</div> </div>
</fieldset> </fieldset>
<fieldset class="form-divider"> <fieldset>
<div class='standard-form-row location clearfix'> <legend><%= t ".home location" -%></legend>
<label class="standard-label"><%= t ".home location" %></label>
<div id="homerow" <% unless current_user.home_lat and current_user.home_lon %> class="nohome"<% end %>> <div id="homerow" <% unless current_user.home_lat and current_user.home_lon %> class="nohome"<% end %>>
<p class="message form-help deemphasize"><%= t ".no home location" %></p> <p class="message form-help deemphasize"><%= t ".no home location" %></p>
<div class='form-column'> <div class="form-row">
<label class="standard-label secondary"><%= t ".latitude" %></label> <%= f.text_field :home_lat, :wrapper_class => "col-sm-4", :id => "home_lat" %>
<%= f.text_field :home_lat, :id => "home_lat" %> <%= f.text_field :home_lon, :wrapper_class => "col-sm-4", :id => "home_lon" %>
</div>
<div class='form-column'>
<label class="standard-label secondary"><%= t ".longitude" %></label>
<%= f.text_field :home_lon, :id => "home_lon" %>
</div>
</div> </div>
</div> </div>
<div class="standard-form-row"> <div class="standard-form-row">
<input type="checkbox" name="updatehome" value="1" <% unless current_user.home_lat and current_user.home_lon %> checked="checked" <% end %> id="updatehome" /> <input type="checkbox" name="updatehome" value="1" <% unless current_user.home_lat and current_user.home_lon %> checked="checked" <% end %> id="updatehome" />
<label class="standard-label" for="updatehome"><%= t ".update home location on click" %></label> <label class="standard-label" for="updatehome"><%= t ".update home location on click" %></label>
@ -169,7 +107,7 @@
<%= tag.div "", :id => "map", :class => "content_map set_location" %> <%= tag.div "", :id => "map", :class => "content_map set_location" %>
</fieldset> </fieldset>
<%= submit_tag t(".save changes button") %> <%= f.primary t(".save changes button") %>
<% end %> <% end %>
<% unless current_user.data_public? %> <% unless current_user.data_public? %>

32
config/locales/en.yml
View file

@ -122,10 +122,14 @@ en:
user: user:
email: "Email" email: "Email"
email_confirmation: "Email Confirmation" email_confirmation: "Email Confirmation"
new_email: "New Email Address"
active: "Active" active: "Active"
display_name: "Display Name" display_name: "Display Name"
description: "Description" description: Profile Description
languages: "Languages" home_lat: Latitude
home_lon: Longitude
languages: Preferred Languages
preferred_editor: Preferred Editor
pass_crypt: "Password" pass_crypt: "Password"
pass_crypt_confirmation: "Confirm Password" pass_crypt_confirmation: "Confirm Password"
help: help:
@ -136,6 +140,7 @@ en:
needs_view: Does the user need to log in before this block will be cleared? needs_view: Does the user need to log in before this block will be cleared?
user: user:
email_confirmation: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information.' email_confirmation: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information.'
new_email: "(never displayed publicly)"
datetime: datetime:
distance_in_words_ago: distance_in_words_ago:
about_x_hours: about_x_hours:
@ -2308,8 +2313,6 @@ en:
display name: "Display Name:" display name: "Display Name:"
display name description: "Your publicly displayed username. You can change this later in the preferences." display name description: "Your publicly displayed username. You can change this later in the preferences."
external auth: "Third Party Authentication:" external auth: "Third Party Authentication:"
password: "Password:"
confirm password: "Confirm Password:"
use external auth: "Alternatively, use a third party to login" use external auth: "Alternatively, use a third party to login"
auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one." auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one."
continue: Sign Up continue: Sign Up
@ -2414,15 +2417,13 @@ en:
account: account:
title: "Edit account" title: "Edit account"
my settings: My settings my settings: My settings
current email address: "Current Email Address:" current email address: "Current Email Address"
new email address: "New Email Address:" external auth: "External Authentication"
email never displayed publicly: "(never displayed publicly)"
external auth: "External Authentication:"
openid: openid:
link: "https://wiki.openstreetmap.org/wiki/OpenID" link: "https://wiki.openstreetmap.org/wiki/OpenID"
link text: "what is this?" link text: "what is this?"
public editing: public editing:
heading: "Public editing:" heading: "Public editing"
enabled: "Enabled. Not anonymous and can edit data." enabled: "Enabled. Not anonymous and can edit data."
enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits" enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits"
enabled link text: "what is this?" enabled link text: "what is this?"
@ -2432,21 +2433,18 @@ en:
heading: "Public editing" heading: "Public editing"
html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>" html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
contributor terms: contributor terms:
heading: "Contributor Terms:" heading: "Contributor Terms"
agreed: "You have agreed to the new Contributor Terms." agreed: "You have agreed to the new Contributor Terms."
not yet agreed: "You have not yet agreed to the new Contributor Terms." not yet agreed: "You have not yet agreed to the new Contributor Terms."
review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms." review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain." agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
link: "https://www.osmfoundation.org/wiki/License/Contributor_Terms" link: "https://www.osmfoundation.org/wiki/License/Contributor_Terms"
link text: "what is this?" link text: "what is this?"
profile description: "Profile Description:" image: Image
preferred languages: "Preferred Languages:"
preferred editor: "Preferred Editor:"
image: "Image:"
gravatar: gravatar:
gravatar: "Use Gravatar" gravatar: "Use Gravatar"
link: "https://wiki.openstreetmap.org/wiki/Gravatar" link: "https://wiki.openstreetmap.org/wiki/Gravatar"
link text: "what is this?" what_is_gravatar: "What is Gravatar?"
disabled: "Gravatar has been disabled." disabled: "Gravatar has been disabled."
enabled: "Display of your Gravatar has been enabled." enabled: "Display of your Gravatar has been enabled."
new image: "Add an image" new image: "Add an image"
@ -2454,10 +2452,8 @@ en:
delete image: "Remove the current image" delete image: "Remove the current image"
replace image: "Replace the current image" replace image: "Replace the current image"
image size hint: "(square images at least 100x100 work best)" image size hint: "(square images at least 100x100 work best)"
home location: "Home Location:" home location: "Home Location"
no home location: "You have not entered your home location." no home location: "You have not entered your home location."
latitude: "Latitude:"
longitude: "Longitude:"
update home location on click: "Update home location when I click on the map?" update home location on click: "Update home location when I click on the map?"
save changes button: Save Changes save changes button: Save Changes
make edits public button: Make all my edits public make edits public button: Make all my edits public

40
test/controllers/users_controller_test.rb
View file

@ -958,9 +958,8 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
get user_account_path(user) get user_account_path(user)
assert_response :success assert_response :success
assert_template :account assert_template :account
assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/ assert_select ".notice", /^User information updated successfully/
assert_select "form#accountForm > fieldset > div.standard-form-row > div#user_description_container > div#user_description_content > textarea#user_description", user.description assert_select "form#accountForm > div.form-group > div#user_description_container > div#user_description_content > textarea#user_description", user.description
# Changing to a invalid editor should fail # Changing to a invalid editor should fail
user.preferred_editor = "unknown" user.preferred_editor = "unknown"
@ -968,8 +967,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
assert_response :success assert_response :success
assert_template :account assert_template :account
assert_select ".notice", false assert_select ".notice", false
assert_select "div#errorExplanation" assert_select "form#accountForm > div.form-group > select#user_preferred_editor > option[selected]", false
assert_select "form#accountForm > fieldset > div.standard-form-row > select#user_preferred_editor > option[selected]", false
# Changing to a valid editor should work # Changing to a valid editor should work
user.preferred_editor = "id" user.preferred_editor = "id"
@ -979,9 +977,8 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
get user_account_path(user) get user_account_path(user)
assert_response :success assert_response :success
assert_template :account assert_template :account
assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/ assert_select ".notice", /^User information updated successfully/
assert_select "form#accountForm > fieldset > div.standard-form-row > select#user_preferred_editor > option[selected][value=?]", "id" assert_select "form#accountForm > div.form-group > select#user_preferred_editor > option[selected][value=?]", "id"
# Changing to the default editor should work # Changing to the default editor should work
user.preferred_editor = "default" user.preferred_editor = "default"
@ -991,9 +988,8 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
get user_account_path(user) get user_account_path(user)
assert_response :success assert_response :success
assert_template :account assert_template :account
assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/ assert_select ".notice", /^User information updated successfully/
assert_select "form#accountForm > fieldset > div.standard-form-row > select#user_preferred_editor > option[selected]", false assert_select "form#accountForm > div.form-group > select#user_preferred_editor > option[selected]", false
# Changing to an uploaded image should work # Changing to an uploaded image should work
image = Rack::Test::UploadedFile.new("test/gpx/fixtures/a.gif", "image/gif") image = Rack::Test::UploadedFile.new("test/gpx/fixtures/a.gif", "image/gif")
@ -1003,9 +999,8 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
get user_account_path(user) get user_account_path(user)
assert_response :success assert_response :success
assert_template :account assert_template :account
assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/ assert_select ".notice", /^User information updated successfully/
assert_select "form#accountForm > fieldset > div.standard-form-row.accountImage input[name=avatar_action][checked][value=?]", "keep" assert_select "form#accountForm > fieldset.form-group > div.form-row > div.col-sm-10 > div.form-check > input[name=avatar_action][checked][value=?]", "keep"
# Changing to a gravatar image should work # Changing to a gravatar image should work
post user_account_path(user), :params => { :avatar_action => "gravatar", :user => user.attributes } post user_account_path(user), :params => { :avatar_action => "gravatar", :user => user.attributes }
@ -1014,9 +1009,8 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
get user_account_path(user) get user_account_path(user)
assert_response :success assert_response :success
assert_template :account assert_template :account
assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/ assert_select ".notice", /^User information updated successfully/
assert_select "form#accountForm > fieldset > div.standard-form-row.accountImage input[name=avatar_action][checked][value=?]", "gravatar" assert_select "form#accountForm > fieldset.form-group > div.form-row > div.col-sm-10 > div.form-group > div.form-check > input[name=avatar_action][checked][value=?]", "gravatar"
# Removing the image should work # Removing the image should work
post user_account_path(user), :params => { :avatar_action => "delete", :user => user.attributes } post user_account_path(user), :params => { :avatar_action => "delete", :user => user.attributes }
@ -1025,9 +1019,9 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
get user_account_path(user) get user_account_path(user)
assert_response :success assert_response :success
assert_template :account assert_template :account
assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/ assert_select ".notice", /^User information updated successfully/
assert_select "form#accountForm > fieldset > div.standard-form-row.accountImage input[name=avatar_action][checked]", false assert_select "form#accountForm > fieldset.form-group > div.form-row > div.col-sm-10 > div.form-check > input[name=avatar_action][checked]", false
assert_select "form#accountForm > fieldset.form-group > div.form-row > div.col-sm-10 > div.form-group > div.form-check > input[name=avatar_action][checked]", false
# Adding external authentication should redirect to the auth provider # Adding external authentication should redirect to the auth provider
post user_account_path(user), :params => { :user => user.attributes.merge(:auth_provider => "openid", :auth_uid => "gmail.com") } post user_account_path(user), :params => { :user => user.attributes.merge(:auth_provider => "openid", :auth_uid => "gmail.com") }
@ -1040,8 +1034,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
assert_response :success assert_response :success
assert_template :account assert_template :account
assert_select ".notice", false assert_select ".notice", false
assert_select "div#errorExplanation" assert_select "form#accountForm > div.form-group > input.is-invalid#user_display_name"
assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_display_name"
# Changing name to one that exists should fail, regardless of case # Changing name to one that exists should fail, regardless of case
new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name.upcase) new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name.upcase)
@ -1049,8 +1042,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
assert_response :success assert_response :success
assert_template :account assert_template :account
assert_select ".notice", false assert_select ".notice", false
assert_select "div#errorExplanation" assert_select "form#accountForm > div.form-group > input.is-invalid#user_display_name"
assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_display_name"
# Changing name to one that doesn't exist should work # Changing name to one that doesn't exist should work
new_attributes = user.attributes.dup.merge(:display_name => "new tester") new_attributes = user.attributes.dup.merge(:display_name => "new tester")
@ -1060,9 +1052,8 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
get user_account_path(:display_name => "new tester") get user_account_path(:display_name => "new tester")
assert_response :success assert_response :success
assert_template :account assert_template :account
assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/ assert_select ".notice", /^User information updated successfully/
assert_select "form#accountForm > fieldset > div.standard-form-row > input#user_display_name[value=?]", "new tester" assert_select "form#accountForm > div.form-group > input#user_display_name[value=?]", "new tester"
# Record the change of name # Record the change of name
user.display_name = "new tester" user.display_name = "new tester"
@ -1077,8 +1068,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
assert_response :success assert_response :success
assert_template :account assert_template :account
assert_select ".notice", false assert_select ".notice", false
assert_select "div#errorExplanation" assert_select "form#accountForm > div.form-group > input.is-invalid#user_new_email"
assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_new_email"
# Changing email to one that exists should fail, regardless of case # Changing email to one that exists should fail, regardless of case
user.new_email = create(:user).email.upcase user.new_email = create(:user).email.upcase
@ -1090,8 +1080,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
assert_response :success assert_response :success
assert_template :account assert_template :account
assert_select ".notice", false assert_select ".notice", false
assert_select "div#errorExplanation" assert_select "form#accountForm > div.form-group > input.is-invalid#user_new_email"
assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_new_email"
# Changing email to one that doesn't exist should work # Changing email to one that doesn't exist should work
user.new_email = "new_tester@example.com" user.new_email = "new_tester@example.com"
@ -1105,9 +1094,8 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
get user_account_path(user) get user_account_path(user)
assert_response :success assert_response :success
assert_template :account assert_template :account
assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/ assert_select ".notice", /^User information updated successfully/
assert_select "form#accountForm > fieldset > div.standard-form-row > input#user_new_email[value=?]", user.new_email assert_select "form#accountForm > div.form-group > input#user_new_email[value=?]", user.new_email
email = ActionMailer::Base.deliveries.first email = ActionMailer::Base.deliveries.first
assert_equal 1, email.to.count assert_equal 1, email.to.count
assert_equal user.new_email, email.to.first assert_equal user.new_email, email.to.first