test/connection.rb in ohm-1.4.0 vs test/connection.rb in ohm-2.0.0.alpha1

@@ -1,106 +1,22 @@
 # encoding: UTF-8
 
 require File.expand_path("./helper", File.dirname(__FILE__))
 
-unless defined?(Redis::CannotConnectError)
-  Redis::CannotConnectError = Errno::ECONNREFUSED
+unless defined?(Redic::CannotConnectError)
+  Redic::CannotConnectError = Errno::ECONNREFUSED
 end
 
-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
-  end
-end
-
-test "provides a separate connection for each thread" do
-  assert Ohm.redis == Ohm.redis
-
-  conn1, conn2 = nil
-
-  threads = []
-
-  threads << Thread.new do
-    conn1 = Ohm.redis
-  end
-
-  threads << Thread.new do
-    conn2 = Ohm.redis
-  end
-
-  threads.each { |t| t.join }
-
-  assert conn1 != conn2
-end
-
-test "supports connecting by URL" do
-  Ohm.connect(:url => "redis://localhost:9876")
-
-  begin
-    Ohm.redis.get "foo"
-  rescue => e
-    assert_equal Redis::CannotConnectError, e.class
-  end
-end
-
-setup do
-  Ohm.connect(:url => "redis://localhost:6379/0")
-end
-
-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")
+    self.redis = Redic.new("redis://localhost:6379/1")
   end
 
-  assert_equal B.conn.options,   {:url=>"redis://localhost:6379/1"}
-  assert_equal Ohm.conn.options, {:url=>"redis://localhost:6379/0"}
+  assert B.redis.url != Ohm.redis.url
 end
 
 test "model inherits Ohm.redis connection by default" do
-  Ohm.connect(:url => "redis://localhost:9876")
   class C < Ohm::Model
   end
 
-  assert_equal C.conn.options, Ohm.conn.options
+  assert_equal C.redis.url, Ohm.redis.url
 end