From 9c926c6c71e0f387fddb24b010a57923b79125ad Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 19 Feb 2017 11:42:38 +0000 Subject: [PATCH] Use the factory to create user blocks --- test/helpers/user_blocks_helper_test.rb | 34 ++++--------------------- 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/test/helpers/user_blocks_helper_test.rb b/test/helpers/user_blocks_helper_test.rb index de5ff1c6a..8b97e4117 100644 --- a/test/helpers/user_blocks_helper_test.rb +++ b/test/helpers/user_blocks_helper_test.rb @@ -1,42 +1,18 @@ -# coding: utf-8 require "test_helper" class UserBlocksHelperTest < ActionView::TestCase include ApplicationHelper - def setup - I18n.locale = "en" - end - - def teardown - I18n.locale = "en" - end def test_block_status - block = UserBlock.create( - :user_id => 1, - :creator_id => 2, - :reason => "testing", - :needs_view => true, - :ends_at => Time.now.getutc - ) + block = create(:user_block, :needs_view, :ends_at => Time.now.getutc) assert_equal I18n.t("user_block.helper.until_login"), block_status(block) + block_end = Time.now.getutc + 60.minutes - block = UserBlock.create( - :user_id => 1, - :creator_id => 2, - :reason => "testing", - :needs_view => true, - :ends_at => Time.now.getutc + 60.minutes - ) + block = create(:user_block, :needs_view, :ends_at => block_end) assert_equal I18n.t("user_block.helper.time_future_and_until_login", :time => friendly_date(block_end)), block_status(block) + block_end = Time.now.getutc + 60.minutes - block = UserBlock.create( - :user_id => 1, - :creator_id => 2, - :reason => "testing", - :needs_view => false, - :ends_at => Time.now.getutc + 60.minutes - ) + block = create(:user_block, :ends_at => block_end) assert_equal I18n.t("user_block.helper.time_future", :time => friendly_date(block_end)), block_status(block) end end -- 2.39.5