From 9a12eb5c3c761ade5e9c9cd74f4151d33f032024 Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Thu, 2 Jan 2025 10:44:31 +1000 Subject: [PATCH] FIX: Wizard branding step null logo (#30523) Followup 3135f472e2c4221a9348aec27514d3e2947bc9ab Fixes an issue where the wizard branding step would error if SiteSetting.logo was null, this did not come up during testing because in our testing discourse-logo-sketch-small.png is used for the logo settings. --- .../discourse/app/static/wizard/components/fields/image.js | 1 + spec/system/wizard_spec.rb | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/app/assets/javascripts/discourse/app/static/wizard/components/fields/image.js b/app/assets/javascripts/discourse/app/static/wizard/components/fields/image.js index bdf8d803820..7c10406c058 100644 --- a/app/assets/javascripts/discourse/app/static/wizard/components/fields/image.js +++ b/app/assets/javascripts/discourse/app/static/wizard/components/fields/image.js @@ -31,6 +31,7 @@ export default class Image extends Component { hasUpload() { return ( !this.uploading && + this.field.value && !this.field.value.includes("discourse-logo-sketch-small.png") ); } diff --git a/spec/system/wizard_spec.rb b/spec/system/wizard_spec.rb index d8f1fa6fdc2..0374acdcb55 100644 --- a/spec/system/wizard_spec.rb +++ b/spec/system/wizard_spec.rb @@ -59,6 +59,11 @@ describe "Wizard", type: :system do let(:file_path_1) { file_from_fixtures("logo.png", "images").path } let(:file_path_2) { file_from_fixtures("logo.jpg", "images").path } + before do + SiteSetting.logo = nil + SiteSetting.logo_small = nil + end + it "lets user configure logos" do wizard_page.go_to_step("branding") expect(wizard_page).to be_on_step("branding")