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

@@ -1,40 +1,36 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
 describe "Sass Templates" do
-  include Sinatra::Test
-
   def sass_app(&block)
     mock_app {
       set :views, File.dirname(__FILE__) + '/views'
       get '/', &block
     }
     get '/'
   end
 
   it 'renders inline Sass strings' do
     sass_app { sass "#sass\n  :background-color #FFF\n" }
-    should.be.ok
-    body.should.equal "#sass {\n  background-color: #FFF; }\n"
+    assert ok?
+    assert_equal "#sass {\n  background-color: #FFF; }\n", body
   end
 
   it 'renders .sass files in views path' do
     sass_app { sass :hello }
-    should.be.ok
-    body.should.equal "#sass {\n  background-color: #FFF; }\n"
+    assert ok?
+    assert_equal "#sass {\n  background-color: #FFF; }\n", body
   end
 
   it 'ignores the layout option' do
     sass_app { sass :hello, :layout => :layout2 }
-    should.be.ok
-    body.should.equal "#sass {\n  background-color: #FFF; }\n"
+    assert ok?
+    assert_equal "#sass {\n  background-color: #FFF; }\n", body
   end
 
   it "raises error if template not found" do
     mock_app {
       get('/') { sass :no_such_template }
     }
-    lambda { get('/') }.should.raise(Errno::ENOENT)
+    assert_raise(Errno::ENOENT) { get('/') }
   end
 end