parent
df671aeccc
commit
b4d90ec7f4
1 changed files with 9 additions and 0 deletions
|
@ -942,6 +942,7 @@ class UserControllerTest < ActionController::TestCase
|
||||||
|
|
||||||
# Test a normal user
|
# Test a normal user
|
||||||
user = create(:user)
|
user = create(:user)
|
||||||
|
create(:friend, :befriender => user)
|
||||||
get :show, :params => { :display_name => user.display_name }
|
get :show, :params => { :display_name => user.display_name }
|
||||||
assert_response :success
|
assert_response :success
|
||||||
assert_select "div#userinformation" do
|
assert_select "div#userinformation" do
|
||||||
|
@ -955,6 +956,9 @@ class UserControllerTest < ActionController::TestCase
|
||||||
assert_select "a[href='/blocks/new/#{ERB::Util.u(user.display_name)}']", 0
|
assert_select "a[href='/blocks/new/#{ERB::Util.u(user.display_name)}']", 0
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Friends shouldn't be visible as we're not logged in
|
||||||
|
assert_select "div#friends-container", :count => 0
|
||||||
|
|
||||||
# Test a user who has been blocked
|
# Test a user who has been blocked
|
||||||
blocked_user = create(:user)
|
blocked_user = create(:user)
|
||||||
create(:user_block, :user => blocked_user)
|
create(:user_block, :user => blocked_user)
|
||||||
|
@ -1004,6 +1008,11 @@ class UserControllerTest < ActionController::TestCase
|
||||||
assert_select "a[href='/blocks/new/#{ERB::Util.u(user.display_name)}']", 0
|
assert_select "a[href='/blocks/new/#{ERB::Util.u(user.display_name)}']", 0
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Friends should be visible as we're now logged in
|
||||||
|
assert_select "div#friends-container" do
|
||||||
|
assert_select "div.contact-activity", :count => 1
|
||||||
|
end
|
||||||
|
|
||||||
# Login as a moderator
|
# Login as a moderator
|
||||||
session[:user] = create(:moderator_user).id
|
session[:user] = create(:moderator_user).id
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue