diff --git a/app/models/scrap.rb b/app/models/scrap.rb index 5fd1b4b..ea57fb5 100644 --- a/app/models/scrap.rb +++ b/app/models/scrap.rb @@ -1,4 +1,7 @@ class Scrap < ActiveRecord::Base + + attr_accessible :content, :sender_id, :receiver_id, :scrap_id + SEARCHABLE_FIELDS = { :content => 1, } diff --git a/test/unit/scrap_notifier_test.rb b/test/unit/scrap_notifier_test.rb index 1b1cae5..39f1dc3 100644 --- a/test/unit/scrap_notifier_test.rb +++ b/test/unit/scrap_notifier_test.rb @@ -14,44 +14,44 @@ class ScrapNotifierTest < ActiveSupport::TestCase should 'deliver mail after leave scrap' do assert_difference ActionMailer::Base.deliveries, :size do - Scrap.create!(:sender => @sender, :receiver => @receiver, :content => 'Hi man!') + Scrap.create!(:sender_id => @sender.id, :receiver_id => @receiver.id, :content => 'Hi man!') end end should 'deliver mail even if it is a reply' do - s = Scrap.create!(:sender => @sender, :receiver => @receiver, :content => 'Hi man!') + s = Scrap.create!(:sender_id => @sender.id, :receiver_id => @receiver.id, :content => 'Hi man!') assert_difference ActionMailer::Base.deliveries, :size do - s.replies << Scrap.new(:sender => @sender, :receiver => @receiver, :content => 'Hi again man!') + s.replies << Scrap.new(:sender_id => @sender.id, :receiver_id => @receiver.id, :content => 'Hi again man!') end end should 'deliver mail to receiver of the scrap' do - Scrap.create!(:sender => @sender, :receiver => @receiver, :content => 'Hi man!') + Scrap.create!(:sender_id => @sender.id, :receiver_id => @receiver.id, :content => 'Hi man!') sent = ActionMailer::Base.deliveries.first assert_equal [@receiver.email], sent.to end should 'display sender name in delivered mail' do - Scrap.create!(:sender => @sender, :receiver => @receiver, :content => 'Hi man!') + Scrap.create!(:sender_id => @sender.id, :receiver_id => @receiver.id, :content => 'Hi man!') sent = ActionMailer::Base.deliveries.first assert_match /user_scrap_sender_test/, sent.body end should 'display scrap content in delivered mail' do - Scrap.create!(:sender => @sender, :receiver => @receiver, :content => 'Hi man!') + Scrap.create!(:sender_id => @sender.id, :receiver_id => @receiver.id, :content => 'Hi man!') sent = ActionMailer::Base.deliveries.first assert_match /Hi man!/, sent.body end should 'display receiver wall link in delivered mail' do - Scrap.create!(:sender => @sender, :receiver => @receiver, :content => 'Hi man!') + Scrap.create!(:sender_id => @sender.id, :receiver_id => @receiver.id, :content => 'Hi man!') sent = ActionMailer::Base.deliveries.first assert_match /\/profile\/user_scrap_receiver_test#profile-wall/, sent.body end should 'not deliver mail if notify receiver and sender are the same person' do assert_no_difference ActionMailer::Base.deliveries, :size do - Scrap.create!(:sender => @sender, :receiver => @sender, :content => 'Hi myself!') + Scrap.create!(:sender_id => @sender.id, :receiver_id => @sender.id, :content => 'Hi myself!') end end @@ -60,7 +60,7 @@ class ScrapNotifierTest < ActiveSupport::TestCase person = fast_create(Person) scrap = fast_create(Scrap, :receiver_id => community.id, :sender_id => @sender.id) assert_no_difference ActionMailer::Base.deliveries, :size do - Scrap.create!(:sender => person, :receiver => @sender, :scrap_id => scrap.id, :content => 'Hi myself!') + Scrap.create!(:sender_id => person, :receiver_id => @sender.id, :scrap_id => scrap.id, :content => 'Hi myself!') end end -- libgit2 0.21.2