Use the factory to create user blocks

diff --git a/test/helpers/user_blocks_helper_test.rb b/test/helpers/user_blocks_helper_test.rb
index de5ff1c6a8cdbeba56bf04284100779e280ba1f9..8b97e4117aa1b29fd7b17215b619f6e4b5f2cf69 100644 (file)
--- 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
 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
 
   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)
     assert_equal I18n.t("user_block.helper.until_login"), block_status(block)

+

     block_end = Time.now.getutc + 60.minutes
     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)
     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_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
     assert_equal I18n.t("user_block.helper.time_future", :time => friendly_date(block_end)), block_status(block)
   end
 end