From 3b331c1c0622bc5f25e9553a1ebd88f9474f9170 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 19 Dec 2024 16:56:43 +0000 Subject: [PATCH 1/5] DEV: Update specs for core change https://github.com/discourse/discourse/pull/30375 --- spec/system/topic_thumbnails_spec.rb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/spec/system/topic_thumbnails_spec.rb b/spec/system/topic_thumbnails_spec.rb index fc94aa0..51cd717 100644 --- a/spec/system/topic_thumbnails_spec.rb +++ b/spec/system/topic_thumbnails_spec.rb @@ -39,11 +39,13 @@ end context "with default raw-hbs topic list" do + before do + SiteSetting.glimmer_topic_list_mode = "disabled" + end + it "is using legacy topic list" do visit "/latest" - expect(page).to have_css(".topic-list") - enabled = - page.evaluate_script("Discourse.lookup('service:current-user').canUseGlimmerTopicList") + expect(page).to have_css(".topic-list.ember-view") expect(enabled).to eq(false) end @@ -52,15 +54,12 @@ context "with glimmer topic list" do before do - SiteSetting.experimental_glimmer_topic_list_groups = Group::AUTO_GROUPS[:everyone].to_s + SiteSetting.glimmer_topic_list_mode = "auto" end it "is using glimmer topic list" do visit "/latest" - expect(page).to have_css(".topic-list") - enabled = - page.evaluate_script("Discourse.lookup('service:current-user').canUseGlimmerTopicList") - expect(enabled).to eq(true) + expect(page).to have_css(".topic-list:not(.ember-view)") end it_behaves_like "topic thumbnails" From 95f7796c17699b7466f8ca6f9fc3132100a55193 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 19 Dec 2024 17:01:32 +0000 Subject: [PATCH 2/5] test --- .github/workflows/discourse-theme.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/discourse-theme.yml b/.github/workflows/discourse-theme.yml index 8adaaec..b38cd17 100644 --- a/.github/workflows/discourse-theme.yml +++ b/.github/workflows/discourse-theme.yml @@ -9,3 +9,5 @@ on: jobs: ci: uses: discourse/.github/.github/workflows/discourse-theme.yml@v1 + with: + core_ref: glimmer-topic-list-mode From 5a6e6cfa393c2447aed83b1715f11c5685a3a70e Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 19 Dec 2024 17:04:18 +0000 Subject: [PATCH 3/5] lint --- spec/system/topic_thumbnails_spec.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/spec/system/topic_thumbnails_spec.rb b/spec/system/topic_thumbnails_spec.rb index 51cd717..b06864b 100644 --- a/spec/system/topic_thumbnails_spec.rb +++ b/spec/system/topic_thumbnails_spec.rb @@ -39,9 +39,7 @@ end context "with default raw-hbs topic list" do - before do - SiteSetting.glimmer_topic_list_mode = "disabled" - end + before { SiteSetting.glimmer_topic_list_mode = "disabled" } it "is using legacy topic list" do visit "/latest" @@ -53,9 +51,7 @@ end context "with glimmer topic list" do - before do - SiteSetting.glimmer_topic_list_mode = "auto" - end + before { SiteSetting.glimmer_topic_list_mode = "auto" } it "is using glimmer topic list" do visit "/latest" From a617d3876b921fb70d37cdf869d98a1a2b90d548 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 19 Dec 2024 17:09:59 +0000 Subject: [PATCH 4/5] fixup --- spec/system/topic_thumbnails_spec.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/system/topic_thumbnails_spec.rb b/spec/system/topic_thumbnails_spec.rb index b06864b..cae0057 100644 --- a/spec/system/topic_thumbnails_spec.rb +++ b/spec/system/topic_thumbnails_spec.rb @@ -44,7 +44,6 @@ it "is using legacy topic list" do visit "/latest" expect(page).to have_css(".topic-list.ember-view") - expect(enabled).to eq(false) end it_behaves_like "topic thumbnails" From faa2ed18e9372c8efc28dd25ea621a6688d87948 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 19 Dec 2024 17:17:09 +0000 Subject: [PATCH 5/5] Revert "test" This reverts commit 95f7796c17699b7466f8ca6f9fc3132100a55193. --- .github/workflows/discourse-theme.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/discourse-theme.yml b/.github/workflows/discourse-theme.yml index b38cd17..8adaaec 100644 --- a/.github/workflows/discourse-theme.yml +++ b/.github/workflows/discourse-theme.yml @@ -9,5 +9,3 @@ on: jobs: ci: uses: discourse/.github/.github/workflows/discourse-theme.yml@v1 - with: - core_ref: glimmer-topic-list-mode