move test introduced in #1655 to helpers_test.rb
This commit is contained in:
parent
34ca5792e2
commit
fe2b2f70ef
|
@ -1,31 +0,0 @@
|
|||
require File.expand_path('helper', __dir__)
|
||||
require 'sinatra/base'
|
||||
|
||||
class HelpersOverloadingTest < Minitest::Test
|
||||
module BaseHelper
|
||||
def my_test
|
||||
'BaseHelper#test'
|
||||
end
|
||||
end
|
||||
|
||||
class IncludeAndOverride < Sinatra::Base
|
||||
helpers BaseHelper
|
||||
|
||||
get '/' do
|
||||
my_test
|
||||
end
|
||||
|
||||
helpers do
|
||||
def my_test
|
||||
'InlineHelper#test'
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
it 'uses overloaded inline helper' do
|
||||
mock_app(IncludeAndOverride)
|
||||
get '/'
|
||||
assert ok?
|
||||
assert_equal 'InlineHelper#test', body
|
||||
end
|
||||
end
|
|
@ -1973,5 +1973,32 @@ class HelpersTest < Minitest::Test
|
|||
get '/two'
|
||||
assert_equal '2', body
|
||||
end
|
||||
|
||||
module HelpersOverloadingBaseHelper
|
||||
def my_test
|
||||
'BaseHelper#test'
|
||||
end
|
||||
end
|
||||
|
||||
class HelpersOverloadingIncludeAndOverride < Sinatra::Base
|
||||
helpers HelpersOverloadingBaseHelper
|
||||
|
||||
get '/' do
|
||||
my_test
|
||||
end
|
||||
|
||||
helpers do
|
||||
def my_test
|
||||
'InlineHelper#test'
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
it 'uses overloaded inline helper' do
|
||||
mock_app(HelpersOverloadingIncludeAndOverride)
|
||||
get '/'
|
||||
assert ok?
|
||||
assert_equal 'InlineHelper#test', body
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue