Update tests for Haml v7

dentarg · dentarg · commit 0135c85402f0 · 2025-12-25T20:49:19.000+01:00
https://github.com/haml/haml/releases/tag/v7.0.0
diff --git a/Gemfile b/Gemfile
@@ -41,7 +41,7 @@ gem 'commonmarker', '~> 0.23.4', platforms: [:ruby]
 gem 'erubi'
 gem 'eventmachine'
 gem 'falcon', '~> 0.40', platforms: [:ruby]
-gem 'haml', '~> 6'
+gem 'haml'
 gem 'kramdown'
 gem 'liquid'
 gem 'markaby'
diff --git a/sinatra-contrib/spec/haml_helpers_spec.rb b/sinatra-contrib/spec/haml_helpers_spec.rb
@@ -3,6 +3,8 @@
 require 'sinatra/haml_helpers'
 
 RSpec.describe Sinatra::HamlHelpers do
+  let(:quote_char) { Haml::VERSION >= "7.0.0" ? "\"" : "'" }
+
   describe "#surround" do
     it "renders correctly" do
       mock_app do
@@ -20,7 +22,7 @@
       get "/"
       html_code = <<~HTML
         <p>
-        (<a href='https://example.org/'>surrounded</a>)
+        (<a href=#{quote_char}https://example.org/#{quote_char}>surrounded</a>)
         </p>
       HTML
       expect(body).to eq(html_code)
@@ -44,7 +46,7 @@
       get "/"
       html_code = <<~HTML
         <p>
-        * <a href='https://example.org/'>preceded</a>
+        * <a href=#{quote_char}https://example.org/#{quote_char}>preceded</a>
         </p>
       HTML
       expect(body).to eq(html_code)
@@ -68,7 +70,7 @@
       get "/"
       html_code = <<~HTML
         <p>
-        <a href='https://example.org/'>succeeded</a>.
+        <a href=#{quote_char}https://example.org/#{quote_char}>succeeded</a>.
         </p>
       HTML
       expect(body).to eq(html_code)
diff --git a/test/haml_test.rb b/test/haml_test.rb
@@ -65,6 +65,7 @@ def haml_app(&block)
   end
 
   it "merges the default HAML options with the overrides and passes them to the Haml engine" do
+    quote_char = Haml::VERSION >= "7.0.0" ? "\"" : "'"
     mock_app do
       set :haml, {:format => :html5}
       get('/') { haml "!!!\n%h1{:class => :header} Hello World" }
@@ -74,7 +75,7 @@ def haml_app(&block)
     end
     get '/'
     assert ok?
-    assert_equal "<!DOCTYPE html>\n<h1 class='header'>Hello World</h1>\n", body
+    assert_equal "<!DOCTYPE html>\n<h1 class=#{quote_char}header#{quote_char}>Hello World</h1>\n", body
     get '/html4'
     assert ok?
     assert_match(/^<!DOCTYPE html PUBLIC (.*) HTML 4.01/, body)
