test/templates_test.rb in sinatra-1.4.5 vs test/templates_test.rb in sinatra-1.4.6

- old
+ new

@@ -12,11 +12,11 @@ end Tilt.register 'test', self end -class TemplatesTest < Test::Unit::TestCase +class TemplatesTest < Minitest::Test def render_app(base=Sinatra::Base, options = {}, &block) base, options = Sinatra::Base, base if base.is_a? Hash mock_app(base) do set :views, File.dirname(__FILE__) + '/views' set options @@ -118,11 +118,11 @@ assert ok? assert_equal "Layout!\nHello World!\n", body end end - it 'uses the default layout template if not really overriden' do + it 'uses the default layout template if not really overridden' do with_default_layout do render_app { render(:test, :hello, :layout => true) } assert ok? assert_equal "Layout!\nHello World!\n", body end @@ -195,10 +195,10 @@ mock_app { set(:inline_templates, __FILE__) } assert_equal "this is foo\n\n", @app.templates[:foo][0] end test 'inline_templates ignores IO errors' do - assert_nothing_raised { mock_app { set(:inline_templates, '/foo/bar') } } + mock_app { set(:inline_templates, '/foo/bar') } assert @app.templates.empty? end it 'allows unicode in inline templates' do