diff --git a/lib/cable_ready.rb b/lib/cable_ready.rb index affa280a..ad984a52 100644 --- a/lib/cable_ready.rb +++ b/lib/cable_ready.rb @@ -2,7 +2,6 @@ require "open-uri" require "active_support/message_verifier" -require "cable_ready_helper" require "cable_ready/identifiable" require "cable_ready/operation_builder" require "cable_ready/config" @@ -15,6 +14,7 @@ require "cable_ready/cable_car" require "cable_ready/stream_identifier" require "cable_ready/version" +require "cable_ready_helper" module CableReady class << self diff --git a/lib/cable_ready_helper.rb b/lib/cable_ready_helper.rb index ebbfd791..b938a795 100644 --- a/lib/cable_ready_helper.rb +++ b/lib/cable_ready_helper.rb @@ -2,8 +2,12 @@ # TODO: remove me once CableReady 5.0 was released +require_relative "../app/helpers/cable_ready/view_helper" + module CableReadyHelper def self.included(base) - raise "`CableReadyHelper` was renamed to `CableReady::ViewHelper`" + warn "NOTICE: `CableReadyHelper` was renamed to `CableReady::ViewHelper`. Please update your include accordingly." + + base.include(::CableReady::ViewHelper) end end diff --git a/test/lib/cable_ready/view_helper_test.rb b/test/lib/cable_ready/view_helper_test.rb index cfde7ba4..017a949c 100644 --- a/test/lib/cable_ready/view_helper_test.rb +++ b/test/lib/cable_ready/view_helper_test.rb @@ -55,17 +55,18 @@ class CableReady::ViewHelperTest < ActionView::TestCase assert_equal "div", element.name end - test "raises when including CableReadyHelper" do - expection = assert_raises do - class RaiseHelperTest # standard:disable Lint/ConstantDefinitionInBlock + # standard:disable Lint/ConstantDefinitionInBlock + test "prints warning when including CableReadyHelper" do + assert_output(nil, %(NOTICE: `CableReadyHelper` was renamed to `CableReady::ViewHelper`. Please update your include accordingly.\n)) do + class CableReadyHelperTest include ::CableReadyHelper end - RaiseHelperTest.new + assert_includes CableReadyHelperTest, ::CableReadyHelper + assert_includes CableReadyHelperTest, ::CableReady::ViewHelper end - - assert_equal "`CableReadyHelper` was renamed to `CableReady::ViewHelper`", expection.message end + # standard:enable Lint/ConstantDefinitionInBlock # deprecation warnings