Download as
Browse Code »

Commit 607be30deb66c6614a8cf3f6a832669d51e30b65

Authored by Leandro Santos
1 parent 0f2f0af9
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

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 1 class Scrap < ActiveRecord::Base
  2 +
  3 + attr_accessible :content, :sender_id, :receiver_id, :scrap_id
  4 +
2 5 SEARCHABLE_FIELDS = {
3 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 14  
15 15 should 'deliver mail after leave scrap' do
16 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 18 end
19 19 end
20 20  
21 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 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 25 end
26 26 end
27 27  
28 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 30 sent = ActionMailer::Base.deliveries.first
31 31 assert_equal [@receiver.email], sent.to
32 32 end
33 33  
34 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 36 sent = ActionMailer::Base.deliveries.first
37 37 assert_match /user_scrap_sender_test/, sent.body
38 38 end
39 39  
40 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 42 sent = ActionMailer::Base.deliveries.first
43 43 assert_match /Hi man!/, sent.body
44 44 end
45 45  
46 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 48 sent = ActionMailer::Base.deliveries.first
49 49 assert_match /\/profile\/user_scrap_receiver_test#profile-wall/, sent.body
50 50 end
51 51  
52 52 should 'not deliver mail if notify receiver and sender are the same person' do
53 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 55 end
56 56 end
57 57  
... ... @@ -60,7 +60,7 @@ class ScrapNotifierTest &lt; ActiveSupport::TestCase
60 60 person = fast_create(Person)
61 61 scrap = fast_create(Scrap, :receiver_id => community.id, :sender_id => @sender.id)
62 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 64 end
65 65 end
66 66  
... ...