From: Simon Poole <simon@poole.ch>
Date: Sun, 19 Feb 2017 11:35:02 +0000 (+0100)
Subject: Make rupocop happy and correct placement of include
X-Git-Tag: live~3566^2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/325cd12c248892a78c4042d22fbdd8c1467037fb

Make rupocop happy and correct placement of include
---

diff --git a/test/helpers/user_blocks_helper_test.rb b/test/helpers/user_blocks_helper_test.rb
index 026ddc300..de5ff1c6a 100644
--- a/test/helpers/user_blocks_helper_test.rb
+++ b/test/helpers/user_blocks_helper_test.rb
@@ -1,9 +1,8 @@
 # coding: utf-8
 require "test_helper"
-include ApplicationHelper
 
 class UserBlocksHelperTest < ActionView::TestCase
-
+  include ApplicationHelper
   def setup
     I18n.locale = "en"
   end
@@ -29,7 +28,7 @@ class UserBlocksHelperTest < ActionView::TestCase
       :needs_view => true,
       :ends_at => Time.now.getutc + 60.minutes
     )
-    assert_equal I18n.t("user_block.helper.time_future_and_until_login", :time => friendly_date(block_end)).html_safe, 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 = UserBlock.create(
       :user_id => 1,
@@ -38,6 +37,6 @@ class UserBlocksHelperTest < ActionView::TestCase
       :needs_view => false,
       :ends_at => Time.now.getutc + 60.minutes
     )
-    assert_equal I18n.t("user_block.helper.time_future", :time => friendly_date(block_end)).html_safe, block_status(block)
+    assert_equal I18n.t("user_block.helper.time_future", :time => friendly_date(block_end)), block_status(block)
   end
 end