@@ -52,10 +52,10 @@ class ChangeGeneratorTest < Rails::Generators::TestCase
52
52
assert_match "curl libvips postgresql-client" , content
53
53
end
54
54
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"
59
59
end
60
60
61
61
assert_compose_file do |compose_config |
@@ -95,9 +95,9 @@ class ChangeGeneratorTest < Rails::Generators::TestCase
95
95
assert_match "curl default-mysql-client libvips" , content
96
96
end
97
97
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"] )
101
101
end
102
102
103
103
assert_compose_file do |compose_config |
@@ -137,8 +137,8 @@ class ChangeGeneratorTest < Rails::Generators::TestCase
137
137
assert_match "curl libsqlite3-0 libvips" , content
138
138
end
139
139
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"
142
142
end
143
143
end
144
144
@@ -161,8 +161,8 @@ class ChangeGeneratorTest < Rails::Generators::TestCase
161
161
assert_no_match "default-libmysqlclient-dev" , content
162
162
end
163
163
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" ]
166
166
end
167
167
168
168
assert_compose_file do |compose_config |
@@ -204,9 +204,9 @@ class ChangeGeneratorTest < Rails::Generators::TestCase
204
204
run_generator [ "--to" , "mysql" ]
205
205
run_generator [ "--to" , "sqlite3" , "--force" ]
206
206
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"
210
210
end
211
211
212
212
assert_compose_file do |compose_config |
0 commit comments