Adds description field to custom queries (#9309).

Patch by Go MAEDA (@maeda).


git-svn-id: https://svn.redmine.org/redmine/trunk@22855 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/functional/queries_controller_test.rb

@@ -328,6 +328,25 @@ class QueriesControllerTest < Redmine::ControllerTest
     assert_equal [['due_date', 'desc'], ['tracker', 'asc']], query.sort_criteria
   end
 
+  def test_create_with_description
+    @request.session[:user_id] = 2
+    assert_difference '::Query.count', 1 do
+      post(
+        :create,
+        :params => {
+          :project_id => 'ecookbook',
+          :query => {
+            :name => 'test_new_with_description', :description => 'Description for test_new_with_description'
+          }
+        }
+      )
+    end
+    q = Query.find_by_name("test_new_with_description")
+    assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook', :query_id => q
+
+    assert_equal 'Description for test_new_with_description', q.description
+  end
+
   def test_create_with_failure
     @request.session[:user_id] = 2
     assert_no_difference '::Query.count' do
@@ -659,6 +678,14 @@ class QueriesControllerTest < Redmine::ControllerTest
     end
   end
 
+  def test_edit_description
+    @request.session[:user_id] = 1
+    get(:edit, :params => {:id => 5})
+    assert_response :success
+
+    assert_select 'input[name="query[description]"][value=?]', 'Description for Oepn issues by priority and tracker'
+  end
+
   def test_edit_invalid_query
     @request.session[:user_id] = 2
     get(:edit, :params => {:id => 99})
@@ -744,6 +771,23 @@ class QueriesControllerTest < Redmine::ControllerTest
     assert Query.find_by_name('test_project_query_updated')
   end
 
+  def test_update_description
+    @request.session[:user_id] = 1
+    q = Query.find(5)
+    put(
+      :update,
+      :params => {
+        :id => q.id,
+        :query => {
+          :name => q.name,
+          :description => 'query description updated'
+        }
+      }
+    )
+    assert_redirected_to :controller => 'issues', :action => 'index', :query_id => q.id
+    assert_equal 'query description updated',  Query.find(5).description
+  end
+
   def test_update_with_failure
     @request.session[:user_id] = 1
     put(