From 77690692934cf37c321ae9c9acb0163dec175e06 Mon Sep 17 00:00:00 2001 From: Thomas von Deyen Date: Tue, 16 Jan 2024 12:38:14 +0100 Subject: [PATCH 1/2] Disable admin preview for extensions test apps The new admin is far from complete and existing extensions will fail if we test them with the new default admin that we generate apps with. It can be enabled by setting ADMIN_PREVIEW=true in your test env. (cherry picked from commit 27b94a96cd36f2b1eeb270266630bc1965916cd8) --- core/lib/spree/testing_support/common_rake.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/core/lib/spree/testing_support/common_rake.rb b/core/lib/spree/testing_support/common_rake.rb index 02976918685..442cfda8b14 100644 --- a/core/lib/spree/testing_support/common_rake.rb +++ b/core/lib/spree/testing_support/common_rake.rb @@ -31,6 +31,7 @@ def initialize 'solidus:install', Dir.pwd, # use the current dir as Rails.root "--auto-accept", + "--admin-preview=#{ENV.fetch('ADMIN_PREVIEW', 'false')}", "--authentication=none", "--payment-method=none", "--migrate=false", From 70fdd02bf16f8a8aa2d5803c6842516833958b06 Mon Sep 17 00:00:00 2001 From: Thomas von Deyen Date: Wed, 17 Jan 2024 21:06:12 +0100 Subject: [PATCH 2/2] Rubopcop -A --- bin/release/extract-pipeline-context | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/release/extract-pipeline-context b/bin/release/extract-pipeline-context index 51929afc9b1..d20be060343 100755 --- a/bin/release/extract-pipeline-context +++ b/bin/release/extract-pipeline-context @@ -36,6 +36,7 @@ context_hash = { } warn "~~> Generating context..." -context_hash.each { |k, v| warn "#{k}=#{v}" } - -context_hash.each { |k, v| puts "#{k}=#{v}" } +context_hash.each { |k, v| + warn "#{k}=#{v}" + puts "#{k}=#{v}" +}