Merge branch 'master' into fix-deprecation-warning-for-capture

matthuhiggins · May 27, 2015 · 11971fe · 11971fe
2 parents 0cde8b2 + 2aeeb00
commit 11971fe
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/lib/foreigner/adapter.rb b/lib/foreigner/adapter.rb
@@ -12,8 +12,8 @@ def load!
         if registered.key?(configured_name)
           require registered[configured_name]
         else
-          p "Database adapter #{configured_name} not supported. Use:\n" +
-            "Foreigner::Adapter.register '#{configured_name}', 'path/to/adapter'"
+          puts "Database adapter #{configured_name} not supported. Use:\n" +
+               "Foreigner::Adapter.register '#{configured_name}', 'path/to/adapter'"
         end
       end
 

diff --git a/test/foreigner/adapter_test.rb b/test/foreigner/adapter_test.rb
@@ -8,4 +8,13 @@ class Foreigner::AdapterTest < Foreigner::UnitTest
 
     Foreigner::Adapter.load!
   end
+
+  test "load prints warning message for an unsupported adapter on two lines" do
+    Foreigner::Adapter.stubs(:configured_name).returns('unsupported')
+
+    output = StringIO.new
+    with_stdout(output) { Foreigner::Adapter.load! }
+
+    assert_equal 2, output.string.split("\n").length
+  end
 end
diff --git a/test/helper.rb b/test/helper.rb
@@ -42,6 +42,10 @@ def execute(sql, name = nil)
     end
 end
 
+if ActiveSupport::TestCase.respond_to?(:test_order=)
+  ActiveSupport::TestCase.test_order = :random
+end
+
 module Foreigner
   class UnitTest < ActiveSupport::TestCase
     private