test/connection.rb in ohm-1.0.0.alpha2 vs test/connection.rb in ohm-1.0.0.rc1

@@ -2,17 +2,31 @@
 
 require File.expand_path("./helper", File.dirname(__FILE__))
 
 prepare.clear
 
+test "no rewriting of settings hash when using Ohm.connect" do
+  settings = { url: "redis://127.0.0.1:6379/15" }.freeze
+
+  ex = nil
+
+  begin
+    Ohm.connect(settings)
+  rescue RuntimeError => e
+    ex = e
+  end
+
+  assert_equal ex, nil
+end
+
 test "connects lazily" do
   Ohm.connect(:port => 9876)
 
   begin
     Ohm.redis.get "foo"
   rescue => e
-    assert_equal Redis::CannotConnectError, e.class
+    assert_equal Errno::ECONNREFUSED, e.class
   end
 end
 
 test "provides a separate connection for each thread" do
   assert Ohm.redis == Ohm.redis
@@ -38,11 +52,11 @@
   Ohm.connect(:url => "redis://localhost:9876")
 
   begin
     Ohm.redis.get "foo"
   rescue => e
-    assert_equal Redis::CannotConnectError, e.class
+    assert_equal Errno::ECONNREFUSED, e.class
   end
 end
 
 setup do
   Ohm.connect(:url => "redis://localhost:6379/0")
@@ -50,9 +64,25 @@
 
 test "connection class" do
   conn = Ohm::Connection.new(:foo, :url => "redis://localhost:6379/0")
 
   assert conn.redis.kind_of?(Redis)
+end
+
+test "issue #46" do
+  class B < Ohm::Model
+    connect(:url => "redis://localhost:6379/15")
+  end
+
+  # We do this since we did prepare.clear above.
+  B.db.flushall
+
+  b1, b2 = nil, nil
+
+  Thread.new { b1 = B.create }.join
+  Thread.new { b2 = B.create }.join
+
+  assert_equal [b1, b2], B.all.sort.to_a
 end
 
 test "model can define its own connection" do
   class B < Ohm::Model
     connect(:url => "redis://localhost:6379/1")