Download as
Browse Code »

Commit 607be30deb66c6614a8cf3f6a832669d51e30b65

Authored by Leandro Santos
1 parent 0f2f0af9
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Rails3: Fix Scrap unit tests partially

Showing 2 changed files with 12 additions and 9 deletions   Show diff stats
app/models/scrap.rb
  Diff comments   View file @607be30
1 class Scrap < ActiveRecord::Base 1 class Scrap < ActiveRecord::Base
  2 +
  3 + attr_accessible :content, :sender_id, :receiver_id, :scrap_id
  4 +
2 SEARCHABLE_FIELDS = { 5 SEARCHABLE_FIELDS = {
3 :content => 1, 6 :content => 1,
4 } 7 }
test/unit/scrap_notifier_test.rb
  Diff comments   View file @607be30
@@ -14,44 +14,44 @@ class ScrapNotifierTest &lt; ActiveSupport::TestCase @@ -14,44 +14,44 @@ class ScrapNotifierTest &lt; ActiveSupport::TestCase
14 14
15 should 'deliver mail after leave scrap' do 15 should 'deliver mail after leave scrap' do
16 assert_difference ActionMailer::Base.deliveries, :size do 16 assert_difference ActionMailer::Base.deliveries, :size do
17 - Scrap.create!(:sender => @sender, :receiver => @receiver, :content => 'Hi man!') 17 + Scrap.create!(:sender_id => @sender.id, :receiver_id => @receiver.id, :content => 'Hi man!')
18 end 18 end
19 end 19 end
20 20
21 should 'deliver mail even if it is a reply' do 21 should 'deliver mail even if it is a reply' do
22 - s = Scrap.create!(:sender => @sender, :receiver => @receiver, :content => 'Hi man!') 22 + s = Scrap.create!(:sender_id => @sender.id, :receiver_id => @receiver.id, :content => 'Hi man!')
23 assert_difference ActionMailer::Base.deliveries, :size do 23 assert_difference ActionMailer::Base.deliveries, :size do
24 - s.replies << Scrap.new(:sender => @sender, :receiver => @receiver, :content => 'Hi again man!') 24 + s.replies << Scrap.new(:sender_id => @sender.id, :receiver_id => @receiver.id, :content => 'Hi again man!')
25 end 25 end
26 end 26 end
27 27
28 should 'deliver mail to receiver of the scrap' do 28 should 'deliver mail to receiver of the scrap' do
29 - Scrap.create!(:sender => @sender, :receiver => @receiver, :content => 'Hi man!') 29 + Scrap.create!(:sender_id => @sender.id, :receiver_id => @receiver.id, :content => 'Hi man!')
30 sent = ActionMailer::Base.deliveries.first 30 sent = ActionMailer::Base.deliveries.first
31 assert_equal [@receiver.email], sent.to 31 assert_equal [@receiver.email], sent.to
32 end 32 end
33 33
34 should 'display sender name in delivered mail' do 34 should 'display sender name in delivered mail' do
35 - Scrap.create!(:sender => @sender, :receiver => @receiver, :content => 'Hi man!') 35 + Scrap.create!(:sender_id => @sender.id, :receiver_id => @receiver.id, :content => 'Hi man!')
36 sent = ActionMailer::Base.deliveries.first 36 sent = ActionMailer::Base.deliveries.first
37 assert_match /user_scrap_sender_test/, sent.body 37 assert_match /user_scrap_sender_test/, sent.body
38 end 38 end
39 39
40 should 'display scrap content in delivered mail' do 40 should 'display scrap content in delivered mail' do
41 - Scrap.create!(:sender => @sender, :receiver => @receiver, :content => 'Hi man!') 41 + Scrap.create!(:sender_id => @sender.id, :receiver_id => @receiver.id, :content => 'Hi man!')
42 sent = ActionMailer::Base.deliveries.first 42 sent = ActionMailer::Base.deliveries.first
43 assert_match /Hi man!/, sent.body 43 assert_match /Hi man!/, sent.body
44 end 44 end
45 45
46 should 'display receiver wall link in delivered mail' do 46 should 'display receiver wall link in delivered mail' do
47 - Scrap.create!(:sender => @sender, :receiver => @receiver, :content => 'Hi man!') 47 + Scrap.create!(:sender_id => @sender.id, :receiver_id => @receiver.id, :content => 'Hi man!')
48 sent = ActionMailer::Base.deliveries.first 48 sent = ActionMailer::Base.deliveries.first
49 assert_match /\/profile\/user_scrap_receiver_test#profile-wall/, sent.body 49 assert_match /\/profile\/user_scrap_receiver_test#profile-wall/, sent.body
50 end 50 end
51 51
52 should 'not deliver mail if notify receiver and sender are the same person' do 52 should 'not deliver mail if notify receiver and sender are the same person' do
53 assert_no_difference ActionMailer::Base.deliveries, :size do 53 assert_no_difference ActionMailer::Base.deliveries, :size do
54 - Scrap.create!(:sender => @sender, :receiver => @sender, :content => 'Hi myself!') 54 + Scrap.create!(:sender_id => @sender.id, :receiver_id => @sender.id, :content => 'Hi myself!')
55 end 55 end
56 end 56 end
57 57
@@ -60,7 +60,7 @@ class ScrapNotifierTest &lt; ActiveSupport::TestCase @@ -60,7 +60,7 @@ class ScrapNotifierTest &lt; ActiveSupport::TestCase
60 person = fast_create(Person) 60 person = fast_create(Person)
61 scrap = fast_create(Scrap, :receiver_id => community.id, :sender_id => @sender.id) 61 scrap = fast_create(Scrap, :receiver_id => community.id, :sender_id => @sender.id)
62 assert_no_difference ActionMailer::Base.deliveries, :size do 62 assert_no_difference ActionMailer::Base.deliveries, :size do
63 - Scrap.create!(:sender => person, :receiver => @sender, :scrap_id => scrap.id, :content => 'Hi myself!') 63 + Scrap.create!(:sender_id => person, :receiver_id => @sender.id, :scrap_id => scrap.id, :content => 'Hi myself!')
64 end 64 end
65 end 65 end
66 66