diff --git a/Gemfile b/Gemfile index 4868e11a..45229ef7 100644 --- a/Gemfile +++ b/Gemfile @@ -38,7 +38,7 @@ gem 'commonmarker', '~> 0.23.4', platforms: [:ruby] gem 'erubi' gem 'eventmachine' gem 'falcon', '~> 0.40', platforms: [:ruby] -gem 'haml', '~> 5' +gem 'haml', '~> 6' gem 'kramdown' gem 'liquid' gem 'markaby' diff --git a/test/haml_test.rb b/test/haml_test.rb index bb7b09c6..ae13ae10 100644 --- a/test/haml_test.rb +++ b/test/haml_test.rb @@ -26,7 +26,7 @@ class HAMLTest < Minitest::Test it "renders with inline layouts" do mock_app do - layout { %q(%h1= 'THIS. IS. ' + yield.upcase) } + layout { %q(%h1!= 'THIS. IS. ' + yield.upcase) } get('/') { haml '%em Sparta' } end get '/' @@ -66,7 +66,7 @@ class HAMLTest < Minitest::Test it "merges the default HAML options with the overrides and passes them to the Haml engine" do mock_app do - set :haml, {:format => :html5, :attr_wrapper => '"'} # default HAML attr are + set :haml, {:format => :html5} get('/') { haml "!!!\n%h1{:class => :header} Hello World" } get('/html4') { haml "!!!\n%h1{:class => 'header'} Hello World", :format => :html4 @@ -74,7 +74,7 @@ class HAMLTest < Minitest::Test end get '/' assert ok? - assert_equal "\n

Hello World

\n", body + assert_equal "\n

Hello World

\n", body get '/html4' assert ok? assert_match(/^ false do