1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Should escape regexp wildcard character .

`.` is regexp meta character. It should be escape for `assert_match`
correctly.
This commit is contained in:
Ryuta Kamizono 2015-01-19 05:59:56 +09:00
parent ea721d7027
commit bd78cc8833
14 changed files with 34 additions and 34 deletions

View file

@ -112,8 +112,8 @@ class PostgresqlArrayTest < ActiveRecord::TestCase
def test_schema_dump_with_shorthand def test_schema_dump_with_shorthand
output = dump_table_schema "pg_arrays" output = dump_table_schema "pg_arrays"
assert_match %r[t.string\s+"tags",\s+array: true], output assert_match %r[t\.string\s+"tags",\s+array: true], output
assert_match %r[t.integer\s+"ratings",\s+array: true], output assert_match %r[t\.integer\s+"ratings",\s+array: true], output
end end
def test_select_with_strings def test_select_with_strings

View file

@ -72,7 +72,7 @@ if ActiveRecord::Base.connection.supports_extensions?
def test_schema_dump_with_shorthand def test_schema_dump_with_shorthand
output = dump_table_schema("citexts") output = dump_table_schema("citexts")
assert_match %r[t.citext "cival"], output assert_match %r[t\.citext "cival"], output
end end
end end
end end

View file

@ -39,6 +39,6 @@ class PostgresqlFullTextTest < ActiveRecord::TestCase
def test_schema_dump_with_shorthand def test_schema_dump_with_shorthand
output = dump_table_schema("tsvectors") output = dump_table_schema("tsvectors")
assert_match %r{t.tsvector "text_vector"}, output assert_match %r{t\.tsvector "text_vector"}, output
end end
end end

View file

@ -317,7 +317,7 @@ if ActiveRecord::Base.connection.supports_extensions?
def test_schema_dump_with_shorthand def test_schema_dump_with_shorthand
output = dump_table_schema("hstores") output = dump_table_schema("hstores")
assert_match %r[t.hstore "tags",\s+default: {}], output assert_match %r[t\.hstore "tags",\s+default: {}], output
end end
private private

View file

@ -66,7 +66,7 @@ module PostgresqlJSONSharedTestCases
def test_schema_dumping def test_schema_dumping
output = dump_table_schema("json_data_type") output = dump_table_schema("json_data_type")
assert_match(/t.#{column_type.to_s}\s+"payload",\s+default: {}/, output) assert_match(/t\.#{column_type.to_s}\s+"payload",\s+default: {}/, output)
end end
def test_cast_value_on_write def test_cast_value_on_write

View file

@ -48,6 +48,6 @@ class PostgresqlLtreeTest < ActiveRecord::TestCase
def test_schema_dump_with_shorthand def test_schema_dump_with_shorthand
output = dump_table_schema("ltrees") output = dump_table_schema("ltrees")
assert_match %r[t.ltree "path"], output assert_match %r[t\.ltree "path"], output
end end
end end

View file

@ -56,7 +56,7 @@ class PostgresqlMoneyTest < ActiveRecord::TestCase
def test_schema_dumping def test_schema_dumping
output = dump_table_schema("postgresql_moneys") output = dump_table_schema("postgresql_moneys")
assert_match %r{t\.money\s+"wealth",\s+scale: 2$}, output assert_match %r{t\.money\s+"wealth",\s+scale: 2$}, output
assert_match %r{t\.money\s+"depth",\s+scale: 2,\s+default: 150.55$}, output assert_match %r{t\.money\s+"depth",\s+scale: 2,\s+default: 150\.55$}, output
end end
def test_create_and_update_money def test_create_and_update_money

View file

@ -85,8 +85,8 @@ class PostgresqlNetworkTest < ActiveRecord::TestCase
def test_schema_dump_with_shorthand def test_schema_dump_with_shorthand
output = dump_table_schema("postgresql_network_addresses") output = dump_table_schema("postgresql_network_addresses")
assert_match %r{t.inet\s+"inet_address",\s+default: "192.168.1.1"}, output assert_match %r{t\.inet\s+"inet_address",\s+default: "192\.168\.1\.1"}, output
assert_match %r{t.cidr\s+"cidr_address",\s+default: "192.168.1.0/24"}, output assert_match %r{t\.cidr\s+"cidr_address",\s+default: "192\.168\.1\.0/24"}, output
assert_match %r{t.macaddr\s+"mac_address",\s+default: "ff:ff:ff:ff:ff:ff"}, output assert_match %r{t\.macaddr\s+"mac_address",\s+default: "ff:ff:ff:ff:ff:ff"}, output
end end
end end

View file

@ -454,7 +454,7 @@ class SchemaForeignKeyTest < ActiveRecord::TestCase
end end
@connection.add_foreign_key "wagons", "my_schema.trains", column: "train_id" @connection.add_foreign_key "wagons", "my_schema.trains", column: "train_id"
output = dump_table_schema "wagons" output = dump_table_schema "wagons"
assert_match %r{\s+add_foreign_key "wagons", "my_schema.trains", column: "train_id"$}, output assert_match %r{\s+add_foreign_key "wagons", "my_schema\.trains", column: "train_id"$}, output
ensure ensure
@connection.execute "DROP TABLE IF EXISTS wagons" @connection.execute "DROP TABLE IF EXISTS wagons"
@connection.execute "DROP TABLE IF EXISTS my_schema.trains" @connection.execute "DROP TABLE IF EXISTS my_schema.trains"

View file

@ -114,7 +114,7 @@ class PostgresqlUUIDTest < ActiveRecord::TestCase
def test_schema_dump_with_shorthand def test_schema_dump_with_shorthand
output = dump_table_schema "uuid_data_type" output = dump_table_schema "uuid_data_type"
assert_match %r{t.uuid "guid"}, output assert_match %r{t\.uuid "guid"}, output
end end
def test_uniqueness_validation_ignores_uuid def test_uniqueness_validation_ignores_uuid

View file

@ -50,6 +50,6 @@ class PostgresqlXMLTest < ActiveRecord::TestCase
def test_schema_dump_with_shorthand def test_schema_dump_with_shorthand
output = dump_table_schema("xml_data_type") output = dump_table_schema("xml_data_type")
assert_match %r{t.xml "payload"}, output assert_match %r{t\.xml "payload"}, output
end end
end end

View file

@ -8,7 +8,7 @@ module ActiveRecord
Arel::Nodes::InfixOperation.new('~', column, Arel.sql(value.source)) Arel::Nodes::InfixOperation.new('~', column, Arel.sql(value.source))
end) end)
assert_match %r{["`]topics["`].["`]title["`] ~ rails}i, Topic.where(title: /rails/).to_sql assert_match %r{["`]topics["`]\.["`]title["`] ~ rails}i, Topic.where(title: /rails/).to_sql
ensure ensure
Topic.reset_column_information Topic.reset_column_information
end end

View file

@ -204,25 +204,25 @@ class SchemaDumperTest < ActiveRecord::TestCase
if current_adapter?(:MysqlAdapter, :Mysql2Adapter) if current_adapter?(:MysqlAdapter, :Mysql2Adapter)
def test_schema_dump_should_add_default_value_for_mysql_text_field def test_schema_dump_should_add_default_value_for_mysql_text_field
output = standard_dump output = standard_dump
assert_match %r{t.text\s+"body",\s+limit: 65535,\s+null: false$}, output assert_match %r{t\.text\s+"body",\s+limit: 65535,\s+null: false$}, output
end end
def test_schema_dump_includes_length_for_mysql_binary_fields def test_schema_dump_includes_length_for_mysql_binary_fields
output = standard_dump output = standard_dump
assert_match %r{t.binary\s+"var_binary",\s+limit: 255$}, output assert_match %r{t\.binary\s+"var_binary",\s+limit: 255$}, output
assert_match %r{t.binary\s+"var_binary_large",\s+limit: 4095$}, output assert_match %r{t\.binary\s+"var_binary_large",\s+limit: 4095$}, output
end end
def test_schema_dump_includes_length_for_mysql_blob_and_text_fields def test_schema_dump_includes_length_for_mysql_blob_and_text_fields
output = standard_dump output = standard_dump
assert_match %r{t.binary\s+"tiny_blob",\s+limit: 255$}, output assert_match %r{t\.binary\s+"tiny_blob",\s+limit: 255$}, output
assert_match %r{t.binary\s+"normal_blob",\s+limit: 65535$}, output assert_match %r{t\.binary\s+"normal_blob",\s+limit: 65535$}, output
assert_match %r{t.binary\s+"medium_blob",\s+limit: 16777215$}, output assert_match %r{t\.binary\s+"medium_blob",\s+limit: 16777215$}, output
assert_match %r{t.binary\s+"long_blob",\s+limit: 4294967295$}, output assert_match %r{t\.binary\s+"long_blob",\s+limit: 4294967295$}, output
assert_match %r{t.text\s+"tiny_text",\s+limit: 255$}, output assert_match %r{t\.text\s+"tiny_text",\s+limit: 255$}, output
assert_match %r{t.text\s+"normal_text",\s+limit: 65535$}, output assert_match %r{t\.text\s+"normal_text",\s+limit: 65535$}, output
assert_match %r{t.text\s+"medium_text",\s+limit: 16777215$}, output assert_match %r{t\.text\s+"medium_text",\s+limit: 16777215$}, output
assert_match %r{t.text\s+"long_text",\s+limit: 4294967295$}, output assert_match %r{t\.text\s+"long_text",\s+limit: 4294967295$}, output
end end
def test_schema_dumps_index_type def test_schema_dumps_index_type
@ -235,19 +235,19 @@ class SchemaDumperTest < ActiveRecord::TestCase
if mysql_56? if mysql_56?
def test_schema_dump_includes_datetime_precision def test_schema_dump_includes_datetime_precision
output = standard_dump output = standard_dump
assert_match %r{t.datetime\s+"written_on",\s+precision: 6$}, output assert_match %r{t\.datetime\s+"written_on",\s+precision: 6$}, output
end end
end end
def test_schema_dump_includes_decimal_options def test_schema_dump_includes_decimal_options
output = dump_all_table_schema([/^[^n]/]) output = dump_all_table_schema([/^[^n]/])
assert_match %r{precision: 3,[[:space:]]+scale: 2,[[:space:]]+default: 2.78}, output assert_match %r{precision: 3,[[:space:]]+scale: 2,[[:space:]]+default: 2\.78}, output
end end
if current_adapter?(:PostgreSQLAdapter) if current_adapter?(:PostgreSQLAdapter)
def test_schema_dump_includes_bigint_default def test_schema_dump_includes_bigint_default
output = standard_dump output = standard_dump
assert_match %r{t.integer\s+"bigint_default",\s+limit: 8,\s+default: 0}, output assert_match %r{t\.integer\s+"bigint_default",\s+limit: 8,\s+default: 0}, output
end end
if ActiveRecord::Base.connection.supports_extensions? if ActiveRecord::Base.connection.supports_extensions?
@ -271,11 +271,11 @@ class SchemaDumperTest < ActiveRecord::TestCase
output = standard_dump output = standard_dump
# Oracle supports precision up to 38 and it identifies decimals with scale 0 as integers # Oracle supports precision up to 38 and it identifies decimals with scale 0 as integers
if current_adapter?(:OracleAdapter) if current_adapter?(:OracleAdapter)
assert_match %r{t.integer\s+"atoms_in_universe",\s+precision: 38}, output assert_match %r{t\.integer\s+"atoms_in_universe",\s+precision: 38}, output
elsif current_adapter?(:FbAdapter) elsif current_adapter?(:FbAdapter)
assert_match %r{t.integer\s+"atoms_in_universe",\s+precision: 18}, output assert_match %r{t\.integer\s+"atoms_in_universe",\s+precision: 18}, output
else else
assert_match %r{t.decimal\s+"atoms_in_universe",\s+precision: 55}, output assert_match %r{t\.decimal\s+"atoms_in_universe",\s+precision: 55}, output
end end
end end
@ -284,7 +284,7 @@ class SchemaDumperTest < ActiveRecord::TestCase
match = output.match(%r{create_table "goofy_string_id"(.*)do.*\n(.*)\n}) match = output.match(%r{create_table "goofy_string_id"(.*)do.*\n(.*)\n})
assert_not_nil(match, "goofy_string_id table not found") assert_not_nil(match, "goofy_string_id table not found")
assert_match %r(id: false), match[1], "no table id not preserved" assert_match %r(id: false), match[1], "no table id not preserved"
assert_match %r{t.string\s+"id",.*?null: false$}, match[2], "non-primary key id column not preserved" assert_match %r{t\.string\s+"id",.*?null: false$}, match[2], "non-primary key id column not preserved"
end end
def test_schema_dump_keeps_id_false_when_id_is_false_and_unique_not_null_column_added def test_schema_dump_keeps_id_false_when_id_is_false_and_unique_not_null_column_added

View file

@ -19,7 +19,7 @@ class XmlSerializationTest < ActiveRecord::TestCase
def test_should_serialize_default_root_with_namespace def test_should_serialize_default_root_with_namespace
@xml = Contact.new.to_xml :namespace=>"http://xml.rubyonrails.org/contact" @xml = Contact.new.to_xml :namespace=>"http://xml.rubyonrails.org/contact"
assert_match %r{^<contact xmlns="http://xml.rubyonrails.org/contact">}, @xml assert_match %r{^<contact xmlns="http://xml\.rubyonrails\.org/contact">}, @xml
assert_match %r{</contact>$}, @xml assert_match %r{</contact>$}, @xml
end end