@@ -26,3 +26,6 @@ %span= status_diff(version) %div{:style => "clear:both"} %p= updated_stamp(version.instance) + - form_tag(edit_admin_layout_path(:id => version.versionable_id), :method => :get) do + = hidden_field_tag(:version, version.number) + = submit_tag("Revert to Version #{version.number}", :name => nil) \ No newline at end of file app/views/admin/layouts/_diff.html.haml @@ -32,4 +32,18 @@ Feature: revert 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 + Then I should see "Snippet saved below" + + Scenario: load previous layout version for editing + Given I have a layout 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 layout content should be loaded + And I should see "Loaded version 1. Click save to revert to this content." + + Scenario: revert layout to previous version + Given I have a layout with more than one version + When I edit a previous layout version + And I press "Save" + Then I should see "Layout saved below" \ No newline at end of file features/revert.feature @@ -43,6 +43,14 @@ Given /^I have a snippet with more than one version$/ do @snippet.save # version 2 end +Given /^I have a layout with more than one version$/ do + @layout = layouts(:main) + @layout.save # version 1 + @layout.status = Status[:published] + @layout.name = @layout.name += " Version 2" + @layout.save # version 2 +end + When /^I edit the page$/ do visit admin_pages_path click_link @page.title @@ -66,6 +74,10 @@ When /^I edit a previous snippet version$/ do visit edit_admin_snippet_path(:id => @snippet.id, :version => 1) end +When /^I edit a previous layout version$/ do + visit edit_admin_layout_path(:id => @layout.id, :version => 1) +end + Then /^I should be taken to the edit page$/ do request.params["version"].should == "1" request.params["action"].should == "edit" @@ -77,6 +89,8 @@ Then /^the older (.+) content should be loaded$/ do |model| field_labeled("Page Title").value.should_not == @page.current.title when "snippet" field_labeled("Name").value.should_not == @snippet.current.name + when "layout" + field_labeled("Name").value.should_not == @layout.current.name end end features/step_definitions/versioning_steps.rb d64888f93f00828548e1b413224096193c824c34 Jason Garber jg@jasongarber.com http://github.com/jgarber/radiant-chronicle-extension/commit/5428a18eee6c1ed9048e297ff23eb22537bcabd1 5428a18eee6c1ed9048e297ff23eb22537bcabd1 2009-09-07T13:23:44-07:00 2009-09-07T13:23:44-07:00 Add ability to revert layouts. 7a0b9cda9c4b70e197b33298f60779f6a3ba7e20 Jason Garber jg@jasongarber.com