test/system/rack_tests.rb in deas-0.12.0 vs test/system/rack_tests.rb in deas-0.13.0

@@ -45,18 +45,33 @@
 
       assert_equal 500, last_response.status
       assert_equal "Oops, something went wrong", last_response.body
     end
 
-    should "return a 200 response and use all the layouts" do
-      get '/with_layout'
-
+    should "render erb templates using layouts" do
       expected_body = "Layout 1\nLayout 2\nLayout 3\nWith Layout\n"
+
+      get '/with_layout'
       assert_equal 200,           last_response.status
       assert_equal expected_body, last_response.body
 
       get '/alt_with_layout'
+      assert_equal 200,           last_response.status
+      assert_equal expected_body, last_response.body
+    end
 
+    should "render mixed (erb and other) templates using layouts" do
+      expected_body = "Layout 1\nWith Layout\n"
+
+      get '/haml_with_layout'
+      assert_equal 200,           last_response.status
+      assert_equal expected_body, last_response.body
+
+      get '/with_haml_layout'
+      assert_equal 200,           last_response.status
+      assert_equal expected_body, last_response.body
+
+      get '/haml_with_haml_layout'
       assert_equal 200,           last_response.status
       assert_equal expected_body, last_response.body
     end
 
     should "return a 302 redirecting to the expected locations" do