From 625391953a6211915c200dca12f72668d496dbdc Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 4 Aug 2014 15:07:55 -0700 Subject: [PATCH] Remove a Padrino hack. They fixed the bug upstream and now our hack is the problem. Closes #1327 --- middleman-core/features/slim.feature | 3 ++- .../lib/middleman-more/core_extensions/default_helpers.rb | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/middleman-core/features/slim.feature b/middleman-core/features/slim.feature index 2da2a324..c415fefc 100644 --- a/middleman-core/features/slim.feature +++ b/middleman-core/features/slim.feature @@ -23,9 +23,10 @@ Feature: Support slim templating language Scenario: Slim Content For Given the Server is running at "slim-content-for-app" When I go to "/index.html" + Then I should not see "Content AContent B" Then I should see "Content for A:Content A" Then I should see "Content for main:Content Main" - Then I should see "Content for B:Content AContent B" + Then I should see "Content for B:Content B" Scenario: Rendering Scss in a Slim filter Given an empty app diff --git a/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb b/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb index 91ade628..babc0c38 100644 --- a/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb +++ b/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb @@ -73,7 +73,6 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension def auto_find_proper_handler(&block) engine = block_given? ? File.extname(block.source_location[0])[1..-1].to_sym : current_engine - return if engine == :slim && engine == current_engine handler_class = ::Padrino::Helpers::OutputHelpers.handlers[engine] handler_class && handler_class.new(self) end