4 files changed, 54 insertions, 1 deletions
diff --git a/activerecord/test/cases/connection_specification/resolver_test.rb b/activerecord/test/cases/connection_specification/resolver_test.rb
index d4b0f236ee..5f9a742285 100644
--- a/activerecord/test/cases/connection_specification/resolver_test.rb
+++ b/activerecord/test/cases/connection_specification/resolver_test.rb
@@ -1,7 +1,7 @@
 require "cases/helper"
 
 module ActiveRecord
-  class Base
+  module Core
     class ConnectionSpecification
       class ResolverTest < ActiveRecord::TestCase
         def resolve(spec)
diff --git a/activerecord/test/cases/inclusion_test.rb b/activerecord/test/cases/inclusion_test.rb
new file mode 100644
index 0000000000..07d538f6bc
--- /dev/null
+++ b/activerecord/test/cases/inclusion_test.rb
@@ -0,0 +1,36 @@
+require 'cases/helper'
+require 'models/teapot'
+
+class BasicInclusionModelTest < ActiveRecord::TestCase
+  def test_basic_model
+    Teapot.create!(:name => "Ronnie Kemper")
+    assert_equal "Ronnie Kemper", Teapot.find(1).name
+  end
+end
+
+class InclusionUnitTest < ActiveRecord::TestCase
+  def setup
+    @klass = Class.new { include ActiveRecord::Model }
+  end
+
+  def test_non_abstract_class
+    assert !@klass.abstract_class?
+  end
+
+  def test_abstract_class
+    @klass.abstract_class = true
+    assert @klass.abstract_class?
+  end
+
+  def test_establish_connection
+    assert @klass.respond_to?(:establish_connection)
+  end
+
+  def test_adapter_connection
+    assert @klass.respond_to?("#{ActiveRecord::Base.connection_config[:adapter]}_connection")
+  end
+
+  def test_connection_handler
+    assert_equal ActiveRecord::Base.connection_handler, @klass.connection_handler
+  end
+end
diff --git a/activerecord/test/models/teapot.rb b/activerecord/test/models/teapot.rb
new file mode 100644
index 0000000000..638a1b38f8
--- /dev/null
+++ b/activerecord/test/models/teapot.rb
@@ -0,0 +1,13 @@
+class Teapot
+  # I'm a little teapot,
+  # Short and stout,
+  # Here is my handle
+  # Here is my spout
+  # When I get all steamed up,
+  # Hear me shout,
+  # Tip me over and pour me out!
+  #
+  # HELL YEAH TEAPOT SONG
+
+  include ActiveRecord::Model
+end
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index 5933e1f46e..09c8c25d74 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -596,6 +596,10 @@ ActiveRecord::Schema.define do
     t.datetime :ending
   end
 
+  create_table :teapots, :force => true do |t|
+    t.string :name
+  end
+
   create_table :topics, :force => true do |t|
     t.string   :title
     t.string   :author_name