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

Merge from live branch

--- a/test/integration/api_test/attachments_test.rb	Mon Mar 17 08:57:04 2014 +0000
+++ b/test/integration/api_test/attachments_test.rb	Thu Sep 11 12:46:20 2014 +0100
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# 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
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class ApiTest::AttachmentsTest < ActionController::IntegrationTest
+class Redmine::ApiTest::AttachmentsTest < Redmine::ApiTest::Base
   fixtures :projects, :trackers, :issue_statuses, :issues,
            :enumerations, :users, :issue_categories,
            :projects_trackers,
@@ -25,7 +25,6 @@
            :member_roles,
            :members,
            :enabled_modules,
-           :workflows,
            :attachments
 
   def setup
@@ -88,7 +87,7 @@
     token = xml['upload']['token']
     assert_not_nil token
 
-    attachment = Attachment.first(:order => 'id DESC')
+    attachment = Attachment.order('id DESC').first
     assert_equal token, attachment.token
     assert_nil attachment.container
     assert_equal 2, attachment.author_id
@@ -113,7 +112,7 @@
     token = json['upload']['token']
     assert_not_nil token
 
-    attachment = Attachment.first(:order => 'id DESC')
+    attachment = Attachment.order('id DESC').first
     assert_equal token, attachment.token
   end