From a5cd5579062e9c4282f0787522cec9f69afd5d32 Mon Sep 17 00:00:00 2001 From: cpradio Date: Thu, 7 Apr 2016 12:06:54 -0400 Subject: [PATCH] Simplify setting the top_page_default_timeframe SiteSetting (#4149) --- spec/controllers/list_controller_spec.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/spec/controllers/list_controller_spec.rb b/spec/controllers/list_controller_spec.rb index adef7e225..e45b9c7ef 100644 --- a/spec/controllers/list_controller_spec.rb +++ b/spec/controllers/list_controller_spec.rb @@ -224,59 +224,59 @@ describe ListController do describe "best_periods_for" do it "returns yearly for more than 180 days" do - SiteSetting.stubs(:top_page_default_timeframe).returns("all") + SiteSetting.top_page_default_timeframe = 'all' expect(ListController.best_periods_for(nil)).to eq([:yearly]) expect(ListController.best_periods_for(180.days.ago)).to eq([:yearly]) end it "includes monthly when less than 180 days and more than 35 days" do - SiteSetting.stubs(:top_page_default_timeframe).returns("all") + SiteSetting.top_page_default_timeframe = 'all' (35...180).each do |date| expect(ListController.best_periods_for(date.days.ago)).to eq([:monthly, :yearly]) end end it "includes weekly when less than 35 days and more than 8 days" do - SiteSetting.stubs(:top_page_default_timeframe).returns("all") + SiteSetting.top_page_default_timeframe = 'all' (8...35).each do |date| expect(ListController.best_periods_for(date.days.ago)).to eq([:weekly, :monthly, :yearly]) end end it "includes daily when less than 8 days" do - SiteSetting.stubs(:top_page_default_timeframe).returns("all") + SiteSetting.top_page_default_timeframe = 'all' (0...8).each do |date| expect(ListController.best_periods_for(date.days.ago)).to eq([:daily, :weekly, :monthly, :yearly]) end end it "returns default even for more than 180 days" do - SiteSetting.stubs(:top_page_default_timeframe).returns("monthly") + SiteSetting.top_page_default_timeframe = 'monthly' expect(ListController.best_periods_for(nil)).to eq([:monthly, :yearly]) expect(ListController.best_periods_for(180.days.ago)).to eq([:monthly, :yearly]) end it "returns default even when less than 180 days and more than 35 days" do - SiteSetting.stubs(:top_page_default_timeframe).returns("weekly") + SiteSetting.top_page_default_timeframe = 'weekly' (35...180).each do |date| expect(ListController.best_periods_for(date.days.ago)).to eq([:weekly, :monthly, :yearly]) end end it "returns default even when less than 35 days and more than 8 days" do - SiteSetting.stubs(:top_page_default_timeframe).returns("daily") + SiteSetting.top_page_default_timeframe = 'daily' (8...35).each do |date| expect(ListController.best_periods_for(date.days.ago)).to eq([:daily, :weekly, :monthly, :yearly]) end end it "doesn't return default when set to all" do - SiteSetting.stubs(:top_page_default_timeframe).returns("all") + SiteSetting.top_page_default_timeframe = 'all' expect(ListController.best_periods_for(nil)).to eq([:yearly]) end it "doesn't return value twice when matches default" do - SiteSetting.stubs(:top_page_default_timeframe).returns("yearly") + SiteSetting.top_page_default_timeframe = 'yearly' expect(ListController.best_periods_for(nil)).to eq([:yearly]) end