diff --git a/lib/backup_restore/database_restorer.rb b/lib/backup_restore/database_restorer.rb index 2ffe09e97ec..100a366cd9e 100644 --- a/lib/backup_restore/database_restorer.rb +++ b/lib/backup_restore/database_restorer.rb @@ -136,7 +136,7 @@ module BackupRestore "SKIP_OPTIMIZE_ICONS" => "1", "DISABLE_TRANSLATION_OVERRIDES" => "1" }, - "rake db:migrate", + "rake", "db:migrate", failure_message: "Failed to migrate database.", chdir: Rails.root ) diff --git a/spec/lib/backup_restore/database_restorer_spec.rb b/spec/lib/backup_restore/database_restorer_spec.rb index a11c8cc34f3..351406e1e30 100644 --- a/spec/lib/backup_restore/database_restorer_spec.rb +++ b/spec/lib/backup_restore/database_restorer_spec.rb @@ -35,11 +35,11 @@ describe BackupRestore::DatabaseRestorer do end def expect_db_migrate - Discourse::Utils.expects(:execute_command).with do |env, command, options| + Discourse::Utils.expects(:execute_command).with do |env, *command, **options| env["SKIP_POST_DEPLOYMENT_MIGRATIONS"] == "0" && env["SKIP_OPTIMIZE_ICONS"] == "1" && env["DISABLE_TRANSLATION_OVERRIDES"] == "1" && - command == "rake db:migrate" && + command == ["rake", "db:migrate"] && options[:chdir] == Rails.root end.once end