features/revert.feature @@ -35,3 +35,6 @@ %span= status_diff(version) %span.clear = updated_stamp(version.instance) + - form_tag(edit_admin_page_path(:id => version.versionable_id), :method => :get) do + = hidden_field_tag(:version, version.number) + = submit_tag("Revert to Version #{version.number}", :name => nil) app/views/admin/pages/_diff.html.haml @@ -28,6 +28,13 @@ Given /^I have a (.*) page with a draft$/ do |status| @page.reload end +Given /^I have a page with more than one version$/ do + Given "I have a published page with a draft" + @page.status = Status[:published] + @page.title = @page.title += " Version 2" + @page.save +end + When /^I edit the page$/ do visit admin_pages_path click_link @page.title @@ -39,11 +46,27 @@ When /^I save it as (?:a )?(draft|published)$/ do |status| click_button "Save" end +When /^I click the revert button$/ do + click_button "Revert to Version 1" +end + +When /^I edit a previous version$/ do + visit edit_admin_page_path(:id => @page.id, :version => 1) +end + +Then /^I should be taken to the edit page$/ do + request.params.should == {"format"=>"html", "action"=>"edit", "id"=>"520095529", "version"=>"1", "controller"=>"admin/pages"} + response.should have_selector('h1', :content => "Edit Page") +end + +Then /^the older content should be loaded$/ do + field_labeled("Page Title").value.should_not == @page.current.title +end + Then /^the content I am editing should be the draft$/ do field_labeled("Page Title").value.should =~ /.+ Draft/ end - Then /^the page should be saved$/ do @page.current.title.should == "Edited" end @@ -56,10 +79,10 @@ Then /^change the live version$/ do @page.reload.title.should == "Edited" end -Given /^I have a page with more than one version$/ do - Given "I have a published page with a draft" - @page.status = Status[:published] - @page.save +When /^I view a previous version$/ do + visit admin_versions_path + click_link "Version 1" + @current_version = 1 end When /^I view a version$/ do features/step_definitions/versioning_steps.rb @@ -1,7 +1,7 @@ module Chronicle::PageExtensions def self.included(base) base.class_eval do - simply_versioned :exclude => :parent_id + simply_versioned :exclude => [:parent_id, :lock_version] alias_method_chain :update, :parts_draft_versioning alias_method_chain :update_without_callbacks, :draft_versioning alias_method_chain :part, :versioned_association lib/chronicle/page_extensions.rb @@ -1,15 +1,23 @@ module Chronicle::ResourceControllerExtensions def self.included(base) base.class_eval do - alias_method_chain :load_model, :current_version + alias_method_chain :load_model, :version end end - def load_model_with_current_version - model = load_model_without_current_version + def load_model_with_version + model = load_model_without_version unless %w(remove destroy).include?(action_name) || (action_name == "update" && params["page"] && params["page"]["status_id"].to_i >= Status[:published].id) - self.model = model.respond_to?(:current) ? model.current : model + self.model = case + when params[:version] && version = model.versions.get_version(params[:version].to_i) + flash[:notice] = "Loaded version #{version.number}. Click save to revert to this content." + version.instance + when model.respond_to?(:current) + model.current + else + model + end end end end \ No newline at end of file lib/chronicle/resource_controller_extensions.rb @@ -10,15 +10,26 @@ describe Admin::PagesController do describe "editing a page" do integrate_views + before(:each) do + @page = pages(:first) + @page.save # version 1 + @page.title = "Draft of First" + @page.status = Status[:draft] + @page.save # version 2 + end + it "should load the current version for editing" do - page = pages(:first) - page.title = "Draft of First" - page.status = Status[:draft] - page.save + get :edit, :id => @page.id - get :edit, :id => page.id + assigns[:page].title.should == @page.current.title + assigns[:page].lock_version.should == @page.current.lock_version + end + + it "should load a specified version for editing" do + get :edit, :id => @page.id, :version => 1 - assigns[:page].title.should == page.current.title + assigns[:page].title.should == @page.versions.first_version.instance.title + assigns[:page].lock_version.should == @page.current.lock_version end it "should have the version diff popup" do @@ -68,9 +79,6 @@ describe Admin::PagesController do before :each do @page = pages(:first) @page.update_attributes(:title => "current", :status_id => Status[:draft].id) - # suppose the live page's lock_version gets ahead for some reason - @page.send(:update_with_lock, [@page.class.locking_column]) - @page.reload.lock_version.should > @page.current.lock_version end it "should load the live version of the page" do @@ -84,7 +92,6 @@ describe Admin::PagesController do end end - def params_for_page(page) {"slug"=>page.slug, "class_name"=>page.class_name, "title"=>page.title, "breadcrumb"=>page.breadcrumb, "lock_version"=>page.lock_version, "parts_attributes"=>[{"name"=>"body", "filter_id"=>"", "content"=>"test"}], "status_id"=>page.status_id, "layout_id"=>page.layout_id, "parent_id"=>page.parent_id} end spec/controllers/admin/pages_controller_spec.rb 340f712891bd12ae90ca5d8719c1137ab54a6b87 Jason Garber jg@jasongarber.com http://github.com/jgarber/radiant-chronicle-extension/commit/ae1c43550622c7dbd14084db0ffba05b0605d390 ae1c43550622c7dbd14084db0ffba05b0605d390 2009-09-07T12:46:13-07:00 2009-09-07T12:46:13-07:00 Add rollback for pages. faa5225331b33985c5074365c36ce50513293a0e Jason Garber jg@jasongarber.com