@@ -24,3 +24,6 @@ %span= status_diff(version) %div{:style => "clear:both"} %p= updated_stamp(version.instance) + - form_tag(edit_admin_snippet_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/snippets/_diff.html.haml @@ -11,11 +11,25 @@ Feature: revert When I view a previous version And I click the revert button Then I should be taken to the edit page - And the older content should be loaded + And the older page content should be loaded And I should see "Loaded version 1. Click save to revert to this content." Scenario: revert page to previous version Given I have a page with more than one version - When I edit a previous version + When I edit a previous page version And I press "Save" - Then I should see "Your page has been saved" \ No newline at end of file + Then I should see "Your page has been saved" + + Scenario: load previous snippet version for editing + Given I have a snippet with more than one version + When I view a previous version + And I click the revert button + Then I should be taken to the edit page + And the older snippet content should be loaded + And I should see "Loaded version 1. Click save to revert to this content." + + Scenario: revert snippet to previous version + Given I have a snippet with more than one version + When I edit a previous snippet version + And I press "Save" + Then I should see "Snippet saved below" \ No newline at end of file features/revert.feature @@ -35,6 +35,14 @@ Given /^I have a page with more than one version$/ do @page.save end +Given /^I have a snippet with more than one version$/ do + @snippet = snippets(:first) + @snippet.save # version 1 + @snippet.status = Status[:published] + @snippet.name = @snippet.name += "_version_2" + @snippet.save # version 2 +end + When /^I edit the page$/ do visit admin_pages_path click_link @page.title @@ -50,17 +58,26 @@ When /^I click the revert button$/ do click_button "Revert to Version 1" end -When /^I edit a previous version$/ do +When /^I edit a previous page version$/ do visit edit_admin_page_path(:id => @page.id, :version => 1) end +When /^I edit a previous snippet version$/ do + visit edit_admin_snippet_path(:id => @snippet.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") + request.params["version"].should == "1" + request.params["action"].should == "edit" end -Then /^the older content should be loaded$/ do - field_labeled("Page Title").value.should_not == @page.current.title +Then /^the older (.+) content should be loaded$/ do |model| + case model + when "page" + field_labeled("Page Title").value.should_not == @page.current.title + when "snippet" + field_labeled("Name").value.should_not == @snippet.current.name + end end Then /^the content I am editing should be the draft$/ do features/step_definitions/versioning_steps.rb @@ -20,5 +20,5 @@ Cucumber::Rails::World.class_eval do datasets_directory "#{RADIANT_ROOT}/spec/datasets" self.datasets_database_dump_path = "#{Rails.root}/tmp/dataset" - dataset :pages_with_layouts, :users + dataset :pages_with_layouts, :users, :snippets end features/support/env.rb @@ -1,7 +1,7 @@ module Chronicle::SimpleModelExtensions def self.included(base) base.class_eval do - simply_versioned + simply_versioned :exclude => [:lock_version] alias_method_chain :update_without_callbacks, :draft_versioning alias_method_chain :simply_versioned_create_version, :extra_version_attributes include ActiveRecord::Diff lib/chronicle/simple_model_extensions.rb ae1c43550622c7dbd14084db0ffba05b0605d390 Jason Garber jg@jasongarber.com http://github.com/jgarber/radiant-chronicle-extension/commit/d64888f93f00828548e1b413224096193c824c34 d64888f93f00828548e1b413224096193c824c34 2009-09-07T13:16:42-07:00 2009-09-07T13:16:42-07:00 Add ability to revert snippets. 51e5d77c828c0b1b8929a73885cd99ba89324dbf Jason Garber jg@jasongarber.com