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

Rename user#view to user#show

Browse source
This commit is contained in:
Andy Allan 2018-09-05 14:21:01 +08:00
parent 6027c42ee7
commit 19c26e70a3
18 changed files with 50 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

30
test/controllers/user_controller_test.rb
View file

@ -130,7 +130,7 @@ class UserControllerTest < ActionController::TestCase
assert_routing(
{ :path => "/user/username", :method => :get },
{ :controller => "user", :action => "view", :display_name => "username" }
{ :controller => "user", :action => "show", :display_name => "username" }
)
assert_routing(
@ -935,14 +935,14 @@ class UserControllerTest < ActionController::TestCase
# Check that the user account page will display and contains some relevant
# information for the user
def test_view
def test_show
# Test a non-existent user
get :view, :params => { :display_name => "unknown" }
get :show, :params => { :display_name => "unknown" }
assert_response :not_found
# Test a normal user
user = create(:user)
get :view, :params => { :display_name => user.display_name }
get :show, :params => { :display_name => user.display_name }
assert_response :success
assert_select "div#userinformation" do
assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1
@ -958,7 +958,7 @@ class UserControllerTest < ActionController::TestCase
# Test a user who has been blocked
blocked_user = create(:user)
create(:user_block, :user => blocked_user)
get :view, :params => { :display_name => blocked_user.display_name }
get :show, :params => { :display_name => blocked_user.display_name }
assert_response :success
assert_select "div#userinformation" do
assert_select "a[href^='/user/#{ERB::Util.u(blocked_user.display_name)}/history']", 1
@ -974,7 +974,7 @@ class UserControllerTest < ActionController::TestCase
# Test a moderator who has applied blocks
moderator_user = create(:moderator_user)
create(:user_block, :creator => moderator_user)
get :view, :params => { :display_name => moderator_user.display_name }
get :show, :params => { :display_name => moderator_user.display_name }
assert_response :success
assert_select "div#userinformation" do
assert_select "a[href^='/user/#{ERB::Util.u(moderator_user.display_name)}/history']", 1
@ -991,7 +991,7 @@ class UserControllerTest < ActionController::TestCase
session[:user] = user.id
# Test the normal user
get :view, :params => { :display_name => user.display_name }
get :show, :params => { :display_name => user.display_name }
assert_response :success
assert_select "div#userinformation" do
assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1
@ -1008,7 +1008,7 @@ class UserControllerTest < ActionController::TestCase
session[:user] = create(:moderator_user).id
# Test the normal user
get :view, :params => { :display_name => user.display_name }
get :show, :params => { :display_name => user.display_name }
assert_response :success
assert_select "div#userinformation" do
assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1
@ -1028,13 +1028,13 @@ class UserControllerTest < ActionController::TestCase
seen_user = create(:user, :terms_seen => true)
not_seen_user = create(:user, :terms_seen => false)
get :view, :params => { :display_name => agreed_user.display_name }
get :show, :params => { :display_name => agreed_user.display_name }
assert_response :success
assert_select "div#userinformation" do
assert_select "p", :count => 0, :text => /Contributor terms/
end
get :view, :params => { :display_name => seen_user.display_name }
get :show, :params => { :display_name => seen_user.display_name }
assert_response :success
# put @response.body
assert_select "div#userinformation" do
@ -1042,7 +1042,7 @@ class UserControllerTest < ActionController::TestCase
assert_select "p", /Declined/
end
get :view, :params => { :display_name => not_seen_user.display_name }
get :show, :params => { :display_name => not_seen_user.display_name }
assert_response :success
assert_select "div#userinformation" do
assert_select "p", :count => 1, :text => /Contributor terms/
@ -1390,12 +1390,12 @@ class UserControllerTest < ActionController::TestCase
# Now try as a normal user
get :set_status, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => user }
assert_response :redirect
assert_redirected_to :action => :view, :display_name => user.display_name
assert_redirected_to :action => :show, :display_name => user.display_name
# Finally try as an administrator
get :set_status, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => create(:administrator_user) }
assert_response :redirect
assert_redirected_to :action => :view, :display_name => user.display_name
assert_redirected_to :action => :show, :display_name => user.display_name
assert_equal "suspended", User.find(user.id).status
end
@ -1410,12 +1410,12 @@ class UserControllerTest < ActionController::TestCase
# Now try as a normal user
get :delete, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => user }
assert_response :redirect
assert_redirected_to :action => :view, :display_name => user.display_name
assert_redirected_to :action => :show, :display_name => user.display_name
# Finally try as an administrator
get :delete, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => create(:administrator_user) }
assert_response :redirect
assert_redirected_to :action => :view, :display_name => user.display_name
assert_redirected_to :action => :show, :display_name => user.display_name
# Check that the user was deleted properly
user.reload