From: Toshi MARUYAMA Date: Sun, 5 Nov 2017 19:09:05 +0000 (+0000) Subject: remove unused WikisController#edit (#26579) X-Git-Tag: 4.0.0~493 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e438523e785b8f1c772b4a6a594fc1c3cacd5e76;p=redmine.git remove unused WikisController#edit (#26579) git-svn-id: http://svn.redmine.org/redmine/trunk@17018 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/controllers/wikis_controller.rb b/app/controllers/wikis_controller.rb index c61c2f946..2c6a9a7ac 100644 --- a/app/controllers/wikis_controller.rb +++ b/app/controllers/wikis_controller.rb @@ -19,13 +19,6 @@ class WikisController < ApplicationController menu_item :settings before_action :find_project, :authorize - # Create or update a project's wiki - def edit - @wiki = @project.wiki || Wiki.new(:project => @project) - @wiki.safe_attributes = params[:wiki] - @wiki.save if request.post? - end - # Delete a project's wiki def destroy if request.post? && params[:confirm] && @project.wiki diff --git a/config/routes.rb b/config/routes.rb index bbe824761..e5b25f904 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -30,7 +30,6 @@ Rails.application.routes.draw do match '/issues/preview/edit/:id', :to => 'previews#issue', :as => 'preview_edit_issue', :via => [:get, :post, :put, :patch] match '/issues/preview', :to => 'previews#issue', :as => 'preview_issue', :via => [:get, :post, :put, :patch] - match 'projects/:id/wiki', :to => 'wikis#edit', :via => :post match 'projects/:id/wiki/destroy', :to => 'wikis#destroy', :via => [:get, :post] match 'boards/:board_id/topics/new', :to => 'messages#new', :via => [:get, :post], :as => 'new_board_message' diff --git a/test/functional/wikis_controller_test.rb b/test/functional/wikis_controller_test.rb index 8f37cd0f0..2570f4bfd 100644 --- a/test/functional/wikis_controller_test.rb +++ b/test/functional/wikis_controller_test.rb @@ -24,47 +24,6 @@ class WikisControllerTest < Redmine::ControllerTest User.current = nil end - def test_create - @request.session[:user_id] = 1 - assert_nil Project.find(3).wiki - - assert_difference 'Wiki.count' do - post :edit, :params => {:id => 3, :wiki => { :start_page => 'Start page' }}, :xhr => true - assert_response :success - assert_equal 'text/javascript', response.content_type - end - - wiki = Project.find(3).wiki - assert_not_nil wiki - assert_equal 'Start page', wiki.start_page - end - - def test_create_with_failure - @request.session[:user_id] = 1 - - assert_no_difference 'Wiki.count' do - post :edit, :params => {:id => 3, :wiki => { :start_page => '' }}, :xhr => true - assert_response :success - assert_equal 'text/javascript', response.content_type - end - - assert_include 'errorExplanation', response.body - assert_include "Start page cannot be blank", response.body - end - - def test_update - @request.session[:user_id] = 1 - - assert_no_difference 'Wiki.count' do - post :edit, :params => {:id => 1, :wiki => { :start_page => 'Other start page' }}, :xhr => true - assert_response :success - assert_equal 'text/javascript', response.content_type - end - - wiki = Project.find(1).wiki - assert_equal 'Other start page', wiki.start_page - end - def test_get_destroy_should_ask_confirmation @request.session[:user_id] = 1 assert_no_difference 'Wiki.count' do diff --git a/test/integration/routing/wikis_test.rb b/test/integration/routing/wikis_test.rb index ef4643f91..ebd241614 100644 --- a/test/integration/routing/wikis_test.rb +++ b/test/integration/routing/wikis_test.rb @@ -19,8 +19,6 @@ require File.expand_path('../../../test_helper', __FILE__) class RoutingWikisTest < Redmine::RoutingTest def test_wikis - should_route 'POST /projects/foo/wiki' => 'wikis#edit', :id => 'foo' - should_route 'GET /projects/foo/wiki/destroy' => 'wikis#destroy', :id => 'foo' should_route 'POST /projects/foo/wiki/destroy' => 'wikis#destroy', :id => 'foo' end