Tests for #477

middleman-core/features/custom_layouts.feature

@@ -47,4 +47,18 @@ Feature: Custom layouts
     When I go to "/custom-layout-dir/"
     Then I should see "Custom Layout"
     When I go to "/custom-layout-dir/index.html"
-    Then I should see "Custom Layout"
+    Then I should see "Custom Layout"
+  
+  Scenario: Setting layout inside a matching page block
+    Given the Server is running at "page-helper-layout-block-app"
+    When I go to "/index.html"
+    Then I should see "Hello"
+    And I should see "World"
+    When I go to "/path/child.html"
+    Then I should see "Alt"
+    And I should see "Child"
+    And I should not see "Hello"
+    When I go to "/path/index.html"
+    Then I should see "Alt"
+    And I should see "Monde"
+    And I should not see "Hello"

middleman-core/fixtures/page-helper-layout-block-app/config.rb

@@ -0,0 +1,6 @@
+page "/path/*", :layout => "alt"
+
+# Doesn't work, and shouldn't
+# page "/path/*" do
+#   set :layout, "alt"
+# end

middleman-core/fixtures/page-helper-layout-block-app/source/index.html.erb

@@ -0,0 +1 @@
+World

middleman-core/fixtures/page-helper-layout-block-app/source/layouts/alt.erb

@@ -0,0 +1,3 @@
+Alt
+
+<%= yield %>

middleman-core/fixtures/page-helper-layout-block-app/source/layouts/layout.erb

@@ -0,0 +1,3 @@
+Hello
+
+<%= yield %>

middleman-core/fixtures/page-helper-layout-block-app/source/path/child.html.erb

@@ -0,0 +1 @@
+Child

middleman-core/fixtures/page-helper-layout-block-app/source/path/index.html.erb

@@ -0,0 +1 @@
+Monde