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

Merge remote-tracking branch 'upstream/pull/1986'

Browse source
This commit is contained in:
Tom Hughes 2018-09-10 19:01:28 +01:00
commit 276599d34f
11 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/changeset_helper.rb
View file

@ -3,7 +3,7 @@ module ChangesetHelper
if changeset.user.status == "deleted"
t("user.no_such_user.deleted")
elsif changeset.user.data_public?
link_to(changeset.user.display_name, user_path(changeset.user.display_name))
link_to(changeset.user.display_name, user_path(changeset.user))
else
t("browse.anonymous")
end

2
app/views/changeset/_changeset.html.erb
View file

@ -14,7 +14,7 @@
<%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
<h4>
<a class="changeset_id" href="<%= changeset_path(changeset.id) %>">
<a class="changeset_id" href="<%= changeset_path(changeset) %>">
<%= changeset.tags['comment'].to_s.presence || t('browse.no_comment') %>
</a>
</h4>

4
app/views/issues/_comments.html.erb
View file

@ -2,9 +2,9 @@
<% comments.each do |comment| %>
<div class="comment">
<div style="float:left">
<%= link_to user_thumbnail(comment.user), user_path(comment.user.display_name) %>
<%= link_to user_thumbnail(comment.user), user_path(comment.user) %>
</div>
<b> <%= link_to comment.user.display_name, user_path(comment.user.display_name) %> </b> <br/>
<b> <%= link_to comment.user.display_name, user_path(comment.user) %> </b> <br/>
<%= comment.body %>
</div>
<span class="deemphasize">

4
app/views/issues/_reports.html.erb
View file

@ -1,9 +1,9 @@
<% reports.each do |report| %>
<div class="report">
<div style="float:left">
<%= link_to user_thumbnail(report.user), user_path(report.user.display_name) %>
<%= link_to user_thumbnail(report.user), user_path(report.user) %>
</div>
<%= t ".reported_by_html", :category => report.category, :user => link_to(report.user.display_name, user_path(report.user.display_name)) %>
<%= t ".reported_by_html", :category => report.category, :user => link_to(report.user.display_name, user_path(report.user)) %>
<br/>
<span class="deemphasize">
<%= t(".updated_at", :datetime => l(report.updated_at.to_datetime, :format => :friendly)) %>

4
app/views/issues/index.html.erb
View file

@ -34,10 +34,10 @@
<td><%= t ".states.#{issue.status}" %></td>
<td><%= link_to t(".reports_count", :count => issue.reports_count), issue %></td>
<td><%= link_to reportable_title(issue.reportable), reportable_url(issue.reportable) %></td>
<td><%= link_to issue.reported_user.display_name, user_path(issue.reported_user.display_name) if issue.reported_user %></td>
<td><%= link_to issue.reported_user.display_name, user_path(issue.reported_user) if issue.reported_user %></td>
<td>
<% if issue.user_updated %>
<%= t ".last_updated_time_user_html", :user => link_to(issue.user_updated.display_name, user_path(issue.user_updated.display_name)),
<%= t ".last_updated_time_user_html", :user => link_to(issue.user_updated.display_name, user_path(issue.user_updated)),
:time => distance_of_time_in_words_to_now(issue.updated_at),
:title => l(issue.updated_at) %>
<% else %>

2
app/views/layouts/_header.html.erb
View file

@ -86,7 +86,7 @@
<% end %>
</li>
<li>
<%= link_to t('user.show.my profile'), user_path(:display_name => current_user.display_name) %>
<%= link_to t('user.show.my profile'), user_path(current_user) %>
</li>
<li>
<%= link_to t('user.show.my settings'), :controller => 'user', :action => 'account', :display_name => current_user.display_name %>

6
test/controllers/reports_controller_test.rb
View file

@ -29,7 +29,7 @@ class ReportsControllerTest < ActionController::TestCase
}
end
assert_response :redirect
assert_redirected_to user_path(target_user.display_name)
assert_redirected_to user_path(target_user)
end
def test_new_report_with_incomplete_details
@ -55,7 +55,7 @@ class ReportsControllerTest < ActionController::TestCase
}
end
assert_response :redirect
assert_redirected_to user_path(target_user.display_name)
assert_redirected_to user_path(target_user)
issue = Issue.last
@ -103,7 +103,7 @@ class ReportsControllerTest < ActionController::TestCase
}
end
assert_response :redirect
assert_redirected_to user_path(target_user.display_name)
assert_redirected_to user_path(target_user)
issue = Issue.last

10
test/controllers/user_blocks_controller_test.rb
View file

@ -182,7 +182,7 @@ class UserBlocksControllerTest < ActionController::TestCase
# Check that the block edit page requires us to login
get :edit, :params => { :id => active_block.id }
assert_redirected_to login_path(:referer => edit_user_block_path(:id => active_block.id))
assert_redirected_to login_path(:referer => edit_user_block_path(active_block))
# Login as a normal user
session[:user] = create(:user).id
@ -306,7 +306,7 @@ class UserBlocksControllerTest < ActionController::TestCase
:user_block_period => "12",
:user_block => { :needs_view => true, :reason => "Vandalism" } }
end
assert_redirected_to edit_user_block_path(:id => active_block.id)
assert_redirected_to edit_user_block_path(active_block)
assert_equal "Only the moderator who created this block can edit it.", flash[:error]
# Login as the correct moderator
@ -318,7 +318,7 @@ class UserBlocksControllerTest < ActionController::TestCase
:params => { :id => active_block.id,
:user_block_period => "99" }
end
assert_redirected_to edit_user_block_path(:id => active_block.id)
assert_redirected_to edit_user_block_path(active_block)
assert_equal "The blocking period must be one of the values selectable in the drop-down list.", flash[:error]
# Check that updating a block works
@ -328,7 +328,7 @@ class UserBlocksControllerTest < ActionController::TestCase
:user_block_period => "12",
:user_block => { :needs_view => true, :reason => "Vandalism" } }
end
assert_redirected_to user_block_path(:id => active_block.id)
assert_redirected_to user_block_path(active_block)
assert_equal "Block updated.", flash[:notice]
b = UserBlock.find(active_block.id)
assert_in_delta Time.now, b.updated_at, 1
@ -378,7 +378,7 @@ class UserBlocksControllerTest < ActionController::TestCase
# Check that revoking a block works
post :revoke, :params => { :id => active_block.id, :confirm => true }
assert_redirected_to user_block_path(:id => active_block.id)
assert_redirected_to user_block_path(active_block)
b = UserBlock.find(active_block.id)
assert_in_delta Time.now, b.ends_at, 1

8
test/controllers/user_controller_test.rb
View file

@ -1250,7 +1250,7 @@ class UserControllerTest < ActionController::TestCase
assert_difference "ActionMailer::Base.deliveries.size", 1 do
post :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
end
assert_redirected_to user_path(:display_name => friend.display_name)
assert_redirected_to user_path(friend)
assert_match /is now your friend/, flash[:notice]
assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
email = ActionMailer::Base.deliveries.first
@ -1262,7 +1262,7 @@ class UserControllerTest < ActionController::TestCase
assert_no_difference "ActionMailer::Base.deliveries.size" do
post :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
end
assert_redirected_to user_path(:display_name => friend.display_name)
assert_redirected_to user_path(friend)
assert_match /You are already friends with/, flash[:warning]
assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
end
@ -1335,13 +1335,13 @@ class UserControllerTest < ActionController::TestCase
# When logged in a POST should remove the friendship
post :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
assert_redirected_to user_path(:display_name => friend.display_name)
assert_redirected_to user_path(friend)
assert_match /was removed from your friends/, flash[:notice]
assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
# A second POST should report that the friendship does not exist
post :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
assert_redirected_to user_path(:display_name => friend.display_name)
assert_redirected_to user_path(friend)
assert_match /is not one of your friends/, flash[:error]
assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
end

22
test/controllers/user_roles_controller_test.rb
View file

@ -31,7 +31,7 @@ class UserRolesControllerTest < ActionController::TestCase
# Granting should still fail
post :grant, :params => { :display_name => target_user.display_name, :role => "moderator" }
assert_redirected_to user_path(target_user.display_name)
assert_redirected_to user_path(target_user)
assert_equal "Only administrators can perform user role management, and you are not an administrator.", flash[:error]
# Login as an administrator
@ -50,20 +50,20 @@ class UserRolesControllerTest < ActionController::TestCase
assert_no_difference "UserRole.count" do
post :grant, :params => { :display_name => super_user.display_name, :role => role }
end
assert_redirected_to user_path(super_user.display_name)
assert_redirected_to user_path(super_user)
assert_equal "The user already has role #{role}.", flash[:error]
# Granting a role to a user that doesn't have it should work...
assert_difference "UserRole.count", 1 do
post :grant, :params => { :display_name => target_user.display_name, :role => role }
end
assert_redirected_to user_path(target_user.display_name)
assert_redirected_to user_path(target_user)
# ...but trying a second time should fail
assert_no_difference "UserRole.count" do
post :grant, :params => { :display_name => target_user.display_name, :role => role }
end
assert_redirected_to user_path(target_user.display_name)
assert_redirected_to user_path(target_user)
assert_equal "The user already has role #{role}.", flash[:error]
end
@ -71,7 +71,7 @@ class UserRolesControllerTest < ActionController::TestCase
assert_difference "UserRole.count", 0 do
post :grant, :params => { :display_name => target_user.display_name, :role => "no_such_role" }
end
assert_redirected_to user_path(target_user.display_name)
assert_redirected_to user_path(target_user)
assert_equal "The string `no_such_role' is not a valid role.", flash[:error]
end
@ -92,7 +92,7 @@ class UserRolesControllerTest < ActionController::TestCase
# Revoking should still fail
post :revoke, :params => { :display_name => target_user.display_name, :role => "moderator" }
assert_redirected_to user_path(target_user.display_name)
assert_redirected_to user_path(target_user)
assert_equal "Only administrators can perform user role management, and you are not an administrator.", flash[:error]
# Login as an administrator
@ -111,20 +111,20 @@ class UserRolesControllerTest < ActionController::TestCase
assert_no_difference "UserRole.count" do
post :revoke, :params => { :display_name => target_user.display_name, :role => role }
end
assert_redirected_to user_path(target_user.display_name)
assert_redirected_to user_path(target_user)
assert_equal "The user does not have role #{role}.", flash[:error]
# Removing a role from a user that has it should work...
assert_difference "UserRole.count", -1 do
post :revoke, :params => { :display_name => super_user.display_name, :role => role }
end
assert_redirected_to user_path(super_user.display_name)
assert_redirected_to user_path(super_user)
# ...but trying a second time should fail
assert_no_difference "UserRole.count" do
post :revoke, :params => { :display_name => super_user.display_name, :role => role }
end
assert_redirected_to user_path(super_user.display_name)
assert_redirected_to user_path(super_user)
assert_equal "The user does not have role #{role}.", flash[:error]
end
@ -132,12 +132,12 @@ class UserRolesControllerTest < ActionController::TestCase
assert_difference "UserRole.count", 0 do
post :revoke, :params => { :display_name => target_user.display_name, :role => "no_such_role" }
end
assert_redirected_to user_path(target_user.display_name)
assert_redirected_to user_path(target_user)
assert_equal "The string `no_such_role' is not a valid role.", flash[:error]
# Revoking administrator role from current user should fail
post :revoke, :params => { :display_name => administrator_user.display_name, :role => "administrator" }
assert_redirected_to user_path(administrator_user.display_name)
assert_redirected_to user_path(administrator_user)
assert_equal "Cannot revoke administrator role from current user.", flash[:error]
end
end

6
test/system/report_user_test.rb
View file

@ -12,7 +12,7 @@ class ReportUserTest < ApplicationSystemTestCase
def test_can_report_user
user = create(:user)
sign_in_as(create(:user))
visit user_path(user.display_name)
visit user_path(user)
click_on I18n.t("user.show.report")
assert page.has_content? "Report"
@ -33,7 +33,7 @@ class ReportUserTest < ApplicationSystemTestCase
def test_it_promotes_issues
user = create(:user)
sign_in_as(create(:user))
visit user_path(user.display_name)
visit user_path(user)
click_on I18n.t("user.show.report")
assert page.has_content? "Report"
@ -50,7 +50,7 @@ class ReportUserTest < ApplicationSystemTestCase
assert_equal user, Issue.last.reportable
assert_equal "moderator", Issue.last.assigned_role
visit user_path(user.display_name)
visit user_path(user)
click_on I18n.t("user.show.report")
assert page.has_content? "Report"