diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-08-02 11:56:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-02 11:56:01 +0200 |
commit | 73f887af620371e1229dc10d809e45335b6f7bba (patch) | |
tree | 2d29fe93c1b4ae6e4c1b2b31dd8c2402430626ba /activerecord/test/cases/adapter_test.rb | |
parent | 8e321714588867c3f869479d09c01817ed73b7ec (diff) | |
parent | feb1ddae021c38174f9c22bbd1298c8b73431b45 (diff) | |
download | rails-73f887af620371e1229dc10d809e45335b6f7bba.tar.gz rails-73f887af620371e1229dc10d809e45335b6f7bba.tar.bz2 rails-73f887af620371e1229dc10d809e45335b6f7bba.zip |
Merge pull request #29271 from rails/unlock-minitest
Unlock minitest for Rails' test suite
Diffstat (limited to 'activerecord/test/cases/adapter_test.rb')
-rw-r--r-- | activerecord/test/cases/adapter_test.rb | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/activerecord/test/cases/adapter_test.rb b/activerecord/test/cases/adapter_test.rb index abb7a696ce..6e04578576 100644 --- a/activerecord/test/cases/adapter_test.rb +++ b/activerecord/test/cases/adapter_test.rb @@ -158,26 +158,6 @@ module ActiveRecord end end - # test resetting sequences in odd tables in PostgreSQL - if ActiveRecord::Base.connection.respond_to?(:reset_pk_sequence!) - require "models/movie" - require "models/subscriber" - - def test_reset_empty_table_with_custom_pk - Movie.delete_all - Movie.connection.reset_pk_sequence! "movies" - assert_equal 1, Movie.create(name: "fight club").id - end - - def test_reset_table_with_non_integer_pk - Subscriber.delete_all - Subscriber.connection.reset_pk_sequence! "subscribers" - sub = Subscriber.new(name: "robert drake") - sub.id = "bob drake" - assert_nothing_raised { sub.save! } - end - end - def test_uniqueness_violations_are_translated_to_specific_exception @connection.execute "INSERT INTO subscribers(nick) VALUES('me')" error = assert_raises(ActiveRecord::RecordNotUnique) do @@ -368,5 +348,25 @@ module ActiveRecord assert !@connection.transaction_open? end end + + # test resetting sequences in odd tables in PostgreSQL + if ActiveRecord::Base.connection.respond_to?(:reset_pk_sequence!) + require "models/movie" + require "models/subscriber" + + def test_reset_empty_table_with_custom_pk + Movie.delete_all + Movie.connection.reset_pk_sequence! "movies" + assert_equal 1, Movie.create(name: "fight club").id + end + + def test_reset_table_with_non_integer_pk + Subscriber.delete_all + Subscriber.connection.reset_pk_sequence! "subscribers" + sub = Subscriber.new(name: "robert drake") + sub.id = "bob drake" + assert_nothing_raised { sub.save! } + end + end end end |