Merge branch 'master' into add-report-name-and-details

Gemfile.lock

@@ -283,7 +283,7 @@ GEM
       devise (>= 4.0.0, < 5.0.0)
     diff-lcs (1.6.2)
     digest (3.1.1)
-    docile (1.4.0)
+    docile (1.4.1)
     dotenv (3.1.2)
     drb (2.2.3)
     em-http-request (1.1.7)
@@ -466,9 +466,10 @@ GEM
     marcel (1.0.4)
     matrix (0.4.2)
     method_source (1.1.0)
-    mime-types (3.5.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.1205)
+    mime-types (3.7.0)
+      logger
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2025.0924)
     mimemagic (0.4.3)
       nokogiri (~> 1)
       rake
@@ -541,7 +542,7 @@ GEM
     parallel (1.24.0)
     paranoia (2.6.3)
       activerecord (>= 5.1, < 7.2)
-    parser (3.3.8.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     paypal-sdk-core (0.3.4)
@@ -582,7 +583,7 @@ GEM
       railties (>= 4.2)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (2.2.18)
+    rack (2.2.19)
     rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
     rack-oauth2 (2.2.1)
@@ -636,7 +637,7 @@ GEM
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    rails-i18n (7.0.9)
+    rails-i18n (7.0.10)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     rails_safe_tasks (1.0.0)
@@ -800,7 +801,7 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
     spreadsheet_architect (5.0.0)
       caxlsx (>= 3.3.0, < 4)
@@ -864,7 +865,7 @@ GEM
       turbo-rails (>= 1.3.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    undercover (0.7.4)
+    undercover (0.8.1)
       base64
       bigdecimal
       imagen (>= 0.2.0)

config/environments/production.rb

@@ -68,9 +68,7 @@ Rails.application.configure do
   # Prepend all log lines with the following tags.
   config.log_tags = [:request_id]
 
-  # "info" includes generic and useful information about system operation, but avoids logging too much
-  # information to avoid inadvertent exposure of personally identifiable information (PII). If you
-  # want to log everything, set the level to "debug".
+  # Change to "debug" to log everything (including potentially personally-identifiable information!)
   config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info")
 
   # Use a different cache store in production.

config/environments/staging.rb

@@ -35,8 +35,8 @@ Openfoodnetwork::Application.configure do
   # Use https in email links
   config.action_mailer.default_url_options = { protocol: 'https' }
 
-  # Set log level (default is :debug in Rails 4)
-  config.log_level = :info
+  # Change to "debug" to log everything (including potentially personally-identifiable information!)
+  config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info")
 
   # Configure logging:
   config.log_formatter = Logger::Formatter.new.tap { |f| f.datetime_format = "%Y-%m-%d %H:%M:%S" }

package.json

@@ -37,7 +37,7 @@
     "webpack": "~4"
   },
   "devDependencies": {
-    "jasmine-core": "~5.11.0",
+    "jasmine-core": "~5.12.0",
     "jest": "^27.4.7",
     "karma": "~6.4.4",
     "karma-chrome-launcher": "~3.2.0",

spec/system/admin/enterprises/dfc_permissions_spec.rb

@@ -5,6 +5,10 @@ require "system_helper"
 RSpec.describe "DFC Permissions", feature: "cqcm-dev", vcr: true do
   let(:enterprise) { create(:enterprise) }
 
+  before do
+    skip "Puffing Billy seems to make our rspec processes hang at the end."
+  end
+
   before do
     login_as enterprise.owner
   end

spec/system/admin/enterprises/images_spec.rb

@@ -71,7 +71,9 @@ RSpec.describe "Managing enterprise images" do
           click_button "Confirm"
         end
 
-        expect(flash_message).to match(/Logo removed/)
+        # There's a race condition.
+        # Either of these messages can be observed.
+        expect(flash_message).to match /(Logo removed)|(Enterprise .* updated)/
 
         within ".page-admin-enterprises-form__logo-field-group" do
           expect_no_preview_image

spec/system/billy_spec.rb

@@ -3,6 +3,10 @@
 require 'system_helper'
 
 RSpec.describe "Testing external scripts loaded in the browser" do
+  before do
+    skip "Puffing Billy seems to make our rspec processes hang at the end."
+  end
+
   it "loads a website", :vcr do
     visit "http://deb.debian.org:80/debian/"
     expect(page).to have_content "Debian Archive"

spec/system/support/cuprite_setup.rb

@@ -32,7 +32,10 @@ Capybara.register_driver(:cuprite_ofn) do |app|
     inspector: true,
     headless:,
     js_errors: true,
-    proxy: { host: Billy.proxy.host, port: Billy.proxy.port },
+    # Puffing Billy seems to make our rspec processes hang at the end.
+    # Deactivating for now.
+    #
+    # proxy: { host: Billy.proxy.host, port: Billy.proxy.port },
   )
 end
 

yarn.lock

@@ -5337,10 +5337,10 @@ istanbul-reports@^3.1.3:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-jasmine-core@~5.11.0:
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-5.11.0.tgz#1343e324a0148508511031a1d5fc0d4b7ee92446"
-  integrity sha512-MPJ8L5yyNul0F2SuEsLASwESXQjJvBXnKu31JWFyRZSvuv2B79K4GDWN3pSqvLheUNh7Fyb6dXwd4rsz95O2Kg==
+jasmine-core@~5.12.0:
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-5.12.0.tgz#a0cd016483756e9537ba354c52a4ec6d8e9e7951"
+  integrity sha512-QqO4pX33GEML5JoGQU6BM5NHKPgEsg+TXp3jCIDek9MbfEp2JUYEFBo9EF1+hegWy/bCHS1m5nP0BOp18G6rVA==
 
 jest-changed-files@^27.5.1:
   version "27.5.1"