Merge branch 'html-interpolation' into v1.x

etiennebarrie · etiennebarrie · commit 6936cd722a7b · 2022-05-09T14:37:26.000+02:00
diff --git a/Gemfile b/Gemfile
@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "better_html"
 gem "capybara"
 gem "mocha"
 gem "net-smtp" # mail is missing a dependency on net-smtp https://github.com/mikel/mail/pull/1439
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maintenance_tasks (1.10.0)
+    maintenance_tasks (1.10.1)
       actionpack (>= 6.0)
       activejob (>= 6.0)
       activerecord (>= 6.0)
@@ -79,6 +79,14 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
+    better_html (1.0.16)
+      actionview (>= 4.0)
+      activesupport (>= 4.0)
+      ast (~> 2.0)
+      erubi (~> 1.4)
+      html_tokenizer (~> 0.0.6)
+      parser (>= 2.4)
+      smart_properties
     builder (3.2.4)
     byebug (11.1.3)
     capybara (3.36.0)
@@ -98,6 +106,7 @@ GEM
     erubi (1.10.0)
     globalid (1.0.0)
       activesupport (>= 5.0)
+    html_tokenizer (0.0.7)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     job-iteration (1.3.6)
@@ -202,6 +211,7 @@ GEM
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2)
+    smart_properties (1.17.0)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -236,6 +246,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  better_html
   capybara
   maintenance_tasks!
   mocha
diff --git a/app/views/layouts/maintenance_tasks/application.html.erb b/app/views/layouts/maintenance_tasks/application.html.erb
@@ -54,7 +54,7 @@
     </script>
   </head>
 
-  <body <%= "data-refresh" if defined?(@refresh) && @refresh %>>
+  <%= tag.body(data: { refresh: defined?(@refresh) && @refresh }) do %>
     <%= render 'layouts/maintenance_tasks/navbar' %>
 
     <section class="section">
@@ -68,5 +68,5 @@
         <%= yield %>
       </div>
     </div>
-  </body>
+  <% end %>
 </html>
diff --git a/maintenance_tasks.gemspec b/maintenance_tasks.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "maintenance_tasks"
-  spec.version = "1.10.0"
+  spec.version = "1.10.1"
   spec.author = "Shopify Engineering"
   spec.email = "gems@shopify.com"
   spec.homepage = "https://github.com/Shopify/maintenance_tasks"
