@@ -31,7 +31,7 @@ describe Admin::VersionsController do describe "GET 'diff'" do it " should be successful" do - get 'diff', :id => pages(:published).versions.first.id + get 'diff', :id => pages(:published).versions.first.id, :format => :js response.should be_success response.layout.should be_nil end spec/controllers/admin/versions_controller_spec.rb @@ -78,11 +78,12 @@ describe "/admin/pages/_diff.html.haml" do it "should show the parts' diffs" do page = pages(:published) - page.parts = [{"name"=>"body", "filter_id"=>"", "content"=>"Changed body"}] + expected_content = "Changed body" + page.parts_attributes = [page.parts.first.attributes.merge("content" => expected_content)] page.save @version = page.versions.current render 'admin/pages/_diff.html.haml', :locals => {:version => @version} - response.should have_selector("div.page", :content => "Changed body") + response.should have_selector("div.page", :content => expected_content) end it "should have a changed layout" do spec/views/admin/pages/_diff.html.haml_spec.rb cb7f8a8422fe10c4bf50d56bce65e1e0d08ec5ac Jason Garber jg@jasongarber.com http://github.com/jgarber/radiant-chronicle-extension/commit/ba69bcf59faf4edd4a030ce6f1be939229cd0f60 ba69bcf59faf4edd4a030ce6f1be939229cd0f60 2009-06-29T08:09:38-07:00 2009-06-29T08:09:38-07:00 Fix diff action. 4c441b23347d898e93d7542d982edc9bc67a6aed Jason Garber jg@jasongarber.com