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/primary_keys_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/primary_keys_test.rb')
-rw-r--r-- | activerecord/test/cases/primary_keys_test.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/activerecord/test/cases/primary_keys_test.rb b/activerecord/test/cases/primary_keys_test.rb index bda82c095f..df83fe0ea1 100644 --- a/activerecord/test/cases/primary_keys_test.rb +++ b/activerecord/test/cases/primary_keys_test.rb @@ -326,7 +326,7 @@ class CompositePrimaryKeyTest < ActiveRecord::TestCase def setup @connection = ActiveRecord::Base.connection @connection.schema_cache.clear! - @connection.create_table(:barcodes, primary_key: ["region", "code"], force: true) do |t| + @connection.create_table(:uber_barcodes, primary_key: ["region", "code"], force: true) do |t| t.string :region t.integer :code end @@ -337,11 +337,11 @@ class CompositePrimaryKeyTest < ActiveRecord::TestCase end def teardown - @connection.drop_table(:barcodes, if_exists: true) + @connection.drop_table(:uber_barcodes, if_exists: true) end def test_composite_primary_key - assert_equal ["region", "code"], @connection.primary_keys("barcodes") + assert_equal ["region", "code"], @connection.primary_keys("uber_barcodes") end def test_composite_primary_key_out_of_order @@ -352,7 +352,7 @@ class CompositePrimaryKeyTest < ActiveRecord::TestCase def test_primary_key_issues_warning model = Class.new(ActiveRecord::Base) do def self.table_name - "barcodes" + "uber_barcodes" end end warning = capture(:stderr) do @@ -361,9 +361,9 @@ class CompositePrimaryKeyTest < ActiveRecord::TestCase assert_match(/WARNING: Active Record does not support composite primary key\./, warning) end - def test_dumping_composite_primary_key - schema = dump_table_schema "barcodes" - assert_match %r{create_table "barcodes", primary_key: \["region", "code"\]}, schema + def test_collectly_dump_composite_primary_key + schema = dump_table_schema "uber_barcodes" + assert_match %r{create_table "uber_barcodes", primary_key: \["region", "code"\]}, schema end def test_dumping_composite_primary_key_out_of_order |