Skip to content

Commit 1638dc7

Browse files
authored
Merge pull request rails#46657 from rails/fix-protected-envs-test
Fix protected envs multi-db test
2 parents 83601ab + 18a9e8a commit 1638dc7

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

activerecord/test/cases/tasks/database_tasks_test.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ class DatabaseTasksCheckProtectedEnvironmentsMultiDatabaseTest < ActiveRecord::T
154154

155155
def test_with_multiple_databases
156156
env = ActiveRecord::ConnectionHandling::DEFAULT_ENV.call
157+
157158
with_multi_db_configurations(env) do
158159
protected_environments = ActiveRecord::Base.protected_environments
159160
current_env = ActiveRecord::Base.connection.migration_context.current_environment
@@ -167,7 +168,7 @@ def test_with_multiple_databases
167168

168169
assert_not_includes protected_environments, current_env
169170
# Assert not raises
170-
ActiveRecord::Tasks::DatabaseTasks.check_protected_environments!("test")
171+
ActiveRecord::Tasks::DatabaseTasks.check_protected_environments!(env)
171172

172173
ActiveRecord::Base.establish_connection(:secondary)
173174
connection = ActiveRecord::Base.connection
@@ -176,8 +177,9 @@ def test_with_multiple_databases
176177
schema_migration.create_version("1")
177178

178179
ActiveRecord::Base.protected_environments = [current_env.to_sym]
180+
179181
assert_raise(ActiveRecord::ProtectedEnvironmentError) do
180-
ActiveRecord::Tasks::DatabaseTasks.check_protected_environments!("test")
182+
ActiveRecord::Tasks::DatabaseTasks.check_protected_environments!(env)
181183
end
182184
ensure
183185
ActiveRecord::Base.protected_environments = protected_environments

0 commit comments

Comments
 (0)