From 82636e3596ac9cd7e932a3b70077cc6565f335b6 Mon Sep 17 00:00:00 2001
From: Ben Hollis <ben@benhollis.net>
Date: Thu, 15 May 2014 23:30:49 -0700
Subject: [PATCH] Fixes to deal with Padrino 0.12.2 release

---
 middleman-core/features/helpers_select_tag.feature | 14 ++++++--------
 .../lib/middleman-core/renderers/haml.rb           |  5 ++++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/middleman-core/features/helpers_select_tag.feature b/middleman-core/features/helpers_select_tag.feature
index 54bf1e54..fff51c74 100644
--- a/middleman-core/features/helpers_select_tag.feature
+++ b/middleman-core/features/helpers_select_tag.feature
@@ -9,11 +9,9 @@ Feature: select_tag helper
     """
     And the Server is running at "indexable-app"
     When I go to "/select_tag.html"
-    Then I should see:
-    """
-    <select name="colors" include_blank="Choose a color"><option value="">Choose a color</option>
-    <option value="red">red</option>
-    <option value="blue">blue</option>
-    <option value="blorange">blorange</option>
-    </select>
-    """
+    Then I should see '<select name="colors"'
+    Then I should see '<option value="">Choose a color</option>'
+    Then I should see '<option value="red">red</option>'
+    Then I should see '<option value="blue">blue</option>'
+    Then I should see '<option value="blorange">blorange</option>'
+    Then I should see '</select>'
diff --git a/middleman-core/lib/middleman-core/renderers/haml.rb b/middleman-core/lib/middleman-core/renderers/haml.rb
index 8eb3a868..fc75a4e8 100644
--- a/middleman-core/lib/middleman-core/renderers/haml.rb
+++ b/middleman-core/lib/middleman-core/renderers/haml.rb
@@ -1,6 +1,9 @@
 # Require gem
 require 'haml'
 
+# Require padrino-helpers now so that we get a chance to replace their renderer with ours in Tilt.
+require 'padrino-helpers'
+
 module SafeTemplate
   def render(*)
     super.html_safe
@@ -41,7 +44,7 @@ module Middleman
       class << self
         # Once registered
         def registered(_)
-          ::Tilt.prefer(::Middleman::Renderers::HamlTemplate, 'haml')
+          ::Tilt.prefer(::Middleman::Renderers::HamlTemplate, :haml)
 
           # Add haml helpers to context
           ::Middleman::TemplateContext.send :include, ::Haml::Helpers