Skip to content

Commit 6e0b867

Browse files
committed
Improve db_system_change_generator_test.rb
1 parent bd31917 commit 6e0b867

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

railties/test/generators/db_system_change_generator_test.rb

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ class ChangeGeneratorTest < Rails::Generators::TestCase
5252
assert_match "curl libvips postgresql-client", content
5353
end
5454

55-
assert_file(".devcontainer/devcontainer.json") do |content|
56-
assert_match(/"DB_HOST": "postgres"/, content)
57-
assert_match(/"ghcr.io\/rails\/devcontainer\/features\/postgres-client":/, content)
58-
assert_no_match(/"ghcr.io\/rails\/devcontainer\/features\/sqlite3":/, content)
55+
assert_devcontainer_json_file do |content|
56+
assert_equal "postgres", content["containerEnv"]["DB_HOST"]
57+
assert_includes content["features"].keys, "ghcr.io/rails/devcontainer/features/postgres-client"
58+
assert_not_includes content["features"].keys, "ghcr.io/rails/devcontainer/features/sqlite"
5959
end
6060

6161
assert_compose_file do |compose_config|
@@ -95,9 +95,9 @@ class ChangeGeneratorTest < Rails::Generators::TestCase
9595
assert_match "curl default-mysql-client libvips", content
9696
end
9797

98-
assert_file(".devcontainer/devcontainer.json") do |content|
99-
assert_match(/"DB_HOST": "mysql"/, content)
100-
assert_match(/"ghcr.io\/rails\/devcontainer\/features\/mysql-client":/, content)
98+
assert_devcontainer_json_file do |content|
99+
assert_equal "mysql", content["containerEnv"]["DB_HOST"]
100+
assert_equal({}, content["features"]["ghcr.io/rails/devcontainer/features/mysql-client"])
101101
end
102102

103103
assert_compose_file do |compose_config|
@@ -137,8 +137,8 @@ class ChangeGeneratorTest < Rails::Generators::TestCase
137137
assert_match "curl libsqlite3-0 libvips", content
138138
end
139139

140-
assert_file(".devcontainer/devcontainer.json") do |content|
141-
assert_no_match(/"DB_HOST"/, content)
140+
assert_devcontainer_json_file do |content|
141+
assert_not_includes content["containerEnv"].keys, "DB_HOST"
142142
end
143143
end
144144

@@ -161,8 +161,8 @@ class ChangeGeneratorTest < Rails::Generators::TestCase
161161
assert_no_match "default-libmysqlclient-dev", content
162162
end
163163

164-
assert_file(".devcontainer/devcontainer.json") do |content|
165-
assert_match(/"DB_HOST": "mariadb"/, content)
164+
assert_devcontainer_json_file do |content|
165+
assert_match "mariadb", content["containerEnv"]["DB_HOST"]
166166
end
167167

168168
assert_compose_file do |compose_config|
@@ -204,9 +204,9 @@ class ChangeGeneratorTest < Rails::Generators::TestCase
204204
run_generator ["--to", "mysql"]
205205
run_generator ["--to", "sqlite3", "--force"]
206206

207-
assert_file(".devcontainer/devcontainer.json") do |content|
208-
assert_no_match(/"DB_HOST"/, content)
209-
assert_no_match(/"ghcr.io\/rails\/devcontainer\/features\/mysql-client":/, content)
207+
assert_devcontainer_json_file do |content|
208+
assert_not_includes content["containerEnv"].keys, "DB_HOST"
209+
assert_not_includes content["features"].keys, "ghcr.io\/rails\/devcontainer\/features\/mysql-client"
210210
end
211211

212212
assert_compose_file do |compose_config|

0 commit comments

Comments
 (0)