From eb512f07a79065414f761d8a34f3b02843321891 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 11 Sep 2014 15:30:10 -0400 Subject: [PATCH] FIX: Spec failures for feeds related to enabling categories as default page for anons when latest is deleted. --- app/controllers/list_controller.rb | 2 +- lib/discourse.rb | 4 ++++ spec/controllers/list_controller_spec.rb | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb index 6fc8c9ab3eb..0f969194d5d 100644 --- a/app/controllers/list_controller.rb +++ b/app/controllers/list_controller.rb @@ -84,7 +84,7 @@ class ListController < ApplicationController end end - Discourse.anonymous_filters.each do |filter| + Discourse.feed_filters.each do |filter| define_method("#{filter}_feed") do discourse_expires_in 1.minute diff --git a/lib/discourse.rb b/lib/discourse.rb index 8470e745187..4f5f6528b9f 100644 --- a/lib/discourse.rb +++ b/lib/discourse.rb @@ -59,6 +59,10 @@ module Discourse @filters ||= [:latest, :unread, :new, :starred, :read, :posted] end + def self.feed_filters + @feed_filters ||= [:latest] + end + def self.anonymous_filters @anonymous_filters ||= [:latest, :top, :categories] end diff --git a/spec/controllers/list_controller_spec.rb b/spec/controllers/list_controller_spec.rb index 9eb21789e82..8a707d2c611 100644 --- a/spec/controllers/list_controller_spec.rb +++ b/spec/controllers/list_controller_spec.rb @@ -13,7 +13,7 @@ describe ListController do describe 'indexes' do - Discourse.anonymous_filters.each do |filter| + (Discourse.anonymous_filters - [:categories]).each do |filter| context "#{filter}" do before { xhr :get, filter } it { should respond_with(:success) } @@ -39,7 +39,7 @@ describe ListController do describe 'RSS feeds' do - Discourse.anonymous_filters.each do |filter| + Discourse.feed_filters.each do |filter| it 'renders RSS' do get "#{filter}_feed", format: :rss