1 files changed, 29 insertions, 18 deletions
diff --git a/activerecord/test/cases/explain_test.rb b/activerecord/test/cases/explain_test.rb
index f1d5511bb8..64dfd86ce2 100644
--- a/activerecord/test/cases/explain_test.rb
+++ b/activerecord/test/cases/explain_test.rb
@@ -39,38 +39,49 @@ if ActiveRecord::Base.connection.supports_explain?
       binds   = [[], []]
       queries = sqls.zip(binds)
 
-      connection.stubs(:explain).returns('query plan foo', 'query plan bar')
-      expected = sqls.map {|sql| "EXPLAIN for: #{sql}\nquery plan #{sql}"}.join("\n")
-      assert_equal expected, base.exec_explain(queries)
+      stub_explain_for_query_plans do
+        expected = sqls.map {|sql| "EXPLAIN for: #{sql}\nquery plan #{sql}"}.join("\n")
+        assert_equal expected, base.exec_explain(queries)
+      end
     end
 
     def test_exec_explain_with_binds
-      cols = [Object.new, Object.new]
-      cols[0].expects(:name).returns('wadus')
-      cols[1].expects(:name).returns('chaflan')
+      object = Struct.new(:name)
+      cols = [object.new('wadus'), object.new('chaflan')]
 
       sqls    = %w(foo bar)
       binds   = [[[cols[0], 1]], [[cols[1], 2]]]
       queries = sqls.zip(binds)
 
-      connection.stubs(:explain).returns("query plan foo\n", "query plan bar\n")
-      expected = <<-SQL.strip_heredoc
-        EXPLAIN for: #{sqls[0]} [["wadus", 1]]
-        query plan foo
+      stub_explain_for_query_plans(["query plan foo\n", "query plan bar\n"]) do
+        expected = <<-SQL.strip_heredoc
+          EXPLAIN for: #{sqls[0]} [["wadus", 1]]
+          query plan foo
 
-        EXPLAIN for: #{sqls[1]} [["chaflan", 2]]
-        query plan bar
-      SQL
-      assert_equal expected, base.exec_explain(queries)
+          EXPLAIN for: #{sqls[1]} [["chaflan", 2]]
+          query plan bar
+        SQL
+        assert_equal expected, base.exec_explain(queries)
+      end
     end
 
     def test_unsupported_connection_adapter
-      connection.stubs(:supports_explain?).returns(false)
+      connection.stub(:supports_explain?, false) do
+        assert_not_called(base.logger, :warn) do
+          Car.where(:name => 'honda').to_a
+        end
+      end
+    end
 
-      base.logger.expects(:warn).never
+    private
 
-      Car.where(:name => 'honda').to_a
-    end
+      def stub_explain_for_query_plans(query_plans = ['query plan foo', 'query plan bar'])
+        explain_called = 0
+
+        connection.stub(:explain, proc{ explain_called += 1; query_plans[explain_called - 1] }) do
+          yield
+        end
+      end
 
   end
 end