Download as
Browse Code »

Commit e422115bc6185a3f4136bbc14145c3738540a4fe

Authored by Rodrigo Souto
1 parent 18df09eb
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

rails3: fix feed_handler tests

Showing 2 changed files with 4 additions and 2 deletions   Show diff stats
test/factories.rb
  Diff comments   View file @e422115
@@ -278,7 +278,7 @@ module Noosfero::Factory @@ -278,7 +278,7 @@ module Noosfero::Factory
278 # FeedReaderBlock 278 # FeedReaderBlock
279 ############################################### 279 ###############################################
280 def defaults_for_feed_reader_block 280 def defaults_for_feed_reader_block
281 - { :address => Rails.root + '/test/fixtures/files/feed.xml' } 281 + { :address => File.join(Rails.root, 'test/fixtures/files/feed.xml') }
282 end 282 end
283 283
284 ############################################### 284 ###############################################
test/unit/feed_handler_test.rb
  Diff comments   View file @e422115
@@ -90,7 +90,7 @@ class FeedHandlerTest < ActiveSupport::TestCase @@ -90,7 +90,7 @@ class FeedHandlerTest < ActiveSupport::TestCase
90 [:external_feed, :feed_reader_block].each do |container_class| 90 [:external_feed, :feed_reader_block].each do |container_class|
91 91
92 should "reset the errors count after a successfull run (#{container_class})" do 92 should "reset the errors count after a successfull run (#{container_class})" do
93 - container = build(container_class, :update_errors => 1, :address => Rails.root + '/test/fixtures/files/feed.xml') 93 + container = create(container_class, :update_errors => 1, :address => File.join(Rails.root, 'test/fixtures/files/feed.xml'))
94 handler.expects(:actually_process_container).with(container) 94 handler.expects(:actually_process_container).with(container)
95 handler.process(container) 95 handler.process(container)
96 assert_equal 0, container.update_errors 96 assert_equal 0, container.update_errors
@@ -122,6 +122,8 @@ class FeedHandlerTest < ActiveSupport::TestCase @@ -122,6 +122,8 @@ class FeedHandlerTest < ActiveSupport::TestCase
122 5.times { handler.process(container) } 122 5.times { handler.process(container) }
123 123
124 # after disabled period, tries to process the container again 124 # after disabled period, tries to process the container again
  125 + handler.stubs(:actually_process_container).with(container)
  126 + container.stubs(:only_once).returns(false)
125 last_error = Time.now 127 last_error = Time.now
126 Time.stubs(:now).returns(last_error + FeedHandler.disabled_period + 1.second) 128 Time.stubs(:now).returns(last_error + FeedHandler.disabled_period + 1.second)
127 handler.process(container) 129 handler.process(container)