Skip to content

Commit 2f10ced

Browse files
authored
Merge pull request rails#51130 from Yegorov/fix-typo-in-devcontainer
Fix typo in devcontainer
2 parents 0b1a0c4 + 5919152 commit 2f10ced

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

railties/lib/rails/generators/devcontainer.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def mariadb_service
112112
"mariadb" => {
113113
"image" => "mariadb:10.5",
114114
"restart" => "unless-stopped",
115-
"networks" => ["dqefault"],
115+
"networks" => ["default"],
116116
"volumes" => ["mariadb-data:/var/lib/mysql"],
117117
"environment" => {
118118
"MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" => true,

railties/test/generators/app_generator_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1358,7 +1358,7 @@ def test_devonctainer_mariadb
13581358
expected_mariadb_config = {
13591359
"image" => "mariadb:10.5",
13601360
"restart" => "unless-stopped",
1361-
"networks" => ["dqefault"],
1361+
"networks" => ["default"],
13621362
"volumes" => ["mariadb-data:/var/lib/mysql"],
13631363
"environment" => {
13641364
"MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" => true,

railties/test/generators/db_system_change_generator_test.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class ChangeGeneratorTest < Rails::Generators::TestCase
100100
assert_compose_file do |compose_config|
101101
assert_includes compose_config["services"]["rails-app"]["depends_on"], "mysql"
102102

103-
expected_postgres_config = {
103+
expected_mysql_config = {
104104
"image" => "mysql/mysql-server:8.0",
105105
"restart" => "unless-stopped",
106106
"environment" => {
@@ -111,7 +111,7 @@ class ChangeGeneratorTest < Rails::Generators::TestCase
111111
"networks" => ["default"],
112112
}
113113

114-
assert_equal expected_postgres_config, compose_config["services"]["mysql"]
114+
assert_equal expected_mysql_config, compose_config["services"]["mysql"]
115115
assert_includes compose_config["volumes"].keys, "mysql-data"
116116
end
117117
end
@@ -165,17 +165,17 @@ class ChangeGeneratorTest < Rails::Generators::TestCase
165165
assert_compose_file do |compose_config|
166166
assert_includes compose_config["services"]["rails-app"]["depends_on"], "mariadb"
167167

168-
expected_postgres_config = {
168+
expected_mariadb_config = {
169169
"image" => "mariadb:10.5",
170170
"restart" => "unless-stopped",
171-
"networks" => ["dqefault"],
171+
"networks" => ["default"],
172172
"volumes" => ["mariadb-data:/var/lib/mysql"],
173173
"environment" => {
174174
"MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" => true,
175175
},
176176
}
177177

178-
assert_equal expected_postgres_config, compose_config["services"]["mariadb"]
178+
assert_equal expected_mariadb_config, compose_config["services"]["mariadb"]
179179
assert_includes compose_config["volumes"].keys, "mariadb-data"
180180
end
181181
end

0 commit comments

Comments
 (0)