From 80800e40322891929e85049de33896c832edf87b Mon Sep 17 00:00:00 2001 From: Arthur Del Esposte Date: Thu, 5 Nov 2015 10:52:52 +0000 Subject: [PATCH] Change feed published metho to consider it's parent privacy --- app/models/rss_feed.rb | 10 +++++++++- test/unit/rss_feed_test.rb | 27 +++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/app/models/rss_feed.rb b/app/models/rss_feed.rb index 31ed89f..b3575af 100644 --- a/app/models/rss_feed.rb +++ b/app/models/rss_feed.rb @@ -14,7 +14,7 @@ class RssFeed < Article # store setting in body serialize :body, Hash - + def body self[:body] ||= {} end @@ -89,6 +89,14 @@ class RssFeed < Article ) end + def published? + if self.parent + self.parent.published? + else + self.published + end + end + def self.short_description _('RSS Feed') end diff --git a/test/unit/rss_feed_test.rb b/test/unit/rss_feed_test.rb index 38c9cdf..4afec9b 100644 --- a/test/unit/rss_feed_test.rb +++ b/test/unit/rss_feed_test.rb @@ -262,4 +262,31 @@ class RssFeedTest < ActiveSupport::TestCase assert_equal [es_post], blog.feed.fetch_articles end + should 'a feed have the same privacy of its parent' do + profile = create_user('testuser').person + blog = create(Blog, :name => 'blog-test', :profile => profile) + feed = blog.feed + + assert blog.published? + assert feed.published? + + feed.published = false + feed.save + + assert blog.published? + assert feed.published? + + blog.published = false + blog.save + feed.reload + + assert !blog.published? + assert !feed.published? + + feed.published = true + feed.save + + assert !blog.published? + assert !feed.published? + end end -- libgit2 0.21.2