github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix issue #425

Browse Source
This commit is contained in:
did 2012-05-30 15:41:11 -07:00
parent 763fe5215f
commit f4ee99b72b
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/locomotive/render.rb
View File

@ -53,7 +53,7 @@ module Locomotive
'url' => request.url, 'url' => request.url,
'now' => Time.now.utc, 'now' => Time.now.utc,
'today' => Date.today, 'today' => Date.today,
'locale' => I18n.locale, 'locale' => I18n.locale.to_s,
'default_locale' => current_site.default_locale.to_s, 'default_locale' => current_site.default_locale.to_s,
'locales' => current_site.locales, 'locales' => current_site.locales,
'current_user' => Locomotive::Liquid::Drops::CurrentUser.new(current_locomotive_account) 'current_user' => Locomotive::Liquid::Drops::CurrentUser.new(current_locomotive_account)

10
spec/lib/locomotive/render_spec.rb
View File

@ -14,16 +14,24 @@ describe 'Locomotive rendering system' do
context '#liquid_context' do context '#liquid_context' do
it 'includes the current date and time' do before(:each) do
@controller.instance_variable_set(:@page, @page) @controller.instance_variable_set(:@page, @page)
@controller.stubs(:flash).returns({}) @controller.stubs(:flash).returns({})
@controller.stubs(:params).returns({}) @controller.stubs(:params).returns({})
@controller.stubs(:request).returns(OpenStruct.new(:url => '/')) @controller.stubs(:request).returns(OpenStruct.new(:url => '/'))
end
it 'includes the current date and time' do
context = @controller.send(:locomotive_context) context = @controller.send(:locomotive_context)
context['now'].should_not be_blank context['now'].should_not be_blank
context['today'].should_not be_blank context['today'].should_not be_blank
end end
it 'includes the locale' do
context = @controller.send(:locomotive_context)
context['locale'].should == 'en'
end
end end
context 'setting the response' do context 'setting the response' do