Fix/add a test case

nullchristo · nullchristo · commit c0c49da066df · 2025-09-23T16:32:23.000-05:00
diff --git a/javascripts/discourse/components/featured-homepage-topics.gjs b/javascripts/discourse/components/featured-homepage-topics.gjs
@@ -168,7 +168,7 @@ export default class FeaturedHomepageTopics extends Component {
   }
 
   get showPageArrows() {
-    return settings.max_number_of_topics > settings.number_of_topics;
+    return settings.max_number_of_topics > settings.number_of_topics && this.featuredTopicsAvailable > settings.number_of_topics;
   }
 
   get showLeftArrow() {
diff --git a/spec/system/pagination_spec.rb b/spec/system/pagination_spec.rb
@@ -2,68 +2,90 @@
 
 RSpec.describe "Pagination", type: :system do
   let!(:theme) { upload_theme_component }
+  fab!(:tag) { Fabricate(:tag, name: "featured") }
+  fab!(:upload) { Fabricate(:image_upload) }
 
-  fab!(:admin)
-  fab!(:user)
+  describe "without enough topics to page" do
+    fab!(:topics) { Fabricate.times(3, :topic_with_op, image_upload: upload, tags: [tag]) }
+    it "should not allow pagination even if max_number_of_topics > number_of_topics" do
+      theme.update_setting(:number_of_topics, 3)
+      theme.update_setting(:max_number_of_topics, 6)
+      theme.save!
+
+      visit("/")
+      expect(page).to have_css(".featured-topics .featured-topic", count: 3)
+      expect(page).not_to have_css(".featured-topics-controls .page-button-container")
+      expect(page).not_to have_css(".featured-topics-controls .left-page-button")
+      expect(page).not_to have_css(".featured-topics-controls .right-page-button")
+    end
+  end
   
-  fab!(:tag) { Fabricate(:tag, name: "featured") }
+  describe "with plenty of topics to page" do
+    fab!(:topics) { Fabricate.times(8, :topic_with_op, image_upload: upload, tags: [tag]) }
 
-  fab!(:upload) { Fabricate(:image_upload) }
-  fab!(:topics) { Fabricate.times(8, :topic_with_op, image_upload: upload, tags: [tag]) }
+    it "should not allow pagination if max_number_of_topics <= number_of_topics" do
+      theme.update_setting(:number_of_topics, 3)
+      theme.update_setting(:max_number_of_topics, 3)
+      theme.save!
 
-  it "should not allow pagination if max_number_of_topics <= number_of_topics" do
-    theme.update_setting(:number_of_topics, 3)
-    theme.update_setting(:max_number_of_topics, 3)
-    theme.save!
+      visit("/")
+      expect(page).to have_css(".featured-topics .featured-topic", count: 3)
+      expect(page).not_to have_css(".featured-topics-controls .page-button-container")
+      expect(page).not_to have_css(".featured-topics-controls .left-page-button")
+      expect(page).not_to have_css(".featured-topics-controls .right-page-button")
 
-    visit("/")
-    expect(page).to have_css(".featured-topics .featured-topic", count: 3)
-    expect(page).not_to have_css(".featured-topics-controls .page-button-container")
-    expect(page).not_to have_css(".featured-topics-controls .left-page-button")
-    expect(page).not_to have_css(".featured-topics-controls .right-page-button")
+      # max_number_of_topics lower than number_of_topics should have no effect
+      theme.update_setting(:max_number_of_topics, 2)
+      theme.save!
 
-    # max_number_of_topics lower than number_of_topics should have no effect
-    theme.update_setting(:max_number_of_topics, 2)
-    theme.save!
+      visit("/")
+      expect(page).to have_css(".featured-topics .featured-topic", count: 3)
+      expect(page).not_to have_css(".featured-topics-controls .page-button-container")
+      expect(page).not_to have_css(".featured-topics-controls .left-page-button")
+      expect(page).not_to have_css(".featured-topics-controls .right-page-button")
 
-    visit("/")
-    expect(page).to have_css(".featured-topics .featured-topic", count: 2)
-    expect(page).not_to have_css(".featured-topics-controls .page-button-container")
-    expect(page).not_to have_css(".featured-topics-controls .left-page-button")
-    expect(page).not_to have_css(".featured-topics-controls .right-page-button")
-  end
+      theme.update_setting(:max_number_of_topics, 0)
+      theme.save!
+
+      visit("/")
+      expect(page).to have_css(".featured-topics .featured-topic", count: 3)
+      expect(page).not_to have_css(".featured-topics-controls .page-button-container")
+      expect(page).not_to have_css(".featured-topics-controls .left-page-button")
+      expect(page).not_to have_css(".featured-topics-controls .right-page-button")
+    end
 
-  it "should allow pagination if max_number_of_topics > number_of_topics" do
-    theme.update_setting(:number_of_topics, 3)
-    theme.update_setting(:max_number_of_topics, 8)
-    theme.save!
+    it "should allow pagination if max_number_of_topics > number_of_topics" do
+      theme.update_setting(:number_of_topics, 3)
+      theme.update_setting(:max_number_of_topics, 8)
+      theme.save!
 
-    # First page should have no left arrow
-    visit("/")
-    expect(page).to have_css(".featured-topics .featured-topic", count: 3)
-    expect(page).to have_css(".featured-topics-controls .page-button-container")
-    expect(page).to have_css(".featured-topics-controls .right-page-button")
-    expect(page).not_to have_css(".featured-topics-controls .left-page-button")
+      # First page should have no left arrow
+      visit("/")
+      expect(page).to have_css(".featured-topics .featured-topic", count: 3)
+      expect(page).to have_css(".featured-topics-controls .page-button-container")
+      expect(page).to have_css(".featured-topics-controls .right-page-button")
+      expect(page).not_to have_css(".featured-topics-controls .left-page-button")
 
-    # Second page should have both arrows
-    find(".featured-topics-controls .right-page-button").click
-    expect(page).to have_css(".featured-topics .featured-topic", count: 3)
-    expect(page).to have_css(".featured-topics-controls .page-button-container")
-    expect(page).to have_css(".featured-topics-controls .right-page-button")
-    expect(page).to have_css(".featured-topics-controls .left-page-button")
+      # Second page should have both arrows
+      find(".featured-topics-controls .right-page-button").click
+      expect(page).to have_css(".featured-topics .featured-topic", count: 3)
+      expect(page).to have_css(".featured-topics-controls .page-button-container")
+      expect(page).to have_css(".featured-topics-controls .right-page-button")
+      expect(page).to have_css(".featured-topics-controls .left-page-button")
 
-    #Third page should have no right arrow, and only 2 featured topics
-    find(".featured-topics-controls .right-page-button").click
-    expect(page).to have_css(".featured-topics .featured-topic", count: 2)
-    expect(page).to have_css(".featured-topics-controls .page-button-container")
-    expect(page).not_to have_css(".featured-topics-controls .right-page-button")
-    expect(page).to have_css(".featured-topics-controls .left-page-button")
+      #Third page should have no right arrow, and only 2 featured topics
+      find(".featured-topics-controls .right-page-button").click
+      expect(page).to have_css(".featured-topics .featured-topic", count: 2)
+      expect(page).to have_css(".featured-topics-controls .page-button-container")
+      expect(page).not_to have_css(".featured-topics-controls .right-page-button")
+      expect(page).to have_css(".featured-topics-controls .left-page-button")
 
-    # Back to second page
-    find(".featured-topics-controls .left-page-button").click
-    expect(page).to have_css(".featured-topics .featured-topic", count: 3)
-    expect(page).to have_css(".featured-topics-controls .page-button-container")
-    expect(page).to have_css(".featured-topics-controls .right-page-button")
-    expect(page).to have_css(".featured-topics-controls .left-page-button")
+      # Back to second page
+      find(".featured-topics-controls .left-page-button").click
+      expect(page).to have_css(".featured-topics .featured-topic", count: 3)
+      expect(page).to have_css(".featured-topics-controls .page-button-container")
+      expect(page).to have_css(".featured-topics-controls .right-page-button")
+      expect(page).to have_css(".featured-topics-controls .left-page-button")
+    end
   end
 end

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ export default class FeaturedHomepageTopics extends Component {`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`get showPageArrows() {`
`171`		`- return settings.max_number_of_topics > settings.number_of_topics;`
	`171`	`+ return settings.max_number_of_topics > settings.number_of_topics && this.featuredTopicsAvailable > settings.number_of_topics;`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`get showLeftArrow() {`