jro_apps/redmine Commit - r9868:dee586e9eb96

Removes RJS from WikisController....

Jean-Philippe Lang -

r9868:dee586e9eb96

parent child

Context file:

r9868:dee586e9eb96

Collapse all files

app/views/wikis/edit.js.erb created 644 +1 0

	@@ -0,0 +1,1
				1	Element.update('tab-content-wiki', '<%= escape_javascript(render :partial => 'projects/settings/wiki') %>');

app/controllers/wikis_controller.rb 0 -1

             # 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.
             class WikisController < ApplicationController
               menu_item :settings
               before_filter :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?
-                render(:update) {|page| page.replace_html "tab-content-wiki", :partial => 'projects/settings/wiki'}
               end
               # Delete a project's wiki
               def destroy
                 if request.post? && params[:confirm] && @project.wiki
                   @project.wiki.destroy
                   redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'wiki'
                 end
               end
             end

test/functional/wikis_controller_test.rb +36 -2

             # 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__)
             require 'wikis_controller'
             # Re-raise errors caught by the controller.
             class WikisController; def rescue_action(e) raise e end; end
             class WikisControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :wikis
               def setup
                 @controller = WikisController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
               def test_create
                 @request.session[:user_id] = 1
                 assert_nil Project.find(3).wiki
-                post :edit, :id => 3, :wiki => { :start_page => 'Start page' }
-                assert_response :success
+                assert_difference 'Wiki.count' do
+                  xhr :post, :edit, :id => 3, :wiki => { :start_page => 'Start page' }
+                  assert_response :success
+                  assert_template 'edit'
+                  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
+                  xhr :post, :edit, :id => 3, :wiki => { :start_page => '' }
+                  assert_response :success
+                  assert_template 'edit'
+                  assert_equal 'text/javascript', response.content_type
+                end
+                assert_include 'errorExplanation', response.body
+                assert_include 'Start page can\\\'t be blank', response.body
+              end
+              def test_update
+                @request.session[:user_id] = 1
+                assert_no_difference 'Wiki.count' do
+                  xhr :post, :edit, :id => 1, :wiki => { :start_page => 'Other start page' }
+                  assert_response :success
+                  assert_template 'edit'
+                  assert_equal 'text/javascript', response.content_type
+                end
+                wiki = Project.find(1).wiki
+                assert_equal 'Other start page', wiki.start_page
+              end
               def test_destroy
                 @request.session[:user_id] = 1
                 post :destroy, :id => 1, :confirm => 1
                 assert_redirected_to :controller => 'projects', :action => 'settings', :id => 'ecookbook', :tab => 'wiki'
                 assert_nil Project.find(1).wiki
               end
               def test_not_found
                 @request.session[:user_id] = 1
                 post :destroy, :id => 999, :confirm => 1
                 assert_response 404
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages