tests for use_in_file_templates! and a little refactoring

lib/sinatra.rb

@@ -401,9 +401,7 @@ def render(renderer, template, options={})
     def determine_layout(renderer, template, options)
       return if options[:layout] == false
       layout_from_options = options[:layout] || :layout
-      layout = templates[layout_from_options]
-      layout ||= resolve_template(renderer, layout_from_options, options, false)
-      layout
+      resolve_template(renderer, layout_from_options, options, false)
     end
 
     private

test/use_in_file_templates_test.rb

@@ -0,0 +1,48 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "Rendering in file templates" do
+
+  setup do
+    Sinatra.application = nil
+    use_in_file_templates!
+  end
+
+  specify "should set template" do
+    assert Sinatra.application.templates[:foo]
+  end
+
+  specify "should set layout" do
+    assert Sinatra.application.templates[:layout]
+  end
+
+  specify "should render without layout if specified" do
+    get '/' do
+      haml :foo, :layout => false
+    end
+
+    get_it '/'
+    assert_equal "this is foo\n", body
+  end
+
+  specify "should render with layout if specified" do
+    get '/' do
+      haml :foo
+    end
+
+    get_it '/'
+    assert_equal "X\nthis is foo\nX\n", body
+  end
+
+
+end
+
+__END__
+
+## foo
+this is foo
+
+## layout
+X
+= yield
+X
+