jro_apps/redmine Commit - r15349:8b107b605825

Don't use render :text => ""....

Jean-Philippe Lang -

r15349:8b107b605825

parent child

Context file:

r15349:8b107b605825

Collapse all files

app/controllers/application_controller.rb +1 -2

               # Renders a head API response
               def render_api_head(status)
-                # #head would return a response body with one space
+                head :status => status
-                render :text => '', :status => status, :layout => nil
               end
               # Renders API response on validation failure

app/controllers/mail_handler_controller.rb +1 -1

               def check_credential
                 User.current = nil
                 unless Setting.mail_handler_api_enabled? && params[:key].to_s == Setting.mail_handler_api_key
-                  render :text => 'Access denied. Incoming emails WS is disabled or key is invalid.', :status => 403
+                  render :plain => 'Access denied. Incoming emails WS is disabled or key is invalid.', :status => 403
                 end
               end
             end

app/controllers/sys_controller.rb +1 -1

               def check_enabled
                 User.current = nil
                 unless Setting.sys_api_enabled? && params[:key].to_s == Setting.sys_api_key
-                  render :text => 'Access denied. Repository management WS is disabled or key is invalid.', :status => 403
+                  render :plain => 'Access denied. Repository management WS is disabled or key is invalid.', :status => 403
                   return false
                 end
               end

app/controllers/watchers_controller.rb +6 -3

                   end
                 end
                 respond_to do |format|
-                  format.html { redirect_to_referer_or {render :text => 'Watcher added.', :layout => true}}
+                  format.html { redirect_to_referer_or {render :html => 'Watcher added.', :status => 200, :layout => true}}
                   format.js { @users = users_for_new_watcher }
                   format.api { render_api_ok }
                 end
                   watchable.set_watcher(user, false)
                 end
                 respond_to do |format|
-                  format.html { redirect_to :back }
+                  format.html { redirect_to_referer_or {render :html => 'Watcher removed.', :status => 200, :layout => true} }
                   format.js
                   format.api { render_api_ok }
                 end
                   watchable.set_watcher(user, watching)
                 end
                 respond_to do |format|
-                  format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
+                  format.html {
+                    text = watching ? 'Watcher added.' : 'Watcher removed.'
+                    redirect_to_referer_or {render :html => text, :status => 200, :layout => true}
+                  }
                   format.js { render :partial => 'set_watcher', :locals => {:user => user, :watched => watchables} }
                 end
               end

test/functional/mail_handler_controller_test.rb +2 0

                   post :index, :key => 'secret', :email => IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml'))
                 end
                 assert_response 403
+                assert_include 'Access denied', response.body
               end
               def test_should_not_allow_with_wrong_key
                   post :index, :key => 'wrong', :email => IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml'))
                 end
                 assert_response 403
+                assert_include 'Access denied', response.body
               end
               def test_new

test/functional/sys_controller_test.rb +2 0

                 with_settings :sys_api_enabled => '0' do
                   get :projects
                   assert_response 403
+                  assert_include 'Access denied', response.body
                 end
               end
                 with_settings :sys_api_enabled => 'my_secret_key' do
                   get :projects, :params => {:key => 'wrong_key'}
                   assert_response 403
+                  assert_include 'Access denied', response.body
                 end
               end
             end

test/functional/watchers_controller_test.rb +45 0

@@ -25,6 +25,16 class WatchersControllerTest < Redmine::ControllerTest
25	User.current = nil	25	User.current = nil
26	end	26	end
27		27
		28	def test_watch_a_single_object_as_html
		29	@request.session[:user_id] = 3
		30	assert_difference('Watcher.count') do
		31	post :watch, :params => {:object_type => 'issue', :object_id => '1'}
		32	assert_response :success
		33	assert_include 'Watcher added', response.body
		34	end
		35	assert Issue.find(1).watched_by?(User.find(3))
		36	end
		37
28	def test_watch_a_single_object	38	def test_watch_a_single_object
29	@request.session[:user_id] = 3	39	@request.session[:user_id] = 3
30	assert_difference('Watcher.count') do	40	assert_difference('Watcher.count') do
@@ -102,6 +112,16 class WatchersControllerTest < Redmine::ControllerTest
102	end	112	end
103	end	113	end
104		114
		115	def test_unwatch_as_html
		116	@request.session[:user_id] = 3
		117	assert_difference('Watcher.count', -1) do
		118	delete :unwatch, :params => {:object_type => 'issue', :object_id => '2'}
		119	assert_response :success
		120	assert_include 'Watcher removed', response.body
		121	end
		122	assert !Issue.find(1).watched_by?(User.find(3))
		123	end
		124
105	def test_unwatch	125	def test_unwatch
106	@request.session[:user_id] = 3	126	@request.session[:user_id] = 3
107	assert_difference('Watcher.count', -1) do	127	assert_difference('Watcher.count', -1) do
@@ -154,6 +174,19 class WatchersControllerTest < Redmine::ControllerTest
154	assert_match /ajax-modal/, response.body	174	assert_match /ajax-modal/, response.body
155	end	175	end
156		176
		177	def test_create_as_html
		178	@request.session[:user_id] = 2
		179	assert_difference('Watcher.count') do
		180	post :create, :params => {
		181	:object_type => 'issue', :object_id => '2',
		182	:watcher => {:user_id => '4'}
		183	}
		184	assert_response :success
		185	assert_include 'Watcher added', response.body
		186	end
		187	assert Issue.find(2).watched_by?(User.find(4))
		188	end
		189
157	def test_create	190	def test_create
158	@request.session[:user_id] = 2	191	@request.session[:user_id] = 2
159	assert_difference('Watcher.count') do	192	assert_difference('Watcher.count') do
@@ -295,6 +328,18 class WatchersControllerTest < Redmine::ControllerTest
295	assert response.body.blank?	328	assert response.body.blank?
296	end	329	end
297		330
		331	def test_destroy_as_html
		332	@request.session[:user_id] = 2
		333	assert_difference('Watcher.count', -1) do
		334	delete :destroy, :params => {
		335	:object_type => 'issue', :object_id => '2', :user_id => '3'
		336	}
		337	assert_response :success
		338	assert_include 'Watcher removed', response.body
		339	end
		340	assert !Issue.find(2).watched_by?(User.find(3))
		341	end
		342
298	def test_destroy	343	def test_destroy
299	@request.session[:user_id] = 2	344	@request.session[:user_id] = 2
300	assert_difference('Watcher.count', -1) do	345	assert_difference('Watcher.count', -1) do

test/integration/api_test/api_test.rb +9 0

@@ -44,4 +44,13 class Redmine::ApiTest::ApiTest < Redmine::ApiTest::Base
44	get '/users/1.xml', {}, credentials('admin')	44	get '/users/1.xml', {}, credentials('admin')
45	assert_include '<created_on>2006-07-19T17:12:21Z</created_on>', response.body	45	assert_include '<created_on>2006-07-19T17:12:21Z</created_on>', response.body
46	end	46	end
		47
		48	def test_head_response_should_have_empty_body
		49	assert_difference('Issue.count', -1) do
		50	delete '/issues/6.xml', {}, credentials('jsmith')
		51
		52	assert_response :ok
		53	assert_equal '', response.body
		54	end
		55	end
47	end	56	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