diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/transactions.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/base_test.rb | 14 | ||||
| -rw-r--r-- | activerecord/test/cases/inheritance_test.rb | 14 | 
3 files changed, 15 insertions, 15 deletions
| diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index 33718ef0e9..4dbd668fcf 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -160,7 +160,7 @@ module ActiveRecord      #     end      #   end      # -    # only "Kotori" is created. (This works on MySQL and PostgreSQL, but not on SQLite3.) +    # only "Kotori" is created. This works on MySQL and PostgreSQL. SQLite3 version >= '3.6.8' also supports it.      #      # Most databases don't support true nested transactions. At the time of      # writing, the only database that we're aware of that supports true nested diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index 960c27da3e..445322486c 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -307,20 +307,6 @@ class BasicsTest < ActiveRecord::TestCase      assert_equal("last_read", ex.errors[0].attribute)    end -  def test_initialize_abstract_class -    e = assert_raises(NotImplementedError) do -      FirstAbstractClass.new -    end -    assert_equal("FirstAbstractClass is an abstract class and can not be instantiated.", e.message) -  end - -  def test_initialize_base -    e = assert_raises(NotImplementedError) do -      ActiveRecord::Base.new -    end -    assert_equal("ActiveRecord::Base is an abstract class and can not be instantiated.", e.message) -  end -    def test_create_after_initialize_without_block      cb = CustomBulb.create(:name => 'Dude')      assert_equal('Dude', cb.name) diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb index 0b9ccbf60a..99d54e7526 100644 --- a/activerecord/test/cases/inheritance_test.rb +++ b/activerecord/test/cases/inheritance_test.rb @@ -172,6 +172,20 @@ class InheritanceTest < ActiveRecord::TestCase      assert_equal Firm, firm.class    end +  def test_new_with_abstract_class +    e = assert_raises(NotImplementedError) do +      AbstractCompany.new +    end +    assert_equal("AbstractCompany is an abstract class and can not be instantiated.", e.message) +  end + +  def test_new_with_ar_base +    e = assert_raises(NotImplementedError) do +      ActiveRecord::Base.new +    end +    assert_equal("ActiveRecord::Base is an abstract class and can not be instantiated.", e.message) +  end +    def test_new_with_invalid_type      assert_raise(ActiveRecord::SubclassNotFound) { Company.new(:type => 'InvalidType') }    end | 
