##// END OF EJS Templates
jro_apps » redmine
RSS
Removes RJS from WikisController....
Jean-Philippe Lang -
r9868:dee586e9eb96
parent child
Show More
Side by Side Unified
Context file:
r9868:dee586e9eb96 Loading diff...:
Show file before | Show file after | Hide comments
@@ -0,0 +1,1
1 Element.update('tab-content-wiki', '<%= escape_javascript(render :partial => 'projects/settings/wiki') %>');
Show file before | Show file after | Hide comments
@@ -24,7 +24,6 class WikisController < ApplicationController
24 @wiki = @project.wiki || Wiki.new(:project => @project)
24 @wiki = @project.wiki || Wiki.new(:project => @project)
25 @wiki.safe_attributes = params[:wiki]
25 @wiki.safe_attributes = params[:wiki]
26 @wiki.save if request.post?
26 @wiki.save if request.post?
27 render(:update) {|page| page.replace_html "tab-content-wiki", :partial => 'projects/settings/wiki'}
28 end
27 end
29
28
30 # Delete a project's wiki
29 # Delete a project's wiki
Show file before | Show file after | Hide comments
@@ -34,13 +34,47 class WikisControllerTest < ActionController::TestCase
34 def test_create
34 def test_create
35 @request.session[:user_id] = 1
35 @request.session[:user_id] = 1
36 assert_nil Project.find(3).wiki
36 assert_nil Project.find(3).wiki
37 post :edit, :id => 3, :wiki => { :start_page => 'Start page' }
37
38 assert_response :success
38 assert_difference 'Wiki.count' do
39 xhr :post, :edit, :id => 3, :wiki => { :start_page => 'Start page' }
40 assert_response :success
41 assert_template 'edit'
42 assert_equal 'text/javascript', response.content_type
43 end
44
39 wiki = Project.find(3).wiki
45 wiki = Project.find(3).wiki
40 assert_not_nil wiki
46 assert_not_nil wiki
41 assert_equal 'Start page', wiki.start_page
47 assert_equal 'Start page', wiki.start_page
42 end
48 end
43
49
50 def test_create_with_failure
51 @request.session[:user_id] = 1
52
53 assert_no_difference 'Wiki.count' do
54 xhr :post, :edit, :id => 3, :wiki => { :start_page => '' }
55 assert_response :success
56 assert_template 'edit'
57 assert_equal 'text/javascript', response.content_type
58 end
59
60 assert_include 'errorExplanation', response.body
61 assert_include 'Start page can\\\'t be blank', response.body
62 end
63
64 def test_update
65 @request.session[:user_id] = 1
66
67 assert_no_difference 'Wiki.count' do
68 xhr :post, :edit, :id => 1, :wiki => { :start_page => 'Other start page' }
69 assert_response :success
70 assert_template 'edit'
71 assert_equal 'text/javascript', response.content_type
72 end
73
74 wiki = Project.find(1).wiki
75 assert_equal 'Other start page', wiki.start_page
76 end
77
44 def test_destroy
78 def test_destroy
45 @request.session[:user_id] = 1
79 @request.session[:user_id] = 1
46 post :destroy, :id => 1, :confirm => 1
80 post :destroy, :id => 1, :confirm => 1
General Comments 0
You need to be logged in to leave comments. Login now