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

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

Browse source
This commit is contained in:
Tom Hughes 2021-11-11 15:33:08 +00:00
commit e21b9b2bf1
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/diary_entries/index.html.erb
View file

@ -1,6 +1,6 @@
<% content_for :head, tag.meta(:name => :robots, :content => :noindex) %> <% content_for :head, tag.meta(:name => :robots, :content => :noindex) %>
<% content_for :heading do %> <% content_for :heading do %>
<div <% if @user %> id="userinformation"<% end %> class="row"> <div class="row">
<% if @user %> <% if @user %>
<div class="col-auto"> <div class="col-auto">
<%= user_image @user %> <%= user_image @user %>

2
app/views/diary_entries/show.html.erb
View file

@ -1,5 +1,5 @@
<% content_for :heading do %> <% content_for :heading do %>
<div id="userinformation" class="row"> <div class="row">
<div class="col-sm-auto"> <div class="col-sm-auto">
<%= user_image @entry.user %> <%= user_image @entry.user %>
</div> </div>

2
app/views/users/show.html.erb
View file

@ -1,5 +1,5 @@
<% content_for :heading do %> <% content_for :heading do %>
<div id="userinformation" class="row"> <div class="row">
<div class="col-sm-auto"> <div class="col-sm-auto">
<%= user_image @user %> <%= user_image @user %>
</div> </div>

16
test/controllers/users_controller_test.rb
View file

@ -560,7 +560,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
get user_path(user) get user_path(user)
assert_response :success assert_response :success
assert_select "div#userinformation" do assert_select "div.content-heading" do
assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1 assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1
assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/traces']", 1 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/traces']", 1
assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary']", 1 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary']", 1
@ -579,7 +579,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
create(:user_block, :user => blocked_user) create(:user_block, :user => blocked_user)
get user_path(blocked_user) get user_path(blocked_user)
assert_response :success assert_response :success
assert_select "div#userinformation" do assert_select "div.content-heading" do
assert_select "a[href^='/user/#{ERB::Util.u(blocked_user.display_name)}/history']", 1 assert_select "a[href^='/user/#{ERB::Util.u(blocked_user.display_name)}/history']", 1
assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/traces']", 1 assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/traces']", 1
assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/diary']", 1 assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/diary']", 1
@ -595,7 +595,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
create(:user_block, :creator => moderator_user) create(:user_block, :creator => moderator_user)
get user_path(moderator_user) get user_path(moderator_user)
assert_response :success assert_response :success
assert_select "div#userinformation" do assert_select "div.content-heading" do
assert_select "a[href^='/user/#{ERB::Util.u(moderator_user.display_name)}/history']", 1 assert_select "a[href^='/user/#{ERB::Util.u(moderator_user.display_name)}/history']", 1
assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/traces']", 1 assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/traces']", 1
assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/diary']", 1 assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/diary']", 1
@ -612,7 +612,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
# Test the normal user # Test the normal user
get user_path(user) get user_path(user)
assert_response :success assert_response :success
assert_select "div#userinformation" do assert_select "div.content-heading" do
assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1 assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1
assert_select "a[href='/traces/mine']", 1 assert_select "a[href='/traces/mine']", 1
assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary']", 1 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary']", 1
@ -629,7 +629,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
# Test the normal user # Test the normal user
get user_path(user) get user_path(user)
assert_response :success assert_response :success
assert_select "div#userinformation" do assert_select "div.content-heading" do
assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1 assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1
assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/traces']", 1 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/traces']", 1
assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary']", 1 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary']", 1
@ -649,21 +649,21 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
get user_path(agreed_user) get user_path(agreed_user)
assert_response :success assert_response :success
assert_select "div#userinformation" do assert_select "div.content-heading" do
assert_select "dt", :count => 0, :text => /Contributor terms/ assert_select "dt", :count => 0, :text => /Contributor terms/
end end
get user_path(seen_user) get user_path(seen_user)
assert_response :success assert_response :success
# put @response.body # put @response.body
assert_select "div#userinformation" do assert_select "div.content-heading" do
assert_select "dt", :count => 1, :text => /Contributor terms/ assert_select "dt", :count => 1, :text => /Contributor terms/
assert_select "dd", /Declined/ assert_select "dd", /Declined/
end end
get user_path(not_seen_user) get user_path(not_seen_user)
assert_response :success assert_response :success
assert_select "div#userinformation" do assert_select "div.content-heading" do
assert_select "dt", :count => 1, :text => /Contributor terms/ assert_select "dt", :count => 1, :text => /Contributor terms/
assert_select "dd", /Undecided/ assert_select "dd", /Undecided/
end end