Better use of mocks

Dave Sims · Dave Sims · commit ef20459ae631 · 2016-08-04T19:00:37.000-05:00
diff --git a/test/domain_test.rb b/test/domain_test.rb
@@ -142,8 +142,8 @@ def test_auth_does_not_bind
   end
 
   def test_user_search_returns_first_entry
-    entry = Object.new
-    search_strategy = Object.new
+    entry = mock("Net::Ldap::Entry")
+    search_strategy = mock("GitHub::Ldap::UserSearch::Default")
     search_strategy.stubs(:perform).returns([entry])
     @ldap.expects(:user_search_strategy).returns(search_strategy)
     user = @domain.user?('user1', :attributes => [:cn])
diff --git a/test/referral_chaser_test.rb b/test/referral_chaser_test.rb
@@ -14,7 +14,7 @@ def setup
   def test_creates_referral_with_connection_credentials
     @mock_connection.expects(:search).yields({ search_referrals: ["referral string"]}).returns([])
 
-    referral = Object.new
+    referral = mock("GitHub::Ldap::ReferralChaser::Referral")
     referral.stubs(:search).returns([])
 
     GitHub::Ldap::ReferralChaser::Referral.expects(:new)
@@ -25,15 +25,12 @@ def test_creates_referral_with_connection_credentials
   end
 
   def test_creates_referral_with_default_port
-    mock_connection = GitHub::Ldap.new({
-        admin_user: "Joe",
-        admin_password: "passworD1"
-    })
+    mock_connection = mock("GitHub::Ldap")
     mock_connection.expects(:search).yields({ search_referrals: ["ldap://dc1.ghe.local/CN=Maggie%20Mae,CN=Users,DC=dc4,DC=ghe,DC=local"]}).returns([])
 
-    stub_conn = Object.new
-    stub_conn.stubs(:search).returns([])
-    GitHub::Ldap::ConnectionCache.expects(:get_connection).with(has_entry(port: 389)).returns(stub_conn)
+    stub_referral_connection = mock("GitHub::Ldap")
+    stub_referral_connection.stubs(:search).returns([])
+    GitHub::Ldap::ConnectionCache.expects(:get_connection).with(has_entry(port: 389)).returns(stub_referral_connection)
     chaser = GitHub::Ldap::ReferralChaser.new(mock_connection)
     chaser.search({})
   end
@@ -51,7 +48,7 @@ def test_creates_referral_for_first_referral_string
       }
     ]).returns([])
 
-    referral = Object.new
+    referral = mock("GitHub::Ldap::ReferralChaser::Referral")
     referral.stubs(:search).returns([])
 
     GitHub::Ldap::ReferralChaser::Referral.expects(:new)
@@ -74,7 +71,7 @@ def test_returns_referral_search_results
       }
     ]).returns([])
 
-    referral = Object.new
+    referral = mock("GitHub::Ldap::ReferralChaser::Referral")
     referral.expects(:search).returns(["result", "result"])
 
     GitHub::Ldap::ReferralChaser::Referral.expects(:new).returns(referral)
