test/erb_test.rb in rtomayko-sinatra-0.8.9 vs test/erb_test.rb in rtomayko-sinatra-0.8.10

@@ -1,55 +1,50 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
 describe "ERB Templates" do
-  include Sinatra::Test
-
   def erb_app(&block)
     mock_app {
       set :views, File.dirname(__FILE__) + '/views'
       get '/', &block
     }
     get '/'
   end
 
   it 'renders inline ERB strings' do
     erb_app { erb '<%= 1 + 1 %>' }
-    should.be.ok
-    body.should.equal '2'
+    assert ok?
+    assert_equal '2', body
   end
 
   it 'renders .erb files in views path' do
     erb_app { erb :hello }
-    should.be.ok
-    body.should.equal "Hello World\n"
+    assert ok?
+    assert_equal "Hello World\n", body
   end
 
   it 'takes a :locals option' do
     erb_app {
       locals = {:foo => 'Bar'}
       erb '<%= foo %>', :locals => locals
     }
-    should.be.ok
-    body.should.equal 'Bar'
+    assert ok?
+    assert_equal 'Bar', body
   end
 
   it "renders with inline layouts" do
     mock_app {
       layout { 'THIS. IS. <%= yield.upcase %>!' }
       get('/') { erb 'Sparta' }
     }
     get '/'
-    should.be.ok
-    body.should.equal 'THIS. IS. SPARTA!'
+    assert ok?
+    assert_equal 'THIS. IS. SPARTA!', body
   end
 
   it "renders with file layouts" do
     erb_app {
       erb 'Hello World', :layout => :layout2
     }
-    should.be.ok
-    body.should.equal "ERB Layout!\nHello World\n"
+    assert ok?
+    assert_equal "ERB Layout!\nHello World\n", body
   end
-
 end