diff --git a/sinatra.gemspec b/sinatra.gemspec index 8bcbcbf4..ada71ef1 100644 --- a/sinatra.gemspec +++ b/sinatra.gemspec @@ -117,7 +117,7 @@ Gem::Specification.new do |s| s.extra_rdoc_files = %w[README.rdoc README.de.rdoc README.jp.rdoc README.fr.rdoc README.es.rdoc README.hu.rdoc README.zh.rdoc LICENSE] s.add_dependency 'rack', '~> 1.1' - s.add_dependency 'tilt', '~> 1.1' + s.add_dependency 'tilt', '~> 1.2' s.add_development_dependency 'rake' s.add_development_dependency 'shotgun', '~> 0.6' s.add_development_dependency 'rack-test', '>= 0.5.6' diff --git a/test/markaby_test.rb b/test/markaby_test.rb index 920977f3..50139e54 100644 --- a/test/markaby_test.rb +++ b/test/markaby_test.rb @@ -12,13 +12,6 @@ class MarkabyTest < Test::Unit::TestCase get '/' end - def check_tilt(&block) - instance_eval(&block) - rescue TypeError => e - raise e unless Tilt::VERSION < '1.2' - warn "\nUpgrade Tilt!" - end - it 'renders inline markaby strings' do markaby_app { markaby 'h1 "Hiya"' } assert ok? @@ -48,30 +41,24 @@ class MarkabyTest < Test::Unit::TestCase end it 'renders inline markaby blocks' do - check_tilt do - markaby_app { markaby { h1 'Hiya' } } - assert ok? - assert_equal "

Hiya

", body - end + markaby_app { markaby { h1 'Hiya' } } + assert ok? + assert_equal "

Hiya

", body end it 'renders inline markaby blocks with inline layouts' do - check_tilt do - markaby_app do - settings.layout { 'h1 { text "THIS. IS. "; yield }' } - markaby { em 'SPARTA' } - end - assert ok? - assert_equal "

THIS. IS. SPARTA

", body + markaby_app do + settings.layout { 'h1 { text "THIS. IS. "; yield }' } + markaby { em 'SPARTA' } end + assert ok? + assert_equal "

THIS. IS. SPARTA

", body end - it 'renders inline markaby blocks with file layouts' do - check_tilt do - markaby_app { markaby(:layout => :layout2) { text "Hello World" } } - assert ok? - assert_equal "

Markaby Layout!

Hello World

", body - end + it 'renders inline markaby blocks with file layouts' do + markaby_app { markaby(:layout => :layout2) { text "Hello World" } } + assert ok? + assert_equal "

Markaby Layout!

Hello World

", body end it "raises error if template not found" do diff --git a/test/templates_test.rb b/test/templates_test.rb index b12ce066..3d29a153 100644 --- a/test/templates_test.rb +++ b/test/templates_test.rb @@ -5,7 +5,6 @@ File.delete(File.dirname(__FILE__) + '/views/layout.test') rescue nil class TestTemplate < Tilt::Template def prepare end - alias compile! prepare # for tilt < 0.7 def evaluate(scope, locals={}, &block) inner = block ? block.call : ''