Rather than passing around record ids explicitly, we can use the
model relations and pass around the models. This makes reading the
tests slightly simpler to read.
- entry = create(:diary_entry, :user_id => users(:normal_user).id)
+ entry = create(:diary_entry, :user => users(:normal_user))
# Make sure that you are redirected to the login page when you are
# not logged in, without and with the id of the entry you want to edit
# Make sure that you are redirected to the login page when you are
# not logged in, without and with the id of the entry you want to edit
- entry = create(:diary_entry, :user_id => users(:normal_user).id)
+ entry = create(:diary_entry, :user => users(:normal_user))
# Make sure that you are denied when you are not logged in
post :comment, :display_name => entry.user.display_name, :id => entry.id
# Make sure that you are denied when you are not logged in
post :comment, :display_name => entry.user.display_name, :id => entry.id
def test_comment_spammy
# Find the entry to comment on
def test_comment_spammy
# Find the entry to comment on
- entry = create(:diary_entry, :user_id => users(:normal_user).id)
+ entry = create(:diary_entry, :user => users(:normal_user))
post :subscribe, { :id => entry.id, :display_name => entry.user.display_name }, { :user => users(:normal_user).id }
# Generate some spammy content
post :subscribe, { :id => entry.id, :display_name => entry.user.display_name }, { :user => users(:normal_user).id }
# Generate some spammy content
def test_list_all
diary_entry = create(:diary_entry)
geo_entry = create(:diary_entry, :latitude => 51.50763, :longitude => -0.10781)
def test_list_all
diary_entry = create(:diary_entry)
geo_entry = create(:diary_entry, :latitude => 51.50763, :longitude => -0.10781)
- public_entry = create(:diary_entry, :user_id => users(:public_user).id)
+ public_entry = create(:diary_entry, :user => users(:public_user))
# Try a list of all diary entries
get :list
# Try a list of all diary entries
get :list
- diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
- geo_entry = create(:diary_entry, :user_id => users(:normal_user).id, :latitude => 51.50763, :longitude => -0.10781)
- _other_entry = create(:diary_entry, :user_id => users(:public_user).id)
+ diary_entry = create(:diary_entry, :user => users(:normal_user))
+ geo_entry = create(:diary_entry, :user => users(:normal_user), :latitude => 51.50763, :longitude => -0.10781)
+ _other_entry = create(:diary_entry, :user => users(:public_user))
# Try a list of diary entries for a valid user
get :list, :display_name => users(:normal_user).display_name
# Try a list of diary entries for a valid user
get :list, :display_name => users(:normal_user).display_name
end
def test_list_friends
end
def test_list_friends
- friend = create(:friend, :user_id => users(:normal_user).id)
- diary_entry = create(:diary_entry, :user_id => friend.friend_user_id)
- _other_entry = create(:diary_entry, :user_id => users(:second_public_user).id)
+ friend = create(:friend, :befriender => users(:normal_user))
+ diary_entry = create(:diary_entry, :user => friend.befriendee)
+ _other_entry = create(:diary_entry, :user => users(:second_public_user))
# Try a list of diary entries for your friends when not logged in
get :list, :friends => true
# Try a list of diary entries for your friends when not logged in
get :list, :friends => true
- diary_entry = create(:diary_entry, :user_id => users(:public_user).id)
+ diary_entry = create(:diary_entry, :user => users(:public_user))
# Try a list of diary entries for nearby users when not logged in
get :list, :nearby => true
# Try a list of diary entries for nearby users when not logged in
get :list, :nearby => true
- create(:diary_entry, :user_id => users(:normal_user).id)
- create(:diary_entry, :user_id => users(:normal_user).id)
- create(:diary_entry, :user_id => users(:public_user).id)
+ create(:diary_entry, :user => users(:normal_user))
+ create(:diary_entry, :user => users(:normal_user))
+ create(:diary_entry, :user => users(:public_user))
get :rss, :display_name => users(:normal_user).display_name, :format => :rss
assert_response :success, "Should be able to get a specific users diary RSS"
get :rss, :display_name => users(:normal_user).display_name, :format => :rss
assert_response :success, "Should be able to get a specific users diary RSS"
def test_view
# Try a normal entry that should work
def test_view
# Try a normal entry that should work
- diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
+ diary_entry = create(:diary_entry, :user => users(:normal_user))
get :view, :display_name => users(:normal_user).display_name, :id => diary_entry.id
assert_response :success
assert_template :view
# Try a deleted entry
get :view, :display_name => users(:normal_user).display_name, :id => diary_entry.id
assert_response :success
assert_template :view
# Try a deleted entry
- diary_entry_deleted = create(:diary_entry, :user_id => users(:normal_user).id, :visible => false)
+ diary_entry_deleted = create(:diary_entry, :user => users(:normal_user), :visible => false)
get :view, :display_name => users(:normal_user).display_name, :id => diary_entry_deleted.id
assert_response :not_found
# Try an entry by a suspended user
get :view, :display_name => users(:normal_user).display_name, :id => diary_entry_deleted.id
assert_response :not_found
# Try an entry by a suspended user
- diary_entry_suspended = create(:diary_entry, :user_id => users(:suspended_user).id)
+ diary_entry_suspended = create(:diary_entry, :user => users(:suspended_user))
get :view, :display_name => users(:suspended_user).display_name, :id => diary_entry_suspended.id
assert_response :not_found
# Try an entry by a deleted user
get :view, :display_name => users(:suspended_user).display_name, :id => diary_entry_suspended.id
assert_response :not_found
# Try an entry by a deleted user
- diary_entry_deleted = create(:diary_entry, :user_id => users(:deleted_user).id)
+ diary_entry_deleted = create(:diary_entry, :user => users(:deleted_user))
get :view, :display_name => users(:deleted_user).display_name, :id => diary_entry_deleted.id
assert_response :not_found
end
get :view, :display_name => users(:deleted_user).display_name, :id => diary_entry_deleted.id
assert_response :not_found
end
# Get a diary entry that has hidden comments
diary_entry = create(:diary_entry)
visible_comment = create(:diary_comment, :diary_entry => diary_entry)
# Get a diary entry that has hidden comments
diary_entry = create(:diary_entry)
visible_comment = create(:diary_comment, :diary_entry => diary_entry)
- suspended_user_comment = create(:diary_comment, :diary_entry => diary_entry, :user_id => users(:suspended_user).id)
- deleted_user_comment = create(:diary_comment, :diary_entry => diary_entry, :user_id => users(:deleted_user).id)
+ suspended_user_comment = create(:diary_comment, :diary_entry => diary_entry, :user => users(:suspended_user))
+ deleted_user_comment = create(:diary_comment, :diary_entry => diary_entry, :user => users(:deleted_user))
hidden_comment = create(:diary_comment, :diary_entry => diary_entry, :visible => false)
get :view, :display_name => users(:normal_user).display_name, :id => diary_entry.id
hidden_comment = create(:diary_comment, :diary_entry => diary_entry, :visible => false)
get :view, :display_name => users(:normal_user).display_name, :id => diary_entry.id
- diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
+ diary_entry = create(:diary_entry, :user => users(:normal_user))
diary_comment = create(:diary_comment, :diary_entry => diary_entry)
# Try without logging in
post :hidecomment, :display_name => users(:normal_user).display_name, :id => diary_entry.id, :comment => diary_comment.id
diary_comment = create(:diary_comment, :diary_entry => diary_entry)
# Try without logging in
post :hidecomment, :display_name => users(:normal_user).display_name, :id => diary_entry.id, :comment => diary_comment.id
end
# Test a user with a comment
end
# Test a user with a comment
- create(:diary_comment, :user_id => users(:public_user).id)
+ create(:diary_comment, :user => users(:public_user))
get :comments, :display_name => users(:public_user).display_name
assert_response :success
get :comments, :display_name => users(:public_user).display_name
assert_response :success
end
def test_subscribe_success
end
def test_subscribe_success
- diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
+ diary_entry = create(:diary_entry, :user => users(:normal_user))
assert_difference "diary_entry.subscribers.count", 1 do
post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id }
assert_difference "diary_entry.subscribers.count", 1 do
post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id }
end
def test_subscribe_fail
end
def test_subscribe_fail
- diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
+ diary_entry = create(:diary_entry, :user => users(:normal_user))
# not signed in
assert_no_difference "diary_entry.subscribers.count" do
# not signed in
assert_no_difference "diary_entry.subscribers.count" do
end
def test_unsubscribe_success
end
def test_unsubscribe_success
- diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
+ diary_entry = create(:diary_entry, :user => users(:normal_user))
post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id }
assert_difference "diary_entry.subscribers.count", -1 do
post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id }
assert_difference "diary_entry.subscribers.count", -1 do
end
def test_unsubscribe_fail
end
def test_unsubscribe_fail
- diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
+ diary_entry = create(:diary_entry, :user => users(:normal_user))
# not signed in
assert_no_difference "diary_entry.subscribers.count" do
# not signed in
assert_no_difference "diary_entry.subscribers.count" do
# Ensure that emails are sent to users
note_with_comments_by_users = create(:note) do |note|
# Ensure that emails are sent to users
note_with_comments_by_users = create(:note) do |note|
- create(:note_comment, :note => note, :author_id => users(:normal_user).id)
- create(:note_comment, :note => note, :author_id => users(:second_public_user).id)
+ create(:note_comment, :note => note, :author => users(:normal_user))
+ create(:note_comment, :note => note, :author => users(:second_public_user))
end
assert_difference "NoteComment.count", 1 do
assert_difference "ActionMailer::Base.deliveries.size", 2 do
end
assert_difference "NoteComment.count", 1 do
assert_difference "ActionMailer::Base.deliveries.size", 2 do
def test_mine_success
create(:note) do |note|
def test_mine_success
create(:note) do |note|
- create(:note_comment, :note => note, :author_id => users(:normal_user).id)
+ create(:note_comment, :note => note, :author => users(:normal_user))
end
create(:note) do |note|
end
create(:note) do |note|
- create(:note_comment, :note => note, :author_id => users(:second_public_user).id)
+ create(:note_comment, :note => note, :author => users(:second_public_user))
end
create(:note, :status => "hidden") do |note|
end
create(:note, :status => "hidden") do |note|
- create(:note_comment, :note => note, :author_id => users(:second_public_user).id)
+ create(:note_comment, :note => note, :author => users(:second_public_user))
end
# Note that the table rows include a header row
end
# Note that the table rows include a header row
# Get users to work with
user = users(:normal_user)
friend = users(:public_user)
# Get users to work with
user = users(:normal_user)
friend = users(:public_user)
- create(:friend, :user_id => user.id, :friend_user_id => friend.id)
+ create(:friend, :befriender => user, :befriendee => friend)
# Check that the users are friends
assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
# Check that the users are friends
assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
comment = create(:note_comment)
assert_nil comment.note.author
comment = create(:note_comment)
assert_nil comment.note.author
- comment = create(:note_comment, :author_id => users(:normal_user).id)
+ comment = create(:note_comment, :author => users(:normal_user))
assert_equal users(:normal_user), comment.note.author
end
assert_equal users(:normal_user), comment.note.author
end
- create(:friend, :user_id => users(:normal_user).id, :friend_user_id => users(:public_user).id)
+ create(:friend, :befriender => users(:normal_user), :befriendee => users(:public_user))
assert users(:normal_user).is_friends_with?(users(:public_user))
assert !users(:normal_user).is_friends_with?(users(:inactive_user))
assert !users(:public_user).is_friends_with?(users(:normal_user))
assert users(:normal_user).is_friends_with?(users(:public_user))
assert !users(:normal_user).is_friends_with?(users(:inactive_user))
assert !users(:public_user).is_friends_with?(users(:normal_user))
# it should be a one way friend associatation
norm = users(:normal_user)
sec = users(:public_user)
# it should be a one way friend associatation
norm = users(:normal_user)
sec = users(:public_user)
- create(:friend, :user_id => norm.id, :friend_user_id => sec.id)
+ create(:friend, :befriender => norm, :befriendee => sec)
assert_equal 1, Friend.count
assert_equal [sec], norm.friend_users
assert_equal 1, norm.friend_users.size
assert_equal 1, Friend.count
assert_equal [sec], norm.friend_users
assert_equal 1, norm.friend_users.size