Download as
Browse Code »

Commit 4456c409392bd3096f0684ee58a7a31aa6f3ee8d

Authored by Joenio Costa
2 parents 8577d3f5 933b7716
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

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 12 def address=(new_address)
13 13 old_address = address
14 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 16 end
17 17  
18 18 settings_items :limit, :type => :integer
... ...
lib/noosfero.rb
  Diff comments   View file @4456c40
1 1 module Noosfero
2 2 PROJECT = 'noosfero'
3   - VERSION = '0.27.0'
  3 + VERSION = '0.27.1'
4 4  
5 5 def self.pattern_for_controllers_in_directory(dir)
6 6 disjunction = controllers_in_directory(dir).join('|')
... ...
test/fixtures/environments.yml
  Diff comments   View file @4456c40
... ... @@ -4,7 +4,7 @@ colivre_net:
4 4 name: 'Colivre.net'
5 5 contact_email: 'colivre@localhost.localdomain'
6 6 is_default: true
7   - theme: 'default'
  7 + theme: 'noosfero'
8 8 anhetegua_net:
9 9 id: 2
10 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 15 Image.attachment_options[:path_prefix] = 'test/tmp/public/images'
16 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 21 class Test::Unit::TestCase
19 22 # Transactional fixtures accelerate your tests by wrapping each test method
20 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 173 assert_equal true, reader.enabled, 'must enable when setting to new address'
174 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 182 end
... ...