From 2cd6e89e5cd19e3cab97f9c88fd56f1e64a914d0 Mon Sep 17 00:00:00 2001 From: Raphael Sofaer Date: Mon, 14 Mar 2011 11:48:26 -0700 Subject: [PATCH] Fix merge error from message - text refactor --- spec/controllers/photos_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb index 0908a7cce..bc795ad77 100644 --- a/spec/controllers/photos_controller_spec.rb +++ b/spec/controllers/photos_controller_spec.rb @@ -138,7 +138,7 @@ describe PhotosController do describe "#update" do it "updates the caption of a photo" do 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 it "doesn't overwrite random attributes" do