aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-08-23 00:00:12 -0300
committerGitHub <noreply@github.com>2016-08-23 00:00:12 -0300
commit97507329d6248fa7ade24ff540c3637010bdb6c7 (patch)
tree7bb42e08abfa9437dde3b5c85de641d466ab5fb0
parent479f3a955d8e09362519bbde304f7f06157f129a (diff)
parentd2385926a59e6d5841c16f4ad2864161419162bc (diff)
downloadrails-97507329d6248fa7ade24ff540c3637010bdb6c7.tar.gz
rails-97507329d6248fa7ade24ff540c3637010bdb6c7.tar.bz2
rails-97507329d6248fa7ade24ff540c3637010bdb6c7.zip
Merge pull request #26253 from kamipo/fix_ci_failure
Fix CI failure caused by df84e9867219e9311aef6f4efd5dd9ec675bee5c
-rw-r--r--activerecord/test/cases/adapters/postgresql/uuid_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/uuid_test.rb b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
index 321b74c1f5..9a59691737 100644
--- a/activerecord/test/cases/adapters/postgresql/uuid_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
@@ -198,13 +198,13 @@ class PostgresqlUUIDGenerationTest < ActiveRecord::PostgreSQLTestCase
def test_schema_dumper_for_uuid_primary_key
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)
+ assert_match(/t\.uuid "other_uuid", default: -> { "uuid_generate_v4\(\)" }/, schema)
end
def test_schema_dumper_for_uuid_primary_key_with_custom_default
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)
+ assert_match(/t\.uuid "other_uuid_2", default: -> { "my_uuid_generator\(\)" }/, schema)
end
end
end