From 656d82665d7855e934c42bd5ce48e641b63f1d49 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 11 Jan 2019 16:00:41 +0800 Subject: [PATCH] Fix the build. Follow up to 2956c52e57de71c3e885c058d6dbcc3289705534. --- test/javascripts/helpers/site-settings.js | 1 + test/javascripts/widgets/home-logo-test.js.es6 | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js index c620c54804e..47da5ec9e52 100644 --- a/test/javascripts/helpers/site-settings.js +++ b/test/javascripts/helpers/site-settings.js @@ -2,6 +2,7 @@ Discourse.SiteSettingsOriginal = { title: "Discourse Meta", site_logo_url: "/assets/logo.png", + site_home_logo_url: "/assets/logo.png", site_logo_small_url: "/assets/logo-single.png", site_mobile_logo_url: "", site_favicon_url: diff --git a/test/javascripts/widgets/home-logo-test.js.es6 b/test/javascripts/widgets/home-logo-test.js.es6 index 4a6fb874d3c..f8bbbfe1657 100644 --- a/test/javascripts/widgets/home-logo-test.js.es6 +++ b/test/javascripts/widgets/home-logo-test.js.es6 @@ -10,7 +10,7 @@ const title = "Cool Forum"; widgetTest("basics", { template: '{{mount-widget widget="home-logo" args=args}}', beforeEach() { - this.siteSettings.site_logo_url = bigLogo; + this.siteSettings.site_home_logo_url = bigLogo; this.siteSettings.site_logo_small_url = smallLogo; this.siteSettings.title = title; this.set("args", { minimized: false }); @@ -28,7 +28,7 @@ widgetTest("basics", { widgetTest("basics - minimized", { template: '{{mount-widget widget="home-logo" args=args}}', beforeEach() { - this.siteSettings.site_logo_url = bigLogo; + this.siteSettings.site_home_logo_url = bigLogo; this.siteSettings.site_logo_small_url = smallLogo; this.siteSettings.title = title; this.set("args", { minimized: true }); @@ -44,7 +44,7 @@ widgetTest("basics - minimized", { widgetTest("no logo", { template: '{{mount-widget widget="home-logo" args=args}}', beforeEach() { - this.siteSettings.site_logo_url = ""; + this.siteSettings.site_home_logo_url = ""; this.siteSettings.site_logo_small_url = ""; this.siteSettings.title = title; this.set("args", { minimized: false }); @@ -59,7 +59,7 @@ widgetTest("no logo", { widgetTest("no logo - minimized", { template: '{{mount-widget widget="home-logo" args=args}}', beforeEach() { - this.siteSettings.site_logo_url = ""; + this.siteSettings.site_home_logo_url = ""; this.siteSettings.site_logo_small_url = ""; this.siteSettings.title = title; this.set("args", { minimized: true }); @@ -87,7 +87,7 @@ widgetTest("mobile logo", { widgetTest("mobile without logo", { template: '{{mount-widget widget="home-logo" args=args}}', beforeEach() { - this.siteSettings.site_logo_url = bigLogo; + this.siteSettings.site_home_logo_url = bigLogo; this.site.mobileView = true; }, @@ -101,7 +101,7 @@ widgetTest("basics, subfolder", { template: '{{mount-widget widget="home-logo" args=args}}', beforeEach() { Discourse.BaseUri = "/forum"; - this.siteSettings.site_logo_url = bigLogo; + this.siteSettings.site_home_logo_url = bigLogo; this.siteSettings.site_logo_small_url = smallLogo; this.siteSettings.title = title; this.set("args", { minimized: false }); @@ -118,7 +118,7 @@ widgetTest("basics, subfolder - minimized", { template: '{{mount-widget widget="home-logo" args=args}}', beforeEach() { Discourse.BaseUri = "/forum"; - this.siteSettings.site_logo_url = bigLogo; + this.siteSettings.site_home_logo_url = bigLogo; this.siteSettings.site_logo_small_url = smallLogo; this.siteSettings.title = title; this.set("args", { minimized: true });