From 0b7fa47766533c7df4be20357c2de32337d9921d Mon Sep 17 00:00:00 2001 From: Leandro Nunes dos Santos Date: Wed, 31 Jul 2013 11:24:43 -0300 Subject: [PATCH] Fix FeedReaderBlock unit test --- app/models/feed_reader_block.rb | 5 ++++- app/models/profile_list_block.rb | 2 +- test/unit/feed_reader_block_test.rb | 10 +++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/models/feed_reader_block.rb b/app/models/feed_reader_block.rb index 24e1b67..ee96a0e 100644 --- a/app/models/feed_reader_block.rb +++ b/app/models/feed_reader_block.rb @@ -1,8 +1,11 @@ class FeedReaderBlock < Block + attr_accessible :address, :update_errors + def initialize(attributes = nil) data = attributes || {} - super({ :enabled => !data[:address].blank? }.merge(data)) + super(data) + self.enabled= !data[:address].blank? end include DatesHelper diff --git a/app/models/profile_list_block.rb b/app/models/profile_list_block.rb index f4562fb..870ec1a 100644 --- a/app/models/profile_list_block.rb +++ b/app/models/profile_list_block.rb @@ -44,7 +44,7 @@ class ProfileListBlock < Block profiles = self.profile_list title = self.view_title nl = "\n" - lambda do |context| + proc do |context| count=0 list = profiles.map {|item| count+=1 diff --git a/test/unit/feed_reader_block_test.rb b/test/unit/feed_reader_block_test.rb index 0b7fada..7266f79 100644 --- a/test/unit/feed_reader_block_test.rb +++ b/test/unit/feed_reader_block_test.rb @@ -113,8 +113,10 @@ class FeedReaderBlockTest < ActiveSupport::TestCase should 'expire after a period' do # save current time now = Time.now - expired = FeedReaderBlock.create! - not_expired = FeedReaderBlock.create! + expired = FeedReaderBlock.new + expired.save + not_expired = FeedReaderBlock.new + not_expired.save # Noosfero is configured to update feeds every 4 hours FeedUpdater.stubs(:update_interval).returns(4.hours) @@ -168,7 +170,9 @@ class FeedReaderBlockTest < ActiveSupport::TestCase end should 'be disabled when address is empty' do - reader = build(:feed_reader_block, :enabled => true, :address => 'http://www.example.com/feed') + reader = build(:feed_reader_block, :address => 'http://www.example.com/feed').tap do |f| + f.enabled = true + end reader.address = nil assert_equal false, reader.enabled end -- libgit2 0.21.2