test/builder_test.rb in bmizerany-sinatra-0.9.0 vs test/builder_test.rb in bmizerany-sinatra-0.9.0.2

@@ -1,68 +1,64 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
 describe "Builder Templates" do
-  include Sinatra::Test
-
   def builder_app(&block)
     mock_app {
       set :views, File.dirname(__FILE__) + '/views'
       get '/', &block
     }
     get '/'
   end
 
   it 'renders inline Builder strings' do
     builder_app { builder 'xml.instruct!' }
-    should.be.ok
-    body.should.equal %{<?xml version="1.0" encoding="UTF-8"?>\n}
+    assert ok?
+    assert_equal %{<?xml version="1.0" encoding="UTF-8"?>\n}, body
   end
 
   it 'renders inline blocks' do
     builder_app {
       @name = "Frank & Mary"
       builder do |xml|
         xml.couple @name
       end
     }
-    should.be.ok
-    body.should.equal "<couple>Frank &amp; Mary</couple>\n"
+    assert ok?
+    assert_equal "<couple>Frank &amp; Mary</couple>\n", body
   end
 
   it 'renders .builder files in views path' do
     builder_app {
       @name = "Blue"
       builder :hello
     }
-    should.be.ok
-    body.should.equal %(<exclaim>You're my boy, Blue!</exclaim>\n)
+    assert ok?
+    assert_equal %(<exclaim>You're my boy, Blue!</exclaim>\n), body
   end
 
   it "renders with inline layouts" do
     mock_app {
       layout do
         %(xml.layout { xml << yield })
       end
       get('/') { builder %(xml.em 'Hello World') }
     }
     get '/'
-    should.be.ok
-    body.should.equal "<layout>\n<em>Hello World</em>\n</layout>\n"
+    assert ok?
+    assert_equal "<layout>\n<em>Hello World</em>\n</layout>\n", body
   end
 
   it "renders with file layouts" do
     builder_app {
       builder %(xml.em 'Hello World'), :layout => :layout2
     }
-    should.be.ok
-    body.should.equal "<layout>\n<em>Hello World</em>\n</layout>\n"
+    assert ok?
+    assert_equal "<layout>\n<em>Hello World</em>\n</layout>\n", body
   end
 
   it "raises error if template not found" do
     mock_app {
       get('/') { builder :no_such_template }
     }
-    lambda { get('/') }.should.raise(Errno::ENOENT)
+    assert_raise(Errno::ENOENT) { get('/') }
   end
 end