From 10391968503fc669709ebefc4bae5891efba60a0 Mon Sep 17 00:00:00 2001 From: Blake Mizerany Date: Fri, 26 Oct 2007 15:45:00 -0700 Subject: [PATCH] Updated tests --- lib/sinatra/context/renderer.rb | 4 ++-- lib/sinatra/dsl.rb | 2 +- lib/sinatra/test/spec.rb | 1 + test/sinatra/dispatcher_test.rb | 4 ---- test/sinatra/event_test.rb | 4 ---- test/sinatra/filter_test.rb | 14 +------------- test/sinatra/haml_test.rb | 12 ------------ test/sinatra/renderer_test.rb | 5 ++--- test/sinatra/static_files_test.rb | 4 ---- test/sinatra/url_test.rb | 6 ++---- 10 files changed, 9 insertions(+), 47 deletions(-) diff --git a/lib/sinatra/context/renderer.rb b/lib/sinatra/context/renderer.rb index 56cbb4b..3ccfbc1 100644 --- a/lib/sinatra/context/renderer.rb +++ b/lib/sinatra/context/renderer.rb @@ -1,5 +1,3 @@ -Layouts = Hash.new # :nodoc: - module Sinatra # The magic or rendering happens here. This is included in Sinatra::EventContext on load. @@ -8,6 +6,8 @@ module Sinatra # create custom wrappers for your favorite rendering engines outside of erb and haml. module Renderer + + Layouts = Hash.new # :nodoc: DEFAULT_OPTIONS = { :views_directory => 'views', diff --git a/lib/sinatra/dsl.rb b/lib/sinatra/dsl.rb index c0d6cb3..201bf29 100644 --- a/lib/sinatra/dsl.rb +++ b/lib/sinatra/dsl.rb @@ -155,7 +155,7 @@ module Sinatra # get_it '/cooltrick' # => 'Cool wicked Trick' # def layout(name = :layout, options = {}) - Layouts[name] = unless block_given? + Sinatra::Renderer::Layouts[name] = unless block_given? File.read("%s/%s" % [options[:views_directory] || 'views', name]) else yield diff --git a/lib/sinatra/test/spec.rb b/lib/sinatra/test/spec.rb index 0a67d9f..ed7c26d 100644 --- a/lib/sinatra/test/spec.rb +++ b/lib/sinatra/test/spec.rb @@ -30,6 +30,7 @@ class Test::Spec::TestCase @testcase.setup do Sinatra::EventManager.reset! Sinatra::Event.reset! + Sinatra::Renderer::Layouts.clear end end end diff --git a/test/sinatra/dispatcher_test.rb b/test/sinatra/dispatcher_test.rb index f2ed55a..ee45fff 100644 --- a/test/sinatra/dispatcher_test.rb +++ b/test/sinatra/dispatcher_test.rb @@ -2,10 +2,6 @@ require File.dirname(__FILE__) + '/../helper' describe "When a dispatcher receives a request" do - before(:each) do - Sinatra::EventManager.reset! - end - it "should attend to the event" do Sinatra::Event.new(:get, '/') do diff --git a/test/sinatra/event_test.rb b/test/sinatra/event_test.rb index bf83ea0..20c552e 100644 --- a/test/sinatra/event_test.rb +++ b/test/sinatra/event_test.rb @@ -2,10 +2,6 @@ require File.dirname(__FILE__) + '/../helper' describe "Event" do - before(:each) do - Sinatra::EventManager.reset! - end - it "should return 500 if exception thrown" do Sinatra::Environment.prepare_loggers stub_everything diff --git a/test/sinatra/filter_test.rb b/test/sinatra/filter_test.rb index 2e0b096..0623ec7 100644 --- a/test/sinatra/filter_test.rb +++ b/test/sinatra/filter_test.rb @@ -1,19 +1,7 @@ require File.dirname(__FILE__) + '/../helper' context "Filter" do - - before(:each) do - @befores = Sinatra::Event.before_filters - Sinatra::Event.before_filters = [] - @afters = Sinatra::Event.after_filters - Sinatra::Event.after_filters = [] - end - - after(:each) do - Sinatra::Event.before_filters = @befores - Sinatra::Event.after_filters = @afters - end - + specify "befores can be in front" do before_attend :bar before_attend :foo, :infront => true diff --git a/test/sinatra/haml_test.rb b/test/sinatra/haml_test.rb index fbed4b0..2912ac6 100644 --- a/test/sinatra/haml_test.rb +++ b/test/sinatra/haml_test.rb @@ -3,18 +3,6 @@ require File.dirname(__FILE__) + '/../helper' context "Haml" do - before(:each) do - Sinatra::Event.before_filters.clear - Sinatra::Event.after_filters.clear - Sinatra::EventManager.reset! - end - - after(:each) do - Sinatra::Event.before_filters.clear - Sinatra::Event.after_filters.clear - Sinatra::EventManager.reset! - end - specify "does layouts" do layout do '%h1== Hello #{yield}' diff --git a/test/sinatra/renderer_test.rb b/test/sinatra/renderer_test.rb index 51abe06..f4ffca7 100644 --- a/test/sinatra/renderer_test.rb +++ b/test/sinatra/renderer_test.rb @@ -12,7 +12,6 @@ end describe "Renderer" do before(:each) do - Layouts.clear @context = Sinatra::EventContext.new(stub()) end @@ -29,10 +28,10 @@ describe "Renderer" do end it "should render default layout if it exists and layout if no layout name given" do - Layouts[:layout] = 'X <%= yield %> Y' + Sinatra::Renderer::Layouts[:layout] = 'X <%= yield %> Y' @context.render('foo', :foo).should.equal 'X foo Y' - Layouts[:foo] = 'Foo <%= yield %> Layout' + Sinatra::Renderer::Layouts[:foo] = 'Foo <%= yield %> Layout' @context.render('bar', :foo, :layout => :foo).should.equal 'Foo bar Layout' end diff --git a/test/sinatra/static_files_test.rb b/test/sinatra/static_files_test.rb index 22c72af..24aeb2e 100644 --- a/test/sinatra/static_files_test.rb +++ b/test/sinatra/static_files_test.rb @@ -3,10 +3,6 @@ require 'stringio' context "StaticEvent" do - before(:each) do - Sinatra::EventManager.reset! - end - specify "recognizes paths prefixed with it's path" do File.expects(:exists?).with('/x/bar/test.jpg').returns(true) File.expects(:file?).with('/x/bar/test.jpg').returns(true) diff --git a/test/sinatra/url_test.rb b/test/sinatra/url_test.rb index fa447b5..f340cdb 100644 --- a/test/sinatra/url_test.rb +++ b/test/sinatra/url_test.rb @@ -1,6 +1,7 @@ require File.dirname(__FILE__) + '/../helper' describe "Route" do + it "should recognize params in urls" do route = Sinatra::Route.new('/foo/:test/:blake') @@ -10,9 +11,6 @@ describe "Route" do route.recognize('/foo/bar/baz.xml').should.equal true route.params.should.equal :test => 'bar', :blake => 'baz', :format => 'xml' end - - # it "test" do - # p /^(\w)$|^(\w\.\w)$/.match('b').captures rescue 'NOTHING' - # end + end -- 2.11.4.GIT