Merge branch 'stable'

Daniela Feitosa
2 parents 8adbc64f b07f1b19
Showing 5 changed files with 21 additions and 8 deletions Show diff stats
INSTALL
app/helpers/application_helper.rb
app/models/feed_reader_block.rb
test/unit/application_helper_test.rb
test/unit/feed_reader_block_test.rb
@@ -237,6 +237,10 @@ Create the database structure:
 $ RAILS_ENV=production rake db:schema:load
+Compile the translations:
+
+$ RAILS_ENV=production rake noosfero:translations:compile
+
 Now we have to create some initial data. To create your default environment
 (the first one), run the command below:
@@ -258,10 +262,6 @@ $ RAILS_ENV=production ./script/runner &quot;User.create(:login =&gt; &#39;adminuser&#39;, :emai
 (replace "adminuser", "admin@example.com", "admin" with the login, email
 and password of your environment admin)
-Compile the translations:
-
-$ RAILS_ENV=production rake noosfero:translations:compile
-
 To start the Noosfero application servers:
 $ ./script/production start
@@ -1154,7 +1154,7 @@ module ApplicationHelper
   def render_environment_features(folder)
     result = ''
     environment.enabled_features.keys.each do |feature|
-      file = File.join(@controller.view_paths, 'shared', folder.to_s, "#{feature}.rhtml")
+      file = File.join(@controller.view_paths.last, 'shared', folder.to_s, "#{feature}.rhtml")
       if File.exists?(file)
         result << render(:file => file, :use_full_path => false)
       end
@@ -13,6 +13,7 @@ class FeedReaderBlock &lt; Block
     old_address = address
     orig_set_address(new_address)
     self.enabled = (new_address && new_address != old_address) || (new_address && self.enabled) || false
+    self.fetched_at = nil
   end
   settings_items :limit, :type => :integer
@@ -71,6 +72,7 @@ class FeedReaderBlock &lt; Block
     self.feed_title = nil
     self.error_message = nil
   end
+
   def finish_fetch
     self.fetched_at = Time.now
     self.save!
@@ -603,7 +603,7 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     @controller = ApplicationController.new
     path = File.join(RAILS_ROOT, 'app', 'views')
-    @controller.stubs(:view_paths).returns(path)
+    @controller.stubs(:view_paths).returns([path])
     file = path + '/shared/usermenu/xmpp_chat.rhtml'
     expects(:render).with(:file => file, :use_full_path => false).returns('Open chat')
@@ -127,7 +127,7 @@ class FeedReaderBlockTest &lt; ActiveSupport::TestCase
     Time.stubs(:now).returns(now - 3.hours)
     not_expired.finish_fetch
-    # now one block should be expired and the not the other
+    # now one block should be expired and not the other
     Time.stubs(:now).returns(now)
     expired_list = FeedReaderBlock.expired
     assert_includes expired_list, expired
@@ -156,6 +156,17 @@ class FeedReaderBlockTest &lt; ActiveSupport::TestCase
     assert_equal true, reader.enabled
   end
+  should 'be expired when address is updated' do
+    reader = build(:feed_reader_block, :address => 'http://www.example.com/feed')
+    reader.finish_fetch
+    expired_list = FeedReaderBlock.expired
+    assert_not_includes expired_list, reader
+    reader.address = "http://www.example.com/new-feed"
+    reader.save!
+    expired_list = FeedReaderBlock.expired
+    assert_includes expired_list, reader
+  end
+
   should 'be disabled when address is empty' do
     reader = build(:feed_reader_block, :enabled => true, :address => 'http://www.example.com/feed')
     reader.address = nil
@@ -173,7 +184,7 @@ class FeedReaderBlockTest &lt; ActiveSupport::TestCase
     assert_equal true, reader.enabled, 'must enable when setting to new address'
   end
-  should 'kepp enable when address is not changed' do
+  should 'keep enable when address is not changed' do
     reader = build(:feed_reader_block, :address => 'http://www.example.com/feed')
     reader.address = 'http://www.example.com/feed'
     assert_equal true, reader.enabled
	@@ -1154,7 +1154,7 @@ module ApplicationHelper		@@ -1154,7 +1154,7 @@ module ApplicationHelper
1154	def render_environment_features(folder)	1154	def render_environment_features(folder)
1155	result = ''	1155	result = ''
1156	environment.enabled_features.keys.each do \|feature\|	1156	environment.enabled_features.keys.each do \|feature\|
1157	- file = File.join(@controller.view_paths, 'shared', folder.to_s, "#{feature}.rhtml")	1157	+ file = File.join(@controller.view_paths.last, 'shared', folder.to_s, "#{feature}.rhtml")
1158	if File.exists?(file)	1158	if File.exists?(file)
1159	result << render(:file => file, :use_full_path => false)	1159	result << render(:file => file, :use_full_path => false)
1160	end	1160	end
	@@ -603,7 +603,7 @@ class ApplicationHelperTest < Test::Unit::TestCase		@@ -603,7 +603,7 @@ class ApplicationHelperTest < Test::Unit::TestCase
603		603
604	@controller = ApplicationController.new	604	@controller = ApplicationController.new
605	path = File.join(RAILS_ROOT, 'app', 'views')	605	path = File.join(RAILS_ROOT, 'app', 'views')
606	- @controller.stubs(:view_paths).returns(path)	606	+ @controller.stubs(:view_paths).returns([path])
607		607
608	file = path + '/shared/usermenu/xmpp_chat.rhtml'	608	file = path + '/shared/usermenu/xmpp_chat.rhtml'
609	expects(:render).with(:file => file, :use_full_path => false).returns('Open chat')	609	expects(:render).with(:file => file, :use_full_path => false).returns('Open chat')