Render mail css as a partial, fix spec
This commit is contained in:
parent
82f9aefaa8
commit
1e842f1a88
2 changed files with 2 additions and 41 deletions
|
|
@ -2,45 +2,7 @@
|
||||||
%html
|
%html
|
||||||
%head
|
%head
|
||||||
%meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
|
%meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
|
||||||
:css
|
= render :partial => 'notifier/notifier_css'
|
||||||
body{
|
|
||||||
width:600px;
|
|
||||||
font-family:'Arial','Helvetica',sans-serif;
|
|
||||||
font-size:14px;
|
|
||||||
color:#333;
|
|
||||||
}
|
|
||||||
#container{
|
|
||||||
margin-bottom:25px
|
|
||||||
min-height:400px;
|
|
||||||
padding-left:15px;
|
|
||||||
}
|
|
||||||
header{
|
|
||||||
background-color:#333;
|
|
||||||
padding: 15px;
|
|
||||||
margin-bottom: 25px;
|
|
||||||
}
|
|
||||||
p{
|
|
||||||
padding:5px;
|
|
||||||
}
|
|
||||||
p.small{
|
|
||||||
font-size:smaller;
|
|
||||||
color:#999;
|
|
||||||
font-style:italic;
|
|
||||||
}
|
|
||||||
a{
|
|
||||||
color:#107FC9;
|
|
||||||
font-weight:bold;
|
|
||||||
}
|
|
||||||
a:hover{
|
|
||||||
color: #22AAE0;
|
|
||||||
}
|
|
||||||
a:active{
|
|
||||||
color: #005D9C;
|
|
||||||
}
|
|
||||||
.large_text{
|
|
||||||
font-size:21px;
|
|
||||||
font-family:"Helvetica Neue",Arial,Helvetica,sans-serif;
|
|
||||||
}
|
|
||||||
%body
|
%body
|
||||||
%header
|
%header
|
||||||
= image_tag '/images/diaspora_white.png'
|
= image_tag '/images/diaspora_white.png'
|
||||||
|
|
|
||||||
|
|
@ -102,8 +102,7 @@ describe Invitation do
|
||||||
it 'sends an email that includes the right things' do
|
it 'sends an email that includes the right things' do
|
||||||
Devise.mailer.deliveries = []
|
Devise.mailer.deliveries = []
|
||||||
Invitation.create_invitee(:email => @email)
|
Invitation.create_invitee(:email => @email)
|
||||||
Devise.mailer.deliveries.first.to_s.include?("Hello #{@email}").should == true
|
Devise.mailer.deliveries.first.to_s.include?("Welcome #{@email}").should == true
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue