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

hopefully make travis happy:

Browse source
This commit is contained in:
Maxwell Salzberg 2012-02-28 17:51:54 -08:00
parent b6c4cab669
commit 0d93227f07
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/stylesheets/sass/application.sass
View file

@ -774,6 +774,8 @@ form p.checkbox_select
input[type='file'] input[type='file']
:top initial !important :top initial !important
:right initial !important :right initial !important
:height 100%
:width 100%
img img
@include opacity(0.4) @include opacity(0.4)

4
spec/controllers/conversations_controller_spec.rb
View file

@ -47,13 +47,13 @@ describe ConversationsController do
it 'succeeds' do it 'succeeds' do
get :index get :index
response.should be_success response.should be_success
assigns[:conversations].should == @conversations assigns[:conversations].should =~ @conversations
end end
it 'succeeds with json' do it 'succeeds with json' do
get :index, :format => :json get :index, :format => :json
response.should be_success response.should be_success
response.body.should == @conversations.to_json response.body.should =~ @conversations.to_json
end end
it 'retrieves all conversations for a user' do it 'retrieves all conversations for a user' do

2
spec/lib/template_picker_spec.rb
View file

@ -73,7 +73,7 @@ describe TemplatePicker do
TemplatePicker::TEMPLATES.each do |template| TemplatePicker::TEMPLATES.each do |template|
describe "#{template} factory" do describe "#{template} factory" do
it 'works' do it 'works' do
post = Factory(template.to_sym, :author => alice.person).reload post = Factory.build(template.to_sym, :author => alice.person)
template_name = TemplatePicker.new(post).template_name.gsub('-', '_') template_name = TemplatePicker.new(post).template_name.gsub('-', '_')
template_name.should == template template_name.should == template
end end