liquid related compat tests added

sarvajanahitam · sarvajanahitam · commit 1ebaa862b59f · 2009-04-22T15:16:27.000+05:30
diff --git a/compat/liquid_test.rb b/compat/liquid_test.rb
@@ -0,0 +1,136 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "Liquid" do
+
+  setup do
+    Sinatra.application = nil
+  end
+
+  context "without layouts" do
+
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify "should render" do
+
+      get '/no_layout' do
+        liquid '{{ 1|plus:1 }}'
+      end
+
+      get_it '/no_layout'
+      should.be.ok
+      body.should == '2'
+
+    end
+
+    specify "should take an options hash with :locals set with a string" do
+      get '/locals' do
+        liquid '{{ foo }}', :locals => {'foo' => "Bar"}
+      end
+
+      get_it '/locals'
+      should.be.ok
+      body.should == 'Bar'
+    end
+
+    specify "should take an options hash with :locals set with a complex object" do
+      get '/locals-complex' do
+        liquid '{{ foo[0] }}', :locals => {'foo' => ["foo", "bar", "baz"]}
+      end
+
+      get_it '/locals-complex'
+      should.be.ok
+      body.should == 'foo'
+    end
+  end
+
+  context "with layouts" do
+
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify "can be inline" do
+
+      layout do
+        "This is {{ content }}!"
+      end
+
+      get '/lay' do
+        liquid 'Blake'
+      end
+
+      get_it '/lay'
+      should.be.ok
+      body.should.equal 'This is Blake!'
+
+    end
+
+    specify "can use named layouts" do
+
+      layout :pretty do
+        "<h1>{{ content }}</h1>"
+      end
+
+      get '/pretty' do
+        liquid 'Foo', :layout => :pretty
+      end
+
+      get '/not_pretty' do
+        liquid 'Bar'
+      end
+
+      get_it '/pretty'
+      body.should.equal '<h1>Foo</h1>'
+
+      get_it '/not_pretty'
+      body.should.equal 'Bar'
+
+    end
+
+    specify "can be read from a file if they're not inlined" do
+
+      get '/foo' do
+        locals = {'title' => 'Welcome to the Hello Program'}
+        liquid 'Blake', :locals => locals, :layout => :foo_layout, 
+	  :views_directory => File.dirname(__FILE__) + "/views" 
+      end
+
+      get_it '/foo'
+      body.should.equal "Welcome to the Hello Program\nHi Blake\n"
+
+    end
+
+  end
+
+  context "Templates (in general)" do
+
+    specify "are read from files if Symbols" do
+
+      get '/from_file' do
+        locals = {'name' => 'Alena'}
+        liquid :foo, :views_directory => File.dirname(__FILE__) + "/views", :locals => locals
+      end
+
+      get_it '/from_file'
+
+      body.should.equal "You rock Alena!\n"
+
+    end
+
+    specify "use layout.ext by default if available" do
+
+      get '/layout_from_file' do
+        liquid :foo, :views_directory => File.dirname(__FILE__) + "/views/layout_test"
+      end
+
+      get_it '/layout_from_file'
+      should.be.ok
+      body.should.equal "x This is foo! x \n"
+
+    end
+
+  end
+
+end
diff --git a/compat/views/foo.liquid b/compat/views/foo.liquid
@@ -0,0 +1 @@
+You rock {{ name }}!
diff --git a/compat/views/foo_layout.liquid b/compat/views/foo_layout.liquid
@@ -0,0 +1,2 @@
+{{ title }}
+Hi {{ content }}
diff --git a/compat/views/layout_test/foo.liquid b/compat/views/layout_test/foo.liquid
@@ -0,0 +1 @@
+This is foo!
diff --git a/compat/views/layout_test/layout.liquid b/compat/views/layout_test/layout.liquid
@@ -0,0 +1 @@
+x {{ content }} x 
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
@@ -267,7 +267,7 @@ def render(engine, template, options={}, locals={})
 
       # render layout
       if layout && data = lookup_layout(engine, layout, views)
-        __send__("render_#{engine}", layout, data, options, {}) { output }
+        __send__("render_#{engine}", layout, data, options, locals) { output }
       else
         output
       end
