Make rupocop happy and correct placement of include

This commit is contained in:
Simon Poole 2017-02-19 12:35:02 +01:00
parent 455e906afa
commit 325cd12c24

View file

@ -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