From c109046db7a9211e7c6d28cec04de5b3e9929011 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Wed, 31 Aug 2011 22:58:10 +0000 Subject: [PATCH] remove trailing white-spaces from test/functional/queries_controller_test.rb. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6925 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/functional/queries_controller_test.rb | 70 +++++++++++----------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb index ea3a7ada5..b40ea6e7c 100644 --- a/test/functional/queries_controller_test.rb +++ b/test/functional/queries_controller_test.rb @@ -1,16 +1,16 @@ -# redMine - project management software -# Copyright (C) 2006-2008 Jean-Philippe Lang +# Redmine - project management software +# Copyright (C) 2006-2011 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. @@ -23,14 +23,14 @@ class QueriesController; def rescue_action(e) raise e end; end class QueriesControllerTest < ActionController::TestCase fixtures :projects, :users, :members, :member_roles, :roles, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :queries - + def setup @controller = QueriesController.new @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new User.current = nil end - + def test_get_new_project_query @request.session[:user_id] = 2 get :new, :project_id => 1 @@ -38,62 +38,62 @@ class QueriesControllerTest < ActionController::TestCase assert_template 'new' assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'query[is_public]', - :checked => nil } + :checked => nil } assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'query_is_for_all', :checked => nil, :disabled => nil } end - + def test_get_new_global_query @request.session[:user_id] = 2 get :new assert_response :success assert_template 'new' assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox', - :name => 'query[is_public]' } + :name => 'query[is_public]' } assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'query_is_for_all', :checked => 'checked', :disabled => nil } end - + def test_new_project_public_query @request.session[:user_id] = 2 post :new, - :project_id => 'ecookbook', + :project_id => 'ecookbook', :confirm => '1', :default_columns => '1', :f => ["status_id", "assigned_to_id"], :op => {"assigned_to_id" => "=", "status_id" => "o"}, :v => { "assigned_to_id" => ["1"], "status_id" => ["1"]}, :query => {"name" => "test_new_project_public_query", "is_public" => "1"} - + q = Query.find_by_name('test_new_project_public_query') assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook', :query_id => q assert q.is_public? assert q.has_default_columns? assert q.valid? end - + def test_new_project_private_query @request.session[:user_id] = 3 post :new, - :project_id => 'ecookbook', + :project_id => 'ecookbook', :confirm => '1', :default_columns => '1', :fields => ["status_id", "assigned_to_id"], :operators => {"assigned_to_id" => "=", "status_id" => "o"}, :values => { "assigned_to_id" => ["1"], "status_id" => ["1"]}, :query => {"name" => "test_new_project_private_query", "is_public" => "1"} - + q = Query.find_by_name('test_new_project_private_query') assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook', :query_id => q assert !q.is_public? assert q.has_default_columns? assert q.valid? end - + def test_new_global_private_query_with_custom_columns @request.session[:user_id] = 3 post :new, @@ -103,7 +103,7 @@ class QueriesControllerTest < ActionController::TestCase :values => { "assigned_to_id" => ["me"], "status_id" => ["1"]}, :query => {"name" => "test_new_global_private_query", "is_public" => "1"}, :c => ["", "tracker", "subject", "priority", "category"] - + q = Query.find_by_name('test_new_global_private_query') assert_redirected_to :controller => 'issues', :action => 'index', :project_id => nil, :query_id => q assert !q.is_public? @@ -111,7 +111,7 @@ class QueriesControllerTest < ActionController::TestCase assert_equal [:tracker, :subject, :priority, :category], q.columns.collect {|c| c.name} assert q.valid? end - + def test_new_with_sort @request.session[:user_id] = 1 post :new, @@ -120,14 +120,14 @@ class QueriesControllerTest < ActionController::TestCase :operators => {"status_id" => "o"}, :values => {"status_id" => ["1"]}, :query => {:name => "test_new_with_sort", - :is_public => "1", + :is_public => "1", :sort_criteria => {"0" => ["due_date", "desc"], "1" => ["tracker", ""]}} - + query = Query.find_by_name("test_new_with_sort") assert_not_nil query assert_equal [['due_date', 'desc'], ['tracker', 'asc']], query.sort_criteria end - + def test_get_edit_global_public_query @request.session[:user_id] = 1 get :edit, :id => 4 @@ -135,7 +135,7 @@ class QueriesControllerTest < ActionController::TestCase assert_template 'edit' assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'query[is_public]', - :checked => 'checked' } + :checked => 'checked' } assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'query_is_for_all', :checked => 'checked', @@ -145,65 +145,65 @@ class QueriesControllerTest < ActionController::TestCase def test_edit_global_public_query @request.session[:user_id] = 1 post :edit, - :id => 4, + :id => 4, :confirm => '1', :default_columns => '1', :fields => ["status_id", "assigned_to_id"], :operators => {"assigned_to_id" => "=", "status_id" => "o"}, :values => { "assigned_to_id" => ["1"], "status_id" => ["1"]}, :query => {"name" => "test_edit_global_public_query", "is_public" => "1"} - + assert_redirected_to :controller => 'issues', :action => 'index', :query_id => 4 q = Query.find_by_name('test_edit_global_public_query') assert q.is_public? assert q.has_default_columns? assert q.valid? end - + def test_get_edit_global_private_query @request.session[:user_id] = 3 get :edit, :id => 3 assert_response :success assert_template 'edit' assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox', - :name => 'query[is_public]' } + :name => 'query[is_public]' } assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'query_is_for_all', :checked => 'checked', :disabled => 'disabled' } end - + def test_edit_global_private_query @request.session[:user_id] = 3 post :edit, - :id => 3, + :id => 3, :confirm => '1', :default_columns => '1', :fields => ["status_id", "assigned_to_id"], :operators => {"assigned_to_id" => "=", "status_id" => "o"}, :values => { "assigned_to_id" => ["me"], "status_id" => ["1"]}, :query => {"name" => "test_edit_global_private_query", "is_public" => "1"} - + assert_redirected_to :controller => 'issues', :action => 'index', :query_id => 3 q = Query.find_by_name('test_edit_global_private_query') assert !q.is_public? assert q.has_default_columns? assert q.valid? end - + def test_get_edit_project_private_query @request.session[:user_id] = 3 get :edit, :id => 2 assert_response :success assert_template 'edit' assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox', - :name => 'query[is_public]' } + :name => 'query[is_public]' } assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'query_is_for_all', :checked => nil, :disabled => nil } end - + def test_get_edit_project_public_query @request.session[:user_id] = 2 get :edit, :id => 1 @@ -212,13 +212,13 @@ class QueriesControllerTest < ActionController::TestCase assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'query[is_public]', :checked => 'checked' - } + } assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'query_is_for_all', :checked => nil, :disabled => 'disabled' } end - + def test_get_edit_sort_criteria @request.session[:user_id] = 1 get :edit, :id => 5 @@ -231,7 +231,7 @@ class QueriesControllerTest < ActionController::TestCase :child => { :tag => 'option', :attributes => { :value => 'desc', :selected => 'selected' } } end - + def test_destroy @request.session[:user_id] = 2 post :destroy, :id => 1 -- 2.39.5