Ability to delete a version from a wiki page history (#10852).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10705 e93f8b46-1217-0410-a6f0-8f06a7374b81

3 files changed, 100 insertions, 2 deletions

diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index abfb33f11..720a9b6f8 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -499,6 +499,7 @@ class WikiControllerTest < ActionController::TestCase
   end
 
   def test_history
+    @request.session[:user_id] = 2
     get :history, :project_id => 'ecookbook', :id => 'CookBook_documentation'
     assert_response :success
     assert_template 'history'
@@ -508,17 +509,24 @@ class WikiControllerTest < ActionController::TestCase
     assert_select "input[type=submit][name=commit]"
     assert_select 'td' do
       assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation/2', :text => '2'
-      assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation/2/annotate'
+      assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation/2/annotate', :text => 'Annotate'
+      assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation/2', :text => 'Delete'
     end
   end
 
   def test_history_with_one_version
-    get :history, :project_id => 1, :id => 'Another_page'
+    @request.session[:user_id] = 2
+    get :history, :project_id => 'ecookbook', :id => 'Another_page'
     assert_response :success
     assert_template 'history'
     assert_not_nil assigns(:versions)
     assert_equal 1, assigns(:versions).size
     assert_select "input[type=submit][name=commit]", false
+    assert_select 'td' do
+      assert_select 'a[href=?]', '/projects/ecookbook/wiki/Another_page/1', :text => '1'
+      assert_select 'a[href=?]', '/projects/ecookbook/wiki/Another_page/1/annotate', :text => 'Annotate'
+      assert_select 'a[href=?]', '/projects/ecookbook/wiki/Another_page/1', :text => 'Delete', :count => 0
+    end
   end
 
   def test_diff
@@ -681,6 +689,18 @@ class WikiControllerTest < ActionController::TestCase
     assert_equal WikiPage.find(1), WikiPage.find_by_id(5).parent
   end
 
+  def test_destroy_version
+    @request.session[:user_id] = 2
+    assert_difference 'WikiContent::Version.count', -1 do
+      assert_no_difference 'WikiContent.count' do
+        assert_no_difference 'WikiPage.count' do
+          delete :destroy_version, :project_id => 'ecookbook', :id => 'CookBook_documentation', :version => 2
+          assert_redirected_to '/projects/ecookbook/wiki/CookBook_documentation/history'
+        end
+      end
+    end
+  end
+
   def test_index
     get :index, :project_id => 'ecookbook'
     assert_response :success
diff --git a/test/integration/routing/wiki_test.rb b/test/integration/routing/wiki_test.rb
index 2afc29eea..e7f6fa0f7 100644
--- a/test/integration/routing/wiki_test.rb
+++ b/test/integration/routing/wiki_test.rb
@@ -39,6 +39,11 @@ class RoutingWikiTest < ActionController::IntegrationTest
            :id => 'CookBook_documentation' }
        )
     assert_routing(
+         { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/2" },
+         { :controller => 'wiki', :action => 'show', :project_id => '1',
+           :id => 'CookBook_documentation', :version => '2' }
+       )
+    assert_routing(
          { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/2/diff" },
          { :controller => 'wiki', :action => 'diff', :project_id => '1',
            :id => 'CookBook_documentation', :version => '2' }
@@ -117,5 +122,10 @@ class RoutingWikiTest < ActionController::IntegrationTest
         { :controller => 'wiki', :action => 'destroy', :project_id => '22',
           :id => 'ladida' }
       )
+    assert_routing(
+        { :method => 'delete', :path => "/projects/22/wiki/ladida/3" },
+        { :controller => 'wiki', :action => 'destroy_version', :project_id => '22',
+          :id => 'ladida', :version => '3' }
+      )
   end
 end
diff --git a/test/unit/wiki_content_version_test.rb b/test/unit/wiki_content_version_test.rb
new file mode 100644
index 000000000..fa7ba82c7
--- /dev/null
+++ b/test/unit/wiki_content_version_test.rb
@@ -0,0 +1,68 @@
+# Redmine - project management software
+# Copyright (C) 2006-2012  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require File.expand_path('../../test_helper', __FILE__)
+
+class WikiContentTest < ActiveSupport::TestCase
+  fixtures :projects, :users, :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions
+
+  def setup
+  end
+
+  def test_destroy
+    v = WikiContent::Version.find(2)
+
+    assert_difference 'WikiContent::Version.count', -1 do
+      v.destroy
+    end
+  end
+
+  def test_destroy_last_version_should_revert_content
+    v = WikiContent::Version.find(3)
+
+    assert_no_difference 'WikiPage.count' do
+      assert_no_difference 'WikiContent.count' do
+        assert_difference 'WikiContent::Version.count', -1 do
+          assert v.destroy
+        end
+      end
+    end
+    c = WikiContent.find(1)
+    v = c.versions.last
+    assert_equal 2, c.version
+    assert_equal v.version, c.version
+    assert_equal v.comments, c.comments
+    assert_equal v.text, c.text
+    assert_equal v.author, c.author
+    assert_equal v.updated_on, c.updated_on
+  end
+
+  def test_destroy_all_versions_should_delete_page
+    WikiContent::Version.find(1).destroy
+    WikiContent::Version.find(2).destroy
+    v = WikiContent::Version.find(3)
+
+    assert_difference 'WikiPage.count', -1 do
+      assert_difference 'WikiContent.count', -1 do
+        assert_difference 'WikiContent::Version.count', -1 do
+          assert v.destroy
+        end
+      end
+    end
+    assert_nil WikiPage.find_by_id(1)
+  end
+end