diff test/integration/api_test/disabled_rest_api_test.rb @ 1526:404aa68d4227

Merge from live branch

--- a/test/integration/api_test/disabled_rest_api_test.rb	Mon Mar 17 08:57:04 2014 +0000
+++ b/test/integration/api_test/disabled_rest_api_test.rb	Thu Sep 11 12:46:20 2014 +0100
@@ -1,14 +1,30 @@
+# Redmine - project management software
+# Copyright (C) 2006-2014  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.
+
 require File.expand_path('../../../test_helper', __FILE__)
 
-class ApiTest::DisabledRestApiTest < ActionController::IntegrationTest
+class Redmine::ApiTest::DisabledRestApiTest < Redmine::ApiTest::Base
   fixtures :projects, :trackers, :issue_statuses, :issues,
            :enumerations, :users, :issue_categories,
            :projects_trackers,
            :roles,
            :member_roles,
            :members,
-           :enabled_modules,
-           :workflows
+           :enabled_modules
 
   def setup
     Setting.rest_api_enabled = '0'