Commit d7b0f56123d1ece9fceda25cf60b1a3bfe14ceaf
Committed by
Daniela Feitosa
1 parent
dc6be7cf
Exists in
master
and in
22 other branches
Keep the feed reader block enabled after edition
(ActionItem1798)
Showing
2 changed files
with
7 additions
and
1 deletions
Show diff stats
app/models/feed_reader_block.rb
@@ -12,7 +12,7 @@ class FeedReaderBlock < Block | @@ -12,7 +12,7 @@ class FeedReaderBlock < Block | ||
12 | def address=(new_address) | 12 | def address=(new_address) |
13 | old_address = address | 13 | old_address = address |
14 | orig_set_address(new_address) | 14 | orig_set_address(new_address) |
15 | - self.enabled = (old_address.blank? && !new_address.blank?) || (new_address && new_address != old_address) || false | 15 | + self.enabled = (new_address && new_address != old_address) || (new_address && self.enabled) || false |
16 | end | 16 | end |
17 | 17 | ||
18 | settings_items :limit, :type => :integer | 18 | settings_items :limit, :type => :integer |
test/unit/feed_reader_block_test.rb
@@ -173,4 +173,10 @@ class FeedReaderBlockTest < ActiveSupport::TestCase | @@ -173,4 +173,10 @@ class FeedReaderBlockTest < ActiveSupport::TestCase | ||
173 | assert_equal true, reader.enabled, 'must enable when setting to new address' | 173 | assert_equal true, reader.enabled, 'must enable when setting to new address' |
174 | end | 174 | end |
175 | 175 | ||
176 | + should 'kepp enable when address is not changed' do | ||
177 | + reader = build(:feed_reader_block, :address => 'http://www.example.com/feed') | ||
178 | + reader.address = 'http://www.example.com/feed' | ||
179 | + assert_equal true, reader.enabled | ||
180 | + end | ||
181 | + | ||
176 | end | 182 | end |