Download as
Browse Code »

Commit 4456c409392bd3096f0684ee58a7a31aa6f3ee8d

Authored by Joenio Costa
2 parents 8577d3f5 933b7716
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

Merge branch 'stable'

Showing 5 changed files with 12 additions and 3 deletions   Show diff stats
app/models/feed_reader_block.rb
  Diff comments   View file @4456c40
@@ -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
lib/noosfero.rb
  Diff comments   View file @4456c40
1 module Noosfero 1 module Noosfero
2 PROJECT = 'noosfero' 2 PROJECT = 'noosfero'
3 - VERSION = '0.27.0' 3 + VERSION = '0.27.1'
4 4
5 def self.pattern_for_controllers_in_directory(dir) 5 def self.pattern_for_controllers_in_directory(dir)
6 disjunction = controllers_in_directory(dir).join('|') 6 disjunction = controllers_in_directory(dir).join('|')
test/fixtures/environments.yml
  Diff comments   View file @4456c40
@@ -4,7 +4,7 @@ colivre_net: @@ -4,7 +4,7 @@ colivre_net:
4 name: 'Colivre.net' 4 name: 'Colivre.net'
5 contact_email: 'colivre@localhost.localdomain' 5 contact_email: 'colivre@localhost.localdomain'
6 is_default: true 6 is_default: true
7 - theme: 'default' 7 + theme: 'noosfero'
8 anhetegua_net: 8 anhetegua_net:
9 id: 2 9 id: 2
10 name: 'Anheteguá' 10 name: 'Anheteguá'
test/test_helper.rb
  Diff comments   View file @4456c40
@@ -15,6 +15,9 @@ FileUtils.rm_rf(File.join(RAILS_ROOT, 'index', 'test')) @@ -15,6 +15,9 @@ FileUtils.rm_rf(File.join(RAILS_ROOT, 'index', 'test'))
15 Image.attachment_options[:path_prefix] = 'test/tmp/public/images' 15 Image.attachment_options[:path_prefix] = 'test/tmp/public/images'
16 Thumbnail.attachment_options[:path_prefix] = 'test/tmp/public/thumbnails' 16 Thumbnail.attachment_options[:path_prefix] = 'test/tmp/public/thumbnails'
17 17
  18 +FastGettext.add_text_domain 'noosferotest', :type => :chain, :chain => []
  19 +FastGettext.default_text_domain = 'noosferotest'
  20 +
18 class Test::Unit::TestCase 21 class Test::Unit::TestCase
19 # Transactional fixtures accelerate your tests by wrapping each test method 22 # Transactional fixtures accelerate your tests by wrapping each test method
20 # in a transaction that's rolled back on completion. This ensures that the 23 # in a transaction that's rolled back on completion. This ensures that the
test/unit/feed_reader_block_test.rb
  Diff comments   View file @4456c40
@@ -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