From: Marius Balteanu <marius.balteanu@zitec.com>
Date: Mon, 23 Oct 2023 17:31:04 +0000 (+0000)
Subject: Revert r22368.
X-Git-Tag: 5.1.0~28
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=94da4a33f5d9353d4b8228163462d5711721285f;p=redmine.git

Revert r22368.

git-svn-id: https://svn.redmine.org/redmine/trunk@22369 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/wikis_controller.rb b/app/controllers/wikis_controller.rb
index 5b753b13b..4469e3627 100644
--- a/app/controllers/wikis_controller.rb
+++ b/app/controllers/wikis_controller.rb
@@ -24,9 +24,7 @@ class WikisController < ApplicationController
   # Delete a project's wiki
   def destroy
     if request.post? && params[:confirm] && @project.wiki
-      if @project.wiki.destroy
-        Wiki.create_default(@project) unless @wiki
-      end
+      @project.wiki.destroy
       redirect_to project_path(@project)
     end
   end
diff --git a/app/models/enabled_module.rb b/app/models/enabled_module.rb
index 1b97903fb..237563228 100644
--- a/app/models/enabled_module.rb
+++ b/app/models/enabled_module.rb
@@ -34,7 +34,7 @@ class EnabledModule < ActiveRecord::Base
     when 'wiki'
       # Create a wiki with a default start page
       if project && project.wiki.nil?
-        Wiki.create_default(project)
+        Wiki.create(:project => project, :start_page => 'Wiki')
       end
     end
   end
diff --git a/app/models/wiki.rb b/app/models/wiki.rb
index 0fddeb3a9..726dcea7e 100644
--- a/app/models/wiki.rb
+++ b/app/models/wiki.rb
@@ -97,10 +97,6 @@ class Wiki < ActiveRecord::Base
     end
   end
 
-  def self.create_default(project)
-    create(:project => project, :start_page => 'Wiki')
-  end
-
   # turn a string into a valid page title
   def self.titleize(title)
     # replace spaces with _ and remove unwanted caracters
diff --git a/test/functional/wikis_controller_test.rb b/test/functional/wikis_controller_test.rb
index ecad3a4a4..9f3f9bffb 100644
--- a/test/functional/wikis_controller_test.rb
+++ b/test/functional/wikis_controller_test.rb
@@ -35,17 +35,13 @@ class WikisControllerTest < Redmine::ControllerTest
     end
   end
 
-  def test_post_destroy_should_reinitialize_empty_wiki
+  def test_post_destroy_should_delete_wiki
     set_tmp_attachments_directory
     @request.session[:user_id] = 1
-    wiki = Project.find(1).wiki
     post :destroy, :params => {:id => 1, :confirm => 1}
     assert_redirected_to :controller => 'projects',
                          :action => 'show', :id => 'ecookbook'
-
-    new_wiki = Project.find(1).wiki
-    assert_not_equal wiki, new_wiki
-    assert_equal "Wiki", new_wiki.start_page
+    assert_nil Project.find(1).wiki
   end
 
   def test_not_found
diff --git a/test/unit/wiki_test.rb b/test/unit/wiki_test.rb
index eeb6aa2bb..da791dff4 100644
--- a/test/unit/wiki_test.rb
+++ b/test/unit/wiki_test.rb
@@ -35,12 +35,6 @@ class WikiTest < ActiveSupport::TestCase
     assert wiki.save
   end
 
-  def test_create_default
-    wiki = Wiki.create_default(Project.find(1))
-    assert wiki.save
-    assert_equal "Wiki", wiki.start_page
-  end
-
   def test_update
     @wiki = Wiki.find(1)
     @wiki.start_page = "Another start page"