From 9a083a550c4b54ad47c19d23263570528446ff80 Mon Sep 17 00:00:00 2001 From: Yasuo Honda Date: Tue, 12 Oct 2021 20:32:50 +0900 Subject: [PATCH] FIX: `BackupRestore::DatabaseRestorer` failures with Ruby 3 Implemented workaround suggested at https://github.com/freerange/mocha/issues/445#issuecomment-644944003 --- spec/lib/backup_restore/shared_context_for_backup_restore.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/lib/backup_restore/shared_context_for_backup_restore.rb b/spec/lib/backup_restore/shared_context_for_backup_restore.rb index 2ff78176ea..0fbc8ade15 100644 --- a/spec/lib/backup_restore/shared_context_for_backup_restore.rb +++ b/spec/lib/backup_restore/shared_context_for_backup_restore.rb @@ -33,7 +33,7 @@ shared_context "shared stuff" 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" &&