From de83f28dc1385eb037c70b6c631fc3aeade9fceb Mon Sep 17 00:00:00 2001 From: Yves Senn Date: Thu, 6 Nov 2014 15:31:18 +0100 Subject: tests, use SchemaDumpingHelper to dump a specific table. This makes debugging the generated schema output much easier. As a side effect it also shaves off 2.5 seconds of test runtime. --- .../test/cases/adapters/postgresql/uuid_test.rb | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'activerecord/test/cases/adapters/postgresql/uuid_test.rb') diff --git a/activerecord/test/cases/adapters/postgresql/uuid_test.rb b/activerecord/test/cases/adapters/postgresql/uuid_test.rb index 376dc2490e..c3705e7dac 100644 --- a/activerecord/test/cases/adapters/postgresql/uuid_test.rb +++ b/activerecord/test/cases/adapters/postgresql/uuid_test.rb @@ -3,6 +3,7 @@ require "cases/helper" require 'active_record/base' require 'active_record/connection_adapters/postgresql_adapter' +require 'support/schema_dumping_helper' module PostgresqlUUIDHelper def connection @@ -112,6 +113,8 @@ end class PostgresqlLargeKeysTest < ActiveRecord::TestCase include PostgresqlUUIDHelper + include SchemaDumpingHelper + def setup connection.create_table('big_serials', id: :bigserial) do |t| t.string 'name' @@ -119,10 +122,8 @@ class PostgresqlLargeKeysTest < ActiveRecord::TestCase end def test_omg - schema = StringIO.new - ActiveRecord::SchemaDumper.dump(connection, schema) - assert_match "create_table \"big_serials\", id: :bigserial, force: true", - schema.string + schema = dump_table_schema "big_serials" + assert_match "create_table \"big_serials\", id: :bigserial, force: true", schema end def teardown @@ -132,6 +133,7 @@ end class PostgresqlUUIDGenerationTest < ActiveRecord::TestCase include PostgresqlUUIDHelper + include SchemaDumpingHelper class UUID < ActiveRecord::Base self.table_name = 'pg_uuids' @@ -191,17 +193,15 @@ class PostgresqlUUIDGenerationTest < ActiveRecord::TestCase end def test_schema_dumper_for_uuid_primary_key - schema = StringIO.new - ActiveRecord::SchemaDumper.dump(connection, schema) - assert_match(/\bcreate_table "pg_uuids", id: :uuid, default: "uuid_generate_v1\(\)"/, schema.string) - assert_match(/t\.uuid "other_uuid", default: "uuid_generate_v4\(\)"/, schema.string) + schema = dump_table_schema "pg_uuids" + assert_match(/\bcreate_table "pg_uuids", id: :uuid, default: "uuid_generate_v1\(\)"/, schema) + assert_match(/t\.uuid "other_uuid", default: "uuid_generate_v4\(\)"/, schema) end def test_schema_dumper_for_uuid_primary_key_with_custom_default - schema = StringIO.new - ActiveRecord::SchemaDumper.dump(connection, schema) - assert_match(/\bcreate_table "pg_uuids_2", id: :uuid, default: "my_uuid_generator\(\)"/, schema.string) - assert_match(/t\.uuid "other_uuid_2", default: "my_uuid_generator\(\)"/, schema.string) + schema = dump_table_schema "pg_uuids_2" + assert_match(/\bcreate_table "pg_uuids_2", id: :uuid, default: "my_uuid_generator\(\)"/, schema) + assert_match(/t\.uuid "other_uuid_2", default: "my_uuid_generator\(\)"/, schema) end end end -- cgit v1.2.3 From 300c96ce158a6ebd3a83b057a8cdf2d29de0fe9d Mon Sep 17 00:00:00 2001 From: Yves Senn Date: Thu, 6 Nov 2014 15:38:03 +0100 Subject: tests, remove unneeded requires. --- activerecord/test/cases/adapters/postgresql/uuid_test.rb | 3 --- 1 file changed, 3 deletions(-) (limited to 'activerecord/test/cases/adapters/postgresql/uuid_test.rb') diff --git a/activerecord/test/cases/adapters/postgresql/uuid_test.rb b/activerecord/test/cases/adapters/postgresql/uuid_test.rb index c3705e7dac..5753da1173 100644 --- a/activerecord/test/cases/adapters/postgresql/uuid_test.rb +++ b/activerecord/test/cases/adapters/postgresql/uuid_test.rb @@ -1,8 +1,5 @@ # encoding: utf-8 - require "cases/helper" -require 'active_record/base' -require 'active_record/connection_adapters/postgresql_adapter' require 'support/schema_dumping_helper' module PostgresqlUUIDHelper -- cgit v1.2.3