nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix build

Browse source
This commit is contained in:
Raphael 2011-01-28 12:17:27 -08:00
parent d04a8bff09
commit dde8fd65e5
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/mailers/notifier.rb
View file

@ -28,7 +28,7 @@ class Notifier < ActionMailer::Base
log_mail(recipient_id, sender_id, 'new_request') log_mail(recipient_id, sender_id, 'new_request')
attachments.inline['diaspora_white_on_grey.png'] = ATTACHMENT attachments.inline['logo_caps.png'] = ATTACHMENT
mail(:to => "\"#{@receiver.name}\" <#{@receiver.email}>", mail(:to => "\"#{@receiver.name}\" <#{@receiver.email}>",
:subject => I18n.t('notifier.new_request.subject', :from => @sender.name), :host => AppConfig[:pod_uri].host) :subject => I18n.t('notifier.new_request.subject', :from => @sender.name), :host => AppConfig[:pod_uri].host)
@ -40,7 +40,7 @@ class Notifier < ActionMailer::Base
log_mail(recipient_id, sender_id, 'request_accepted') log_mail(recipient_id, sender_id, 'request_accepted')
attachments.inline['diaspora_white_on_grey.png'] = ATTACHMENT attachments.inline['logo_caps.png'] = ATTACHMENT
mail(:to => "\"#{@receiver.name}\" <#{@receiver.email}>", mail(:to => "\"#{@receiver.name}\" <#{@receiver.email}>",
:subject => I18n.t('notifier.request_accepted.subject', :name => @sender.name), :host => AppConfig[:pod_uri].host) :subject => I18n.t('notifier.request_accepted.subject', :name => @sender.name), :host => AppConfig[:pod_uri].host)
@ -53,7 +53,7 @@ class Notifier < ActionMailer::Base
log_mail(recipient_id, sender_id, 'comment_on_post') log_mail(recipient_id, sender_id, 'comment_on_post')
attachments.inline['diaspora_white_on_grey.png'] = ATTACHMENT attachments.inline['logo_caps.png'] = ATTACHMENT
mail(:to => "\"#{@receiver.name}\" <#{@receiver.email}>", mail(:to => "\"#{@receiver.name}\" <#{@receiver.email}>",
:subject => I18n.t('notifier.comment_on_post.subject', :name => @sender.name), :host => AppConfig[:pod_uri].host) :subject => I18n.t('notifier.comment_on_post.subject', :name => @sender.name), :host => AppConfig[:pod_uri].host)
@ -68,7 +68,7 @@ class Notifier < ActionMailer::Base
log_mail(recipient_id, sender_id, 'comment_on_post') log_mail(recipient_id, sender_id, 'comment_on_post')
attachments.inline['diaspora_white_on_grey.png'] = ATTACHMENT attachments.inline['logo_caps.png'] = ATTACHMENT
mail(:to => "\"#{@receiver.name}\" <#{@receiver.email}>", mail(:to => "\"#{@receiver.name}\" <#{@receiver.email}>",
:subject => I18n.t('notifier.also_commented.subject', :name => @sender.name, :post_author => @post_author_name ), :host => AppConfig[:pod_uri].host) :subject => I18n.t('notifier.also_commented.subject', :name => @sender.name, :post_author => @post_author_name ), :host => AppConfig[:pod_uri].host)

4
spec/lib/diaspora/parser_spec.rb
View file

@ -42,7 +42,11 @@ describe Diaspora::Parser do
end end
it "should activate the Person if I initiated a request to that url" do it "should activate the Person if I initiated a request to that url" do
begin
@user1.send_contact_request_to(@user3.person, @aspect1) @user1.send_contact_request_to(@user3.person, @aspect1)
rescue Exception => e
raise e.original_exception
end
request = @user3.request_from(@user1.person) request = @user3.request_from(@user1.person)
fantasy_resque do fantasy_resque do
@user3.accept_and_respond(request.id, @aspect3.id) @user3.accept_and_respond(request.id, @aspect3.id)

3
spec/lib/youtube_titles_spec.rb
View file

@ -38,8 +38,5 @@ describe YoutubeTitles do
StatusMessage.find(@post.id).youtube_titles StatusMessage.find(@post.id).youtube_titles
}.should_not raise_error }.should_not raise_error
end end
it 'correctly marshals' do
StatusMessage.find(@post.id).youtube_titles.should == {@video_id => @expected_title}
end
end end
end end