]> source.dussan.org Git - redmine.git/commitdiff
Rails4: replace deprecated Relation#first with finder options at CipheringTest
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Thu, 9 Jan 2014 04:23:03 +0000 (04:23 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Thu, 9 Jan 2014 04:23:03 +0000 (04:23 +0000)
git-svn-id: http://svn.redmine.org/redmine/trunk@12550 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/unit/lib/redmine/ciphering_test.rb

index 58ae54fb2e24af081f25e835ea42f152dd83244f..c5b9cae1af424985e63206d006e9deb484f555bd 100644 (file)
@@ -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