comparison test/integration/api_test/queries_test.rb @ 1464:261b3d9a4903 redmine-2.4

Update to Redmine 2.4 branch rev 12663

 # Redmine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# Copyright (C) 2006-2013  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.

 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class ApiTest::QueriesTest < ActionController::IntegrationTest
+class Redmine::ApiTest::QueriesTest < Redmine::ApiTest::Base
   fixtures :projects, :trackers, :issue_statuses, :issues,
            :enumerations, :users, :issue_categories,
            :projects_trackers,
            :roles,
            :member_roles,
            :members,
            :enabled_modules,
-           :workflows,
            :queries
 
   def setup
     Setting.rest_api_enabled = '1'
   end
 
-  context "/queries" do
-    context "GET" do
+  test "GET /queries.xml should return queries" do
+    get '/queries.xml'
 
-      should "return queries" do
-        get '/queries.xml'
-
-        assert_response :success
-        assert_equal 'application/xml', @response.content_type
-        assert_tag :tag => 'queries',
-          :attributes => {:type => 'array'},
-          :child => {
-            :tag => 'query',
-            :child => {
-              :tag => 'id',
-              :content => '4',
-              :sibling => {
-                :tag => 'name',
-                :content => 'Public query for all projects'
-              }
-            }
+    assert_response :success
+    assert_equal 'application/xml', @response.content_type
+    assert_tag :tag => 'queries',
+      :attributes => {:type => 'array'},
+      :child => {
+        :tag => 'query',
+        :child => {
+          :tag => 'id',
+          :content => '4',
+          :sibling => {
+            :tag => 'name',
+            :content => 'Public query for all projects'
           }
-      end
-    end
+        }
+      }
   end
 end