bmizerany-sinatra 0.9.0 → 0.9.0.2

data/test/static_test.rb

@@ -1,13 +1,10 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
 describe 'Static' do
-  include Sinatra::Test
   F = ::File
 
   before do
-    @app = mock_app {
+    mock_app {
       set :static, true
       set :public, F.dirname(__FILE__)
     }
@@ -15,46 +12,46 @@ describe 'Static' do
 
   it 'serves GET requests for files in the public directory' do
     get "/#{F.basename(__FILE__)}"
-    should.be.ok
-    body.should.equal File.read(__FILE__)
-    response['Content-Length'].should.equal File.size(__FILE__).to_s
-    response.headers.should.include 'Last-Modified'
+    assert ok?
+    assert_equal File.read(__FILE__), body
+    assert_equal File.size(__FILE__).to_s, response['Content-Length']
+    assert response.headers.include?('Last-Modified')
   end
 
   it 'serves HEAD requests for files in the public directory' do
     head "/#{F.basename(__FILE__)}"
-    should.be.ok
-    body.should.be.empty
-    response['Content-Length'].should.equal File.size(__FILE__).to_s
-    response.headers.should.include 'Last-Modified'
+    assert ok?
+    assert_equal '', body
+    assert_equal File.size(__FILE__).to_s, response['Content-Length']
+    assert response.headers.include?('Last-Modified')
   end
 
   it 'serves files in preference to custom routes' do
     @app.get("/#{F.basename(__FILE__)}") { 'Hello World' }
     get "/#{F.basename(__FILE__)}"
-    should.be.ok
-    body.should.not.equal 'Hello World'
+    assert ok?
+    assert body != 'Hello World'
   end
 
   it 'does not serve directories' do
     get "/"
-    should.be.not_found
+    assert not_found?
   end
 
   it 'passes to the next handler when the static option is disabled' do
     @app.set :static, false
     get "/#{F.basename(__FILE__)}"
-    should.be.not_found
+    assert not_found?
   end
 
   it 'passes to the next handler when the public option is nil' do
     @app.set :public, nil
     get "/#{F.basename(__FILE__)}"
-    should.be.not_found
+    assert not_found?
   end
 
   it '404s when a file is not found' do
     get "/foobarbaz.txt"
-    should.be.not_found
+    assert not_found?
   end
 end

data/test/templates_test.rb

@@ -1,10 +1,6 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
 describe 'Templating' do
-  include Sinatra::Test
-
   def render_app(&block)
     mock_app {
       def render_test(template, data, options, &block)
@@ -28,48 +24,56 @@ describe 'Templating' do
 
   it 'renders String templates directly' do
     render_app { render :test, 'Hello World' }
-    should.be.ok
-    body.should.equal 'Hello World'
+    assert ok?
+    assert_equal 'Hello World', body
   end
 
   it 'renders Proc templates using the call result' do
     render_app { render :test, Proc.new {'Hello World'} }
-    should.be.ok
-    body.should.equal 'Hello World'
+    assert ok?
+    assert_equal 'Hello World', body
   end
 
   it 'looks up Symbol templates in views directory' do
     render_app { render :test, :hello }
-    should.be.ok
-    body.should.equal "Hello World!\n"
+    assert ok?
+    assert_equal "Hello World!\n", body
   end
 
   it 'uses the default layout template if not explicitly overridden' do
     with_default_layout do
       render_app { render :test, :hello }
-      should.be.ok
-      body.should.equal "Layout!\nHello World!\n"
+      assert ok?
+      assert_equal "Layout!\nHello World!\n", body
+    end
+  end
+
+  it 'uses the default layout template if not really overriden' do
+    with_default_layout do
+      render_app { render :test, :hello, :layout => true }
+      assert ok?
+      assert_equal "Layout!\nHello World!\n", body
     end
   end
 
   it 'uses the layout template specified' do
     render_app { render :test, :hello, :layout => :layout2 }
-    should.be.ok
-    body.should.equal "Layout 2!\nHello World!\n"
+    assert ok?
+    assert_equal "Layout 2!\nHello World!\n", body
   end
 
   it 'uses layout templates defined with the #template method' do
     render_app { render :test, :hello, :layout => :layout3 }
-    should.be.ok
-    body.should.equal "Layout 3!\nHello World!\n"
+    assert ok?
+    assert_equal "Layout 3!\nHello World!\n", body
   end
 
   it 'loads templates from source file with use_in_file_templates!' do
     mock_app {
       use_in_file_templates!
     }
-    @app.templates[:foo].should.equal "this is foo\n\n"
-    @app.templates[:layout].should.equal "X\n= yield\nX\n"
+    assert_equal "this is foo\n\n", @app.templates[:foo]
+    assert_equal "X\n= yield\nX\n", @app.templates[:layout]
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bmizerany-sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.0.2
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-06 00:00:00 -08:00
+date: 2009-01-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,10 +19,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.0
+        version: 0.9.1
     version: 
 description: Classy web-development dressed in a DSL
-email: 
+email: sinatrarb@googlegroups.com
 executables: []
 
 extensions: []
@@ -31,6 +31,7 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files: 
+- AUTHORS
 - CHANGES
 - LICENSE
 - README.rdoc
@@ -76,6 +77,7 @@ files:
 - lib/sinatra/images/500.png
 - lib/sinatra/main.rb
 - lib/sinatra/test.rb
+- lib/sinatra/test/bacon.rb
 - lib/sinatra/test/rspec.rb
 - lib/sinatra/test/spec.rb
 - lib/sinatra/test/unit.rb
@@ -86,6 +88,7 @@ files:
 - test/erb_test.rb
 - test/filter_test.rb
 - test/haml_test.rb
+- test/helper.rb
 - test/helpers_test.rb
 - test/mapped_error_test.rb
 - test/middleware_test.rb