Code cleanup.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10987 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/queries_controller.rb b/app/controllers/queries_controller.rb
index 448b4e56bcd66af48f4203d4afecf932e43a2b4c..4c1203f78ee3b6fc8fb55ca40e9a9110f1cbec92 100644 (file)
--- a/app/controllers/queries_controller.rb
+++ b/app/controllers/queries_controller.rb
@@ -37,7 +37,6 @@ class QueriesController < ApplicationController
     @queries = IssueQuery.visible.all(:limit => @limit, :offset => @offset, :order => "#{Query.table_name}.name")
 
     respond_to do |format|
-      format.html { render :nothing => true }
       format.api
     end
   end

diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb
index 16fe75d16581b241f7997389baaa697a2efde078..f2a948a78d995cda807d8a4315c210d909b5cbc8 100644 (file)
--- a/app/controllers/workflows_controller.rb
+++ b/app/controllers/workflows_controller.rb
@@ -106,7 +106,7 @@ class WorkflowsController < ApplicationController
     if request.post?
       if params[:source_tracker_id].blank? || params[:source_role_id].blank? || (@source_tracker.nil? && @source_role.nil?)
         flash.now[:error] = l(:error_workflow_copy_source)
-      elsif @target_trackers.nil? || @target_roles.nil?
+      elsif @target_trackers.blank? || @target_roles.blank?
         flash.now[:error] = l(:error_workflow_copy_target)
       else
         WorkflowRule.copy(@source_tracker, @source_role, @target_trackers, @target_roles)

diff --git a/test/functional/messages_controller_test.rb b/test/functional/messages_controller_test.rb
index fa3af791742f15a735740e63fead2d5e6955ec14..f80d0ca7836d9fa929fa55bf083fd22bdec2f303 100644 (file)
--- a/test/functional/messages_controller_test.rb
+++ b/test/functional/messages_controller_test.rb
@@ -81,6 +81,12 @@ class MessagesControllerTest < ActionController::TestCase
     assert_template 'new'
   end
 
+  def test_get_new_with_invalid_board
+    @request.session[:user_id] = 2
+    get :new, :board_id => 99
+    assert_response 404
+  end
+
   def test_post_new
     @request.session[:user_id] = 2
     ActionMailer::Base.deliveries.clear

diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb
index ba8ec13bcb1229c7d4ae45aa6eaacabe28ba60c5..5a49e56e3dfd3e6747607bb06bfc11833ab39b9e 100644 (file)
--- a/test/functional/queries_controller_test.rb
+++ b/test/functional/queries_controller_test.rb
@@ -24,6 +24,12 @@ class QueriesControllerTest < ActionController::TestCase
     User.current = nil
   end
 
+  def test_index
+    get :index
+    # HTML response not implemented
+    assert_response 406
+  end
+
   def test_new_project_query
     @request.session[:user_id] = 2
     get :new, :project_id => 1

diff --git a/test/functional/workflows_controller_test.rb b/test/functional/workflows_controller_test.rb
index c4170ff528a718892086151ae5addaac8b37bdb5..af4ff6ef4e81342d01794f261efb830bbcdd6998 100644 (file)
--- a/test/functional/workflows_controller_test.rb
+++ b/test/functional/workflows_controller_test.rb
@@ -297,6 +297,26 @@ class WorkflowsControllerTest < ActionController::TestCase
     assert_equal source_t3, status_transitions(:tracker_id => 3, :role_id => 3)
   end
 
+  def test_post_copy_with_incomplete_source_specification_should_fail
+    assert_no_difference 'WorkflowRule.count' do
+      post :copy,
+        :source_tracker_id => '', :source_role_id => '2',
+        :target_tracker_ids => ['2', '3'], :target_role_ids => ['1', '3']
+      assert_response 200
+      assert_select 'div.flash.error', :text => 'Please select a source tracker or role' 
+    end
+  end
+
+  def test_post_copy_with_incomplete_target_specification_should_fail
+    assert_no_difference 'WorkflowRule.count' do
+      post :copy,
+        :source_tracker_id => '1', :source_role_id => '2',
+        :target_tracker_ids => ['2', '3']
+      assert_response 200
+      assert_select 'div.flash.error', :text => 'Please select target tracker(s) and role(s)'
+    end
+  end
+
   # Returns an array of status transitions that can be compared
   def status_transitions(conditions)
     WorkflowTransition.