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

Fix merge error from message - text refactor

Browse source
This commit is contained in:
Raphael Sofaer 2011-03-14 11:48:26 -07:00
parent 3c1b5a10df
commit 2cd6e89e5c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
spec/controllers/photos_controller_spec.rb
View file

@ -138,7 +138,7 @@ describe PhotosController do
describe "#update" do describe "#update" do
it "updates the caption of a photo" do it "updates the caption of a photo" do
put :update, :id => @alices_photo.id, :photo => { :text => "now with lasers!" } put :update, :id => @alices_photo.id, :photo => { :text => "now with lasers!" }
@alices_photo.reload.caption.should == "now with lasers!" @alices_photo.reload.text.should == "now with lasers!"
end end
it "doesn't overwrite random attributes" do it "doesn't overwrite random attributes" do