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

Fix rspec specs

Browse source
This commit is contained in:
Raphael Sofaer 2011-08-05 22:27:56 -07:00
parent 700927e40f
commit dde4b30180
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/invitations_controller.rb
View file

@ -82,7 +82,7 @@ class InvitationsController < Devise::InvitationsController
def email def email
@invs = [] @invs = []
@resource = User.find_by_invitation_token(params[:invitation_token]) @resource = User.find_by_invitation_token(params[:invitation_token])
render 'devise/mailer/invitation_instructions', :layout => false render 'devise/mailer/invitation_instructions', :layout => false
end end
protected protected

2
app/views/devise/mailer/invitation_instructions.html.haml
View file

@ -1,3 +1,4 @@
- @invs = @resource.invitations_to_me
-if @invs.count > 0 -if @invs.count > 0
!!! !!!
%html %html
@ -8,7 +9,6 @@
%header %header
= image_tag AppConfig[:pod_url] + 'images/logo_caps.png' = image_tag AppConfig[:pod_url] + 'images/logo_caps.png'
#container #container
- @invs = @resource.invitations_to_me
%p %p
= t('devise.mailer.welcome', :email => @resource.email) = t('devise.mailer.welcome', :email => @resource.email)
= render :partial => 'inviters' = render :partial => 'inviters'

2
spec/models/invitation_spec.rb
View file

@ -264,7 +264,7 @@ describe Invitation do
context 'with no inviter' do context 'with no inviter' do
it 'sends an email that includes the right things' do it 'sends an email that includes the right things' do
Invitation.create_invitee(:service => 'email', :identifier => @email) Invitation.create_invitee(:service => 'email', :identifier => @email)
Devise.mailer.deliveries.first.to_s.should include("Welcome #{@email}") Devise.mailer.deliveries.first.to_s.should include("Email not displaying correctly?")
end end
it 'creates a user' do it 'creates a user' do
expect { expect {