From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 9 Jan 2014 04:23:03 +0000 (+0000)
Subject: Rails4: replace deprecated Relation#first with finder options at CipheringTest
X-Git-Tag: 2.5.0~349
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=132021f8951b1910cfddb83d8be34bb95de1e8f8;p=redmine.git

Rails4: replace deprecated Relation#first with finder options at CipheringTest

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

diff --git a/test/unit/lib/redmine/ciphering_test.rb b/test/unit/lib/redmine/ciphering_test.rb
index 58ae54fb2..c5b9cae1a 100644
--- a/test/unit/lib/redmine/ciphering_test.rb
+++ b/test/unit/lib/redmine/ciphering_test.rb
@@ -57,7 +57,7 @@ class Redmine::CipheringTest < ActiveSupport::TestCase
     end
 
     Redmine::Configuration.with 'database_cipher_key' => 'secret' do
-      r = Repository.first(:order => 'id DESC')
+      r = Repository.order('id DESC').first
       assert_equal 'clear', r.password
     end
   end
@@ -68,7 +68,7 @@ class Redmine::CipheringTest < ActiveSupport::TestCase
     end
 
     Redmine::Configuration.with 'database_cipher_key' => '' do
-      r = Repository.first(:order => 'id DESC')
+      r = Repository.order('id DESC').first
       # password can not be deciphered
       assert_nothing_raised do
         assert r.password.match(/\Aaes-256-cbc:.+\Z/)
@@ -85,7 +85,7 @@ class Redmine::CipheringTest < ActiveSupport::TestCase
 
     Redmine::Configuration.with 'database_cipher_key' => 'secret' do
       assert Repository.encrypt_all(:password)
-      r = Repository.first(:order => 'id DESC')
+      r = Repository.order('id DESC').first
       assert_equal 'bar', r.password
       assert r.read_attribute(:password).match(/\Aaes-256-cbc:.+\Z/)
     end
@@ -98,7 +98,7 @@ class Redmine::CipheringTest < ActiveSupport::TestCase
       Repository::Subversion.create!(:password => 'bar', :url => 'file:///tmp', :identifier => 'bar')
 
       assert Repository.decrypt_all(:password)
-      r = Repository.first(:order => 'id DESC')
+      r = Repository.order('id DESC').first
       assert_equal 'bar', r.password
       assert_equal 'bar', r.read_attribute(:password)
     end