Use the default layout when calling :layout => true

This helps to write things like: haml :template, :layout => !request.xhr?
sinatra · Jan 10, 2009 · b26df9a · b26df9a
1 parent 67906d3
commit b26df9a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
@@ -210,6 +210,7 @@ def lookup_template(engine, template, options={})
 
     def lookup_layout(engine, options)
       return if options[:layout] == false
+      options.delete(:layout) if options[:layout] == true
       template = options[:layout] || :layout
       data = lookup_template(engine, template, options)
       [template, data]

diff --git a/test/templates_test.rb b/test/templates_test.rb
@@ -52,6 +52,14 @@ def with_default_layout
     end
   end
 
+  it 'uses the default layout template if not really overriden' do
+    with_default_layout do
+      render_app { render :test, :hello, :layout => true }
+      should.be.ok
+      body.should.equal "Layout!\nHello World!\n"
+    end
+  end
+
   it 'uses the layout template specified' do
     render_app { render :test, :hello, :layout => :layout2 }
     should.be.ok