Merge branch 'master' of http://github.com/myabc/friendly_id into edge

norman · Sep 13, 2010 · d1c2a87 · d1c2a87
2 parents e825361 + 2b6ce97
commit d1c2a87
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/friendly_id/test.rb b/lib/friendly_id/test.rb
@@ -60,7 +60,7 @@ def assert_validation_error
             assert !i
           else
             instance = i
-            assert_not_empty instance.errors
+            assert !instance.errors.empty?
           end
         end
       end

diff --git a/test/active_record_adapter/ar_test_helper.rb b/test/active_record_adapter/ar_test_helper.rb
@@ -147,4 +147,4 @@ class Company < ActiveRecord::Base
   has_many :sites, :as => :owner
 end
 
-puts "Using: #{RUBY_VERSION}, #{driver}, AR#{ENV["AR"] or 3}"
+puts "Using: #{RUBY_VERSION}, #{driver}, AR#{ENV["AR"] or 3}"