padrino-core 0.12.0 → 0.12.1

data/test/test_mounter.rb

@@ -12,8 +12,8 @@ describe "Mounter" do
     $VERBOSE = @_verbose_was
   end
 
-  context 'for mounter functionality' do
-    should 'check methods' do
+  describe 'for mounter functionality' do
+    it 'should check methods' do
       mounter = Padrino::Mounter.new("test_app", :app_file => "/path/to/test.rb")
       mounter.to("/test_app")
       assert_kind_of Padrino::Mounter, mounter
@@ -27,14 +27,14 @@ describe "Mounter" do
       assert_equal Padrino.root, mounter.app_root
     end
 
-    should 'use app.root if available' do
+    it 'should use app.root if available' do
       require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/kiq')
       mounter = Padrino::Mounter.new("kiq", :app_class => "Kiq")
       mounter.to("/test_app")
       assert_equal '/weird', mounter.app_root
     end
 
-    should 'check locate_app_file with __FILE__' do
+    it 'should check locate_app_file with __FILE__' do
       mounter = Padrino::Mounter.new("test_app", :app_file => __FILE__)
       mounter.to("/test_app")
       assert_equal "test_app", mounter.name
@@ -44,14 +44,14 @@ describe "Mounter" do
       assert_equal File.dirname(mounter.app_file), mounter.app_root
     end
 
-    should 'mount an app' do
+    it 'should mount an app' do
       class ::AnApp < Padrino::Application; end
       Padrino.mount("an_app").to("/")
       assert_equal AnApp, Padrino.mounted_apps.first.app_obj
       assert_equal ["an_app"], Padrino.mounted_apps.map(&:name)
     end
 
-    should 'correctly mount an app in a namespace' do
+    it 'should correctly mount an app in a namespace' do
       module ::SomeNamespace
         class AnApp < Padrino::Application; end
       end
@@ -60,7 +60,7 @@ describe "Mounter" do
       assert_equal ["some_namespace/an_app"], Padrino.mounted_apps.map(&:name)
     end
 
-    should 'correctly set a name of a namespaced app' do
+    it 'should correctly set a name of a namespaced app' do
       module ::SomeNamespace2
         class AnApp < Padrino::Application
           get(:index) { settings.app_name }
@@ -71,7 +71,7 @@ describe "Mounter" do
       assert_equal "some_namespace2/an_app", res.body
     end
 
-    should 'mount a primary app to root uri' do
+    it 'should mount a primary app to root uri' do
       mounter = Padrino.mount("test_app", :app_file => __FILE__).to("/")
       assert_equal "test_app", mounter.name
       assert_equal "TestApp", mounter.app_class
@@ -81,7 +81,7 @@ describe "Mounter" do
       assert_equal File.dirname(mounter.app_file), mounter.app_root
     end
 
-    should 'mount a primary app to sub_uri' do
+    it 'should mount a primary app to sub_uri' do
       mounter = Padrino.mount("test_app", :app_file => __FILE__).to('/me')
       assert_equal "test_app", mounter.name
       assert_equal "TestApp", mounter.app_class
@@ -91,18 +91,18 @@ describe "Mounter" do
       assert_equal File.dirname(mounter.app_file), mounter.app_root
     end
 
-    should "raise error when app has no located file" do
+    it 'should raise error when app has no located file' do
       # TODO enabling this screws minitest
       # assert_raises(Padrino::Mounter::MounterException) { Padrino.mount("tester_app").to('/test') }
       assert_equal 0, Padrino.mounted_apps.size
     end
 
-    should "raise error when app has no located object" do
+    it 'should raise error when app has no located object' do
       assert_raises(Padrino::Mounter::MounterException) { Padrino.mount("tester_app", :app_file => "/path/to/file.rb").to('/test') }
       assert_equal 0, Padrino.mounted_apps.size
     end
 
-    should 'mount multiple apps' do
+    it 'should mount multiple apps' do
       class ::OneApp < Padrino::Application; end
       class ::TwoApp < Padrino::Application; end
 
@@ -118,7 +118,16 @@ describe "Mounter" do
       assert_equal ["one_app", "two_app"], Padrino.mounted_apps.map(&:name)
     end
 
-    should 'change mounted_root' do
+    it 'should mount app with the same name as the module' do
+      Padrino.mount("Demo::App",  :app_file => File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/demo_app.rb')).to("/app")
+      Padrino.mount("Demo::Demo", :app_file => File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/demo_demo.rb')).to("/")
+
+      Padrino.mounted_apps.each do |app|
+        assert_equal app.app_obj.setup_application!, true
+      end
+    end
+
+    it 'should change mounted_root' do
       Padrino.mounted_root = "fixtures"
       assert_equal Padrino.root("fixtures", "test", "app.rb"), Padrino.mounted_root("test", "app.rb")
       Padrino.mounted_root = "apps"
@@ -127,7 +136,7 @@ describe "Mounter" do
       assert_equal Padrino.root("test", "app.rb"), Padrino.mounted_root("test", "app.rb")
     end
 
-    should "be able to access routes data for mounted apps" do
+    it 'should be able to access routes data for mounted apps' do
       class ::OneApp < Padrino::Application
         get("/test") { "test" }
         get(:index, :provides => [:js, :json]) { "index" }
@@ -155,15 +164,18 @@ describe "Mounter" do
           put(:update) { "foo bar update" }
           delete(:destroy) { "foo bar delete" }
         end
+        controllers :test, :nested do
+          get(:test1){ "test1" }
+        end
       end
 
       Padrino.mount("one_app").to("/")
       Padrino.mount("two_app").to("/two_app")
 
       assert_equal 15, Padrino.mounted_apps[0].routes.size
-      assert_equal 14, Padrino.mounted_apps[1].routes.size
+      assert_equal 16, Padrino.mounted_apps[1].routes.size
       assert_equal 6, Padrino.mounted_apps[0].named_routes.size
-      assert_equal 10, Padrino.mounted_apps[1].named_routes.size
+      assert_equal 11, Padrino.mounted_apps[1].named_routes.size
 
       first_route = Padrino.mounted_apps[0].named_routes[3]
       assert_equal "posts show", first_route.identifier.to_s
@@ -181,9 +193,11 @@ describe "Mounter" do
       assert_equal "/\\/foo|\\/baz/", regexp_route.path
       foo_bar_route = Padrino.mounted_apps[1].named_routes[5]
       assert_equal "(:foo_bar, :index)", foo_bar_route.name
+      nested_route = Padrino.mounted_apps[1].named_routes[10]
+      assert_equal "(:test_nested, :test1)", nested_route.name
     end
     
-    should "configure cascade apps" do
+    it 'should configure cascade apps' do
       class ::App1 < Padrino::Application
         get(:index) { halt 404, 'index1' }
       end
@@ -200,7 +214,7 @@ describe "Mounter" do
       assert_equal 'index2', res.body
     end
 
-    should 'correctly instantiate a new padrino application' do
+    it 'should correctly instantiate a new padrino application' do
       mock_app do
         get("/demo_1"){ "Im Demo 1" }
         get("/demo_2"){ "Im Demo 2" }
@@ -212,7 +226,7 @@ describe "Mounter" do
       assert_equal "Im Demo 2", response.body
     end
 
-    should "not clobber the public setting when mounting an app" do
+    it 'should not clobber the public setting when mounting an app' do
       class ::PublicApp < Padrino::Application
         set :root, "/root"
         set :public_folder, File.expand_path(File.dirname(__FILE__))
@@ -224,7 +238,7 @@ describe "Mounter" do
       assert_equal File.read(__FILE__), res.body
     end
 
-    should "load apps from gems" do
+    it 'should load apps from gems' do
       spec_file = Padrino.root("fixtures", "app_gem", "app_gem.gemspec")
       spec = Gem::Specification.load(spec_file)
       spec.activate

data/test/test_reloader_complex.rb

@@ -3,14 +3,14 @@ require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/complex')
 
 describe "ComplexReloader" do
 
-  context 'for complex reload functionality' do
-    setup do
+  describe 'for complex reload functionality' do
+    before do
       Padrino.clear!
       Padrino.mount("complex_1_demo").to("/complex_1_demo")
       Padrino.mount("complex_2_demo").to("/complex_2_demo")
     end
 
-    should 'correctly instantiate Complex(1-2)Demo fixture' do
+    it 'should correctly instantiate Complex(1-2)Demo fixture' do
       assert_equal ["/complex_1_demo", "/complex_2_demo"], Padrino.mounted_apps.map(&:uri_root)
       assert_equal ["complex_1_demo", "complex_2_demo"], Padrino.mounted_apps.map(&:name)
       assert Complex1Demo.reload?
@@ -19,7 +19,7 @@ describe "ComplexReloader" do
       assert_match %r{fixtures/apps/complex.rb}, Complex2Demo.app_file
     end
 
-    should 'correctly reload Complex(1-2)Demo fixture' do
+    it 'should correctly reload Complex(1-2)Demo fixture' do
       assert_match %r{fixtures/apps/complex.rb}, Complex1Demo.app_file
       @app = Padrino.application
 
@@ -47,8 +47,7 @@ describe "ComplexReloader" do
       new_buffer.gsub!(/get\(:destroy\)/, 'get(:destroy, :with => :id)')
       begin
         File.open(Complex1Demo.app_file, "w") { |f| f.write(new_buffer) }
-        sleep 1.1 # We need at least a cooldown of 1 sec.
-        get "/complex_2_demo"
+        Time.stub(:now, Time.now + 2) { get "/complex_2_demo" }
         assert_equal new_phrase, body
 
         # Re-Check that we didn't forget any route

data/test/test_reloader_simple.rb

@@ -3,9 +3,9 @@ require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/simple')
 
 describe "SimpleReloader" do
 
-  context 'for simple reset functionality' do
+  describe 'for simple reset functionality' do
 
-    should 'reset routes' do
+    it 'should reset routes' do
       mock_app do
         (1..10).each do |i|
           get("/#{i}") { "Foo #{i}" }
@@ -22,7 +22,7 @@ describe "SimpleReloader" do
       end
     end
 
-    should 'keep sinatra routes on development' do
+    it 'should keep sinatra routes on development' do
       mock_app do
         set :environment, :development
         get("/"){ "ok" }
@@ -42,36 +42,39 @@ describe "SimpleReloader" do
     end
   end
 
-  context 'for simple reload functionality' do
-
-    should 'correctly instantiate SimpleDemo fixture' do
+  describe 'for simple reload functionality' do
+    before do
       Padrino.clear!
       Padrino.mount("simple_demo").to("/")
+      Padrino.reload!
+    end
+
+    it 'should correctly instantiate SimpleDemo fixture' do
       assert_equal ["simple_demo"], Padrino.mounted_apps.map(&:name)
       assert SimpleDemo.reload?
       assert_match %r{fixtures/apps/simple.rb}, SimpleDemo.app_file
     end
 
-    should_eventually 'correctly reload SimpleDemo fixture' do
-      # TODO fix this test
+    it 'should correctly reload SimpleDemo fixture' do
       @app = SimpleDemo
       get "/"
       assert ok?
       new_phrase = "The magick number is: #{rand(2**255)}!"
       buffer     = File.read(SimpleDemo.app_file)
       new_buffer = buffer.gsub(/The magick number is: \d+!/, new_phrase)
-      File.open(SimpleDemo.app_file, "w") { |f| f.write(new_buffer) }
-      sleep 1.1 # We need at least a cooldown of 1 sec.
-      get "/"
-      assert_equal new_phrase, body
-
-      # Now we need to prevent to commit a new changed file so we revert it
-      File.open(SimpleDemo.app_file, "w") { |f| f.write(buffer) }
-      Padrino.reload!
+      begin
+        File.open(SimpleDemo.app_file, "w") { |f| f.write(new_buffer) }
+        Time.stub(:now, Time.now + 2) { get "/" }
+        assert_equal new_phrase, body
+      ensure
+        File.open(SimpleDemo.app_file, "w") { |f| f.write(buffer) }
+        Padrino.reload!
+      end
     end
 
-    should 'correctly reset SimpleDemo fixture' do
+    it 'should correctly reset SimpleDemo fixture' do
       @app = SimpleDemo
+      get "/"
       @app.reload!
       get "/rand"
       assert ok?
@@ -81,17 +84,17 @@ describe "SimpleReloader" do
       assert_equal 2, @app.filters[:after].size # app + content-type + padrino-flash
       assert_equal 0, @app.middleware.size
       assert_equal 4, @app.routes.size # GET+HEAD of "/" + GET+HEAD of "/rand" = 4
-      assert_equal 3, @app.extensions.size # [Padrino::Routing, Padrino::Rendering, Padrino::Flash]
+      assert_equal 3, @app.extensions.size # [Padrino::ApplicationSetup, Padrino::Routing, Padrino::Flash]
       assert_equal 0, @app.templates.size
       @app.reload!
       get "/rand"
-      assert_not_equal last_body, body
+      refute_equal last_body, body
       assert_equal 2, @app.filters[:before].size # one is ours the other is default_filter for content type
       assert_equal 1, @app.errors.size
       assert_equal 2, @app.filters[:after].size
       assert_equal 0, @app.middleware.size
       assert_equal 4, @app.routes.size # GET+HEAD of "/" = 2
-      assert_equal 3, @app.extensions.size # [Padrino::Routing, Padrino::Rendering, Padrino::Flash]
+      assert_equal 3, @app.extensions.size # [Padrino::ApplicationSetup, Padrino::Routing, Padrino::Flash]
       assert_equal 0, @app.templates.size
     end
   end

data/test/test_reloader_system.rb

@@ -4,16 +4,19 @@ require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/system')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/static')
 
 describe "SystemReloader" do
-  context 'for wierd and difficult reload events' do
-    should 'reload system features if they were required only in helper' do
+  describe 'for wierd and difficult reload events' do
+    before do
       @app = SystemDemo
+      get '/'
+    end
+
+    it 'should reload system features if they were required only in helper' do
       @app.reload!
       get '/'
       assert_equal 'Resolv', body
     end
 
-    should 'reload children on parent change' do
-      @app = SystemDemo
+    it 'should reload children on parent change' do
       assert_equal Child.new.family, 'Danes'
       parent_file = File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/models/parent.rb')
       new_class = <<-DOC
@@ -42,7 +45,7 @@ describe "SystemReloader" do
       end
     end
 
-    should 'tamper with LOAD_PATH' do
+    it 'should tamper with LOAD_PATH' do
       SystemDemo.load_paths.each do |lib_dir|
         assert_includes $LOAD_PATH, lib_dir
       end
@@ -51,12 +54,12 @@ describe "SystemReloader" do
       end
     end
 
-    should 'not fail horribly on reload event with non-padrino apps' do
+    it 'should not fail horribly on reload event with non-padrino apps' do
       Padrino.mount("kiq").to("/")
       Padrino.reload!
     end
 
-    should 'not reload apps with disabled reload' do
+    it 'should not reload apps with disabled reload' do
       Padrino.mount(StaticDemo).to("/")
       Padrino.reload!
     end

data/test/test_restful_routing.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 describe "Routing" do
-  should 'perform restul routing' do
+  it 'should perform restul routing' do
     mock_app do
       controller :parent => :parents do
         get :index do

data/test/test_router.rb

@@ -7,7 +7,7 @@ describe "Router" do
     Padrino.clear!
   end
 
-  should "dispatch paths correctly" do
+  it 'should dispatch paths correctly' do
     app = lambda { |env|
       [200, {
         'X-ScriptName' => env['SCRIPT_NAME'],
@@ -69,7 +69,7 @@ describe "Router" do
     assert_equal "/", res["X-PathInfo"]
   end
 
-  should "dispatch requests to cascade mounted apps" do
+  it 'should dispatch requests to cascade mounted apps' do
     app = lambda { |env|
       scary = !!env['PATH_INFO'].match(/scary/)
       [scary ? 404 : 200, {
@@ -120,7 +120,7 @@ describe "Router" do
     assert_equal "/scary", res["X-PathInfo"]
   end
 
-  should "dispatch requests to cascade mounted apps and not cascade ok statuses" do
+  it 'should dispatch requests to cascade mounted apps and not cascade ok statuses' do
 
     api = mock_app do
       get 'scary' do
@@ -158,7 +158,7 @@ describe "Router" do
 
   end
 
-  should "dispatch requests to cascade mounted apps until it sees a cascade == false or []g" do
+  it 'should dispatch requests to cascade mounted apps until it sees a cascade == false or []g' do
     app = mock_app do
       get 'scary' do
         ""
@@ -188,7 +188,7 @@ describe "Router" do
     assert request_case.call.ok?
   end
 
-  should "dispatches hosts correctly" do
+  it 'should dispatches hosts correctly' do
     map = Padrino::Router.new(
      { :host => "foo.org", :to => lambda { |env|
        [200,
@@ -226,7 +226,7 @@ describe "Router" do
      assert_equal "subdomain.foo.org", res["X-Position"]
   end
 
-  should "works with padrino core applications" do
+  it 'should works with padrino core applications' do
     Padrino.mount("simple_demo").host("padrino.org")
     assert_equal ["simple_demo"], Padrino.mounted_apps.map(&:name)
     assert_equal ["padrino.org"], Padrino.mounted_apps.map(&:app_host)
@@ -241,7 +241,7 @@ describe "Router" do
     assert res.ok?
   end
 
-  should "works with padrino applications" do
+  it 'should works with padrino applications' do
     Padrino.mount("simple_demo").to("/foo").host(/.*\.padrino.org/)
 
     res = Rack::MockRequest.new(Padrino.application).get("/")

data/test/test_routing.rb

@@ -5,12 +5,11 @@ class FooError < RuntimeError; end
 
 
 describe "Routing" do
-  setup do
-    Padrino::Application.send(:register, Padrino::Rendering)
-    Padrino::Rendering::DEFAULT_RENDERING_OPTIONS[:strict_format] = false
+  before do
+    Padrino.clear!
   end
 
-  should "serve static files with simple cache control" do
+  it 'should serve static files with simple cache control' do
     mock_app do
       set :static_cache_control, :public
       set :public_folder, File.dirname(__FILE__)
@@ -20,7 +19,7 @@ describe "Routing" do
     assert_equal headers['Cache-Control'], 'public'
   end # static simple
 
-  should "serve static files with cache control and max_age" do
+  it 'should serve static files with cache control and max_age' do
     mock_app do
       set :static_cache_control, [:public, :must_revalidate, {:max_age => 300}]
       set :public_folder, File.dirname(__FILE__)
@@ -30,7 +29,7 @@ describe "Routing" do
     assert_equal headers['Cache-Control'], 'public, must-revalidate, max-age=300'
   end # static max_age
 
-  should 'ignore trailing delimiters for basic route' do
+  it 'should ignore trailing delimiters for basic route' do
     mock_app do
       get("/foo"){ "okey" }
       get(:test) { "tester" }
@@ -45,7 +44,7 @@ describe "Routing" do
     assert_equal "tester", body
   end
 
-  should 'fail with unrecognized route exception when not found' do
+  it 'should fail with unrecognized route exception when not found' do
     mock_app do
       get(:index){ "okey" }
     end
@@ -56,7 +55,7 @@ describe "Routing" do
     }
   end
 
-  should 'fail with unrecognized route exception when namespace is invalid' do
+  it 'should fail with unrecognized route exception when namespace is invalid' do
     mock_app do
       controller :foo_bar do
         get(:index){ "okey" }
@@ -82,7 +81,7 @@ describe "Routing" do
     }
   end
 
-  should 'accept regexp routes' do
+  it 'should accept regexp routes' do
     mock_app do
       get(%r./fob|/baz.) { "regexp" }
       get("/foo")        { "str" }
@@ -105,14 +104,14 @@ describe "Routing" do
     assert_equal "My lucky number: 99 99", body
   end
 
-  should 'accept regexp routes with generate with :generate_with' do
+  it 'should accept regexp routes with generate with :generate_with' do
     mock_app do
       get(%r{/fob|/baz}, :name => :foo, :generate_with => '/fob') { "regexp" }
     end
     assert_equal "/fob", @app.url(:foo)
   end
 
-  should "parse routes with question marks" do
+  it 'should parse routes with question marks' do
     mock_app do
       get("/foo/?"){ "okey" }
       post('/unauthenticated/?') { "no access" }
@@ -127,7 +126,7 @@ describe "Routing" do
     assert_equal "no access", body
   end
 
-  should 'parse routes that are encoded' do
+  it 'should parse routes that are encoded' do
     mock_app do
       get('/щч') { 'success!' }
     end
@@ -135,7 +134,7 @@ describe "Routing" do
     assert_equal 'success!', body
   end
 
-  should 'parse routes that include encoded slash' do
+  it 'should parse routes that include encoded slash' do
     mock_app do
       get('/:drive_alias/:path', :path => /.*/){
         "Show #{params[:drive_alias]} and #{params[:path]}"
@@ -145,7 +144,7 @@ describe "Routing" do
     assert_equal "Show drive/foo and some/path", body
   end
 
-  should 'encode params using UTF-8' do
+  it 'should encode params using UTF-8' do
     mock_app do
       get('/:foo') { params[:foo].encoding.name }
     end
@@ -153,7 +152,7 @@ describe "Routing" do
     assert_equal 'UTF-8', body
   end
 
-  should 'match correctly similar paths' do
+  it 'should match correctly similar paths' do
     mock_app do
       get("/my/:foo_id"){ params[:foo_id] }
       get("/my/:bar_id/bar"){ params[:bar_id] }
@@ -164,7 +163,7 @@ describe "Routing" do
     assert_equal "2", body
   end
 
-  should "match user agents" do
+  it 'should match user agents' do
     app = mock_app do
       get("/main", :agent => /IE/){ "hello IE" }
       get("/main"){ "hello" }
@@ -175,7 +174,7 @@ describe "Routing" do
     assert_equal "hello IE", body
   end
 
-  should "use regex for parts of a route" do
+  it 'should use regex for parts of a route' do
     app = mock_app do
       get("/main/:id", :id => /\d+/){ "hello #{params[:id]}" }
     end
@@ -185,7 +184,7 @@ describe "Routing" do
     assert_equal 404, status
   end
 
-  should "parse params when use regex for parts of a route" do
+  it 'should parse params when use regex for parts of a route' do
     mock_app do
       post :index, :with => [:foo, :bar], :bar => /.+/ do
         "show #{params[:foo]}"
@@ -199,7 +198,7 @@ describe "Routing" do
     assert_equal "show 5 and 2", body
   end
 
-  should "not generate overlapping head urls" do
+  it 'should not generate overlapping head urls' do
     app = mock_app do
       get("/main"){ "hello" }
       post("/main"){ "hello" }
@@ -210,7 +209,7 @@ describe "Routing" do
     assert_equal "POST", app.routes[2].request_methods.first
   end
 
-  should 'generate basic urls' do
+  it 'should generate basic urls' do
     mock_app do
       get(:foo){ "/foo" }
       get(:foo, :with => :id){ |id| "/foo/#{id}" }
@@ -247,7 +246,7 @@ describe "Routing" do
     assert_equal "4", body
   end
 
-  should 'generate url with format' do
+  it 'should generate url with format' do
     mock_app do
       get(:a, :provides => :any){ url(:a, :format => :json) }
       get(:b, :provides => :js){ url(:b, :format => :js) }
@@ -274,7 +273,7 @@ describe "Routing" do
     assert_equal 404, status
   end
 
-  should 'generate absolute urls' do
+  it 'should generate absolute urls' do
     mock_app do
       get(:hash, :with => :id){ absolute_url(:hash, :id => 1) }
     end
@@ -284,7 +283,7 @@ describe "Routing" do
     assert_equal "https://example.org/hash/1", body
   end
 
-  should 'generate absolute urls from stringified keys' do
+  it 'should generate absolute urls from stringified keys' do
     mock_app do
       get(:hash, with: :id) { absolute_url(:hash, "id" => 1) }
     end
@@ -292,7 +291,7 @@ describe "Routing" do
     assert_equal "http://example.org/hash/1", body
   end
 
-  should 'generate proper absolute urls for mounted apps' do
+  it 'should generate proper absolute urls for mounted apps' do
     class Test < Padrino::Application
       get :foo do
         absolute_url(:foo, :id => 1)
@@ -304,7 +303,7 @@ describe "Routing" do
     assert_equal 'http://example.org/test/foo?id=1', body
   end
 
-  should 'rebase simple string urls to app uri_root' do
+  it 'should rebase simple string urls to app uri_root' do
     mock_app do
       set :uri_root, '/app'
       get(:a){ url('/foo') }
@@ -322,7 +321,7 @@ describe "Routing" do
     assert_equal "http://example.org/app/d/e/bar", body
   end
 
-  should 'allow regex url with format' do
+  it 'should allow regex url with format' do
     mock_app do
       get(/.*/, :provides => :any) { "regexp" }
     end
@@ -330,14 +329,14 @@ describe "Routing" do
     assert_equal "regexp", body
   end
 
-  should 'use padrino url method' do
+  it 'should use padrino url method' do
     mock_app do
     end
 
     assert_equal @app.method(:url).owner, Padrino::Routing::ClassMethods
   end
 
-  should 'work correctly with sinatra redirects' do
+  it 'should work correctly with sinatra redirects' do
     mock_app do
       get(:index)  { redirect url(:index) }
       get(:google) { redirect "http://google.com" }
@@ -353,7 +352,7 @@ describe "Routing" do
     assert_equal "http://example.org/bar", headers['Location']
   end
 
-  should "return 406 on Accept-Headers it does not provide" do
+  it 'should return 406 on Accept-Headers it does not provide' do
     mock_app do
       get(:a, :provides => [:html, :js]){ content_type }
     end
@@ -362,7 +361,7 @@ describe "Routing" do
     assert_equal 406, status
   end
 
-  should "return 406 on file extensions it does not provide and flag is set" do
+  it 'should return 406 on file extensions it does not provide and flag is set' do
     mock_app do
       enable :treat_format_as_accept
       get(:a, :provides => [:html, :js]){ content_type }
@@ -372,7 +371,7 @@ describe "Routing" do
     assert_equal 406, status
   end
 
-  should "return 404 on file extensions it does not provide and flag is not set" do
+  it 'should return 404 on file extensions it does not provide and flag is not set' do
     mock_app do
       get(:a, :provides => [:html, :js]){ content_type }
     end
@@ -381,7 +380,7 @@ describe "Routing" do
     assert_equal 404, status
   end
 
-  should "not set content_type to :html if Accept */* and html not in provides" do
+  it 'should not set content_type to :html if Accept */* and html not in provides' do
     mock_app do
       get("/foo", :provides => [:json, :xml]) { content_type.to_s }
     end
@@ -390,7 +389,7 @@ describe "Routing" do
     assert_equal 'json', body
   end
 
-  should "set content_type to :json if Accept contains */*" do
+  it 'should set content_type to :json if Accept contains */*' do
     mock_app do
       get("/foo", :provides => [:json]) { content_type.to_s }
     end
@@ -399,7 +398,7 @@ describe "Routing" do
     assert_equal 'json', body
   end
 
-  should 'set and get content_type' do
+  it 'should set and get content_type' do
     mock_app do
       get("/foo"){ content_type(:json); content_type.to_s }
     end
@@ -408,7 +407,7 @@ describe "Routing" do
     assert_equal 'json', body
   end
 
-  should "send the appropriate number of params" do
+  it 'should send the appropriate number of params' do
     mock_app do
       get('/id/:user_id', :provides => [:json]) { |user_id, format| user_id}
     end
@@ -416,7 +415,7 @@ describe "Routing" do
     assert_equal '5', body
   end
 
-  should "allow .'s in param values" do
+  it 'should allow "." in param values' do
     skip # TODO fix this?
     mock_app do
       get('/id/:email', :provides => [:json]) { |email, format| [email, format] * '/' }
@@ -425,7 +424,7 @@ describe "Routing" do
     assert_equal 'foo@bar.com/json', body
   end
 
-  should "set correct content_type for Accept not equal to */* even if */* also provided" do
+  it 'should set correct content_type for Accept not equal to */* even if */* also provided' do
     mock_app do
       get("/foo", :provides => [:html, :js, :xml]) { content_type.to_s }
     end
@@ -434,7 +433,7 @@ describe "Routing" do
     assert_equal 'js', body
   end
 
-  should "return the first content type in provides if accept header is empty" do
+  it 'should return the first content type in provides if accept header is empty' do
     mock_app do
       get(:a, :provides => [:js]){ content_type.to_s }
     end
@@ -443,7 +442,7 @@ describe "Routing" do
     assert_equal "js", body
   end
 
-  should "not default to HTML if HTML is not provided and no type is given" do
+  it 'should not default to HTML if HTML is not provided and no type is given' do
     mock_app do
       get(:a, :provides => [:js]){ content_type }
     end
@@ -452,7 +451,7 @@ describe "Routing" do
     assert_equal "application/javascript;charset=utf-8", content_type
   end
 
-  should "not match routes if url_format and http_accept is provided but not included" do
+  it 'should not match routes if url_format and http_accept is provided but not included' do
     mock_app do
       get(:a, :provides => [:js, :html]){ content_type }
     end
@@ -461,7 +460,7 @@ describe "Routing" do
     assert_equal 404, status
   end
 
-  should "generate routes for format simple" do
+  it 'should generate routes for format simple' do
     mock_app do
       get(:foo, :provides => [:html, :rss]) { render :haml, "Test" }
     end
@@ -471,7 +470,7 @@ describe "Routing" do
     assert_equal "Test\n", body
   end
 
-  should "should inject the controller name into the request" do
+  it 'should inject the controller name into the request' do
     mock_app do
       controller :posts do
         get(:index) { request.controller }
@@ -486,7 +485,7 @@ describe "Routing" do
     assert_equal "mini", body
   end
 
-  should "should inject the action name into the request" do
+  it 'should inject the action name into the request' do
     mock_app do
       controller :posts do
         get('/omnomnom(/:id)') { request.action.inspect }
@@ -501,7 +500,7 @@ describe "Routing" do
     assert_equal ":a", body
   end
 
-  should "support not_found" do
+  it 'should support not_found' do
     mock_app do
       not_found { 'whatever' }
 
@@ -517,7 +516,7 @@ describe "Routing" do
     assert_equal 200, status
   end
 
-  should "should inject the route into the request" do
+  it 'should inject the route into the request' do
     mock_app do
       controller :posts do
         get(:index) { request.route_obj.name.to_s }
@@ -527,7 +526,7 @@ describe "Routing" do
     assert_equal "posts index", body
   end
 
-  should "preserve the format if you set it manually" do
+  it 'should preserve the format if you set it manually' do
     mock_app do
       before do
         params[:format] = "json"
@@ -545,7 +544,7 @@ describe "Routing" do
     assert_equal ":json", body
   end
 
-  should "correctly accept '.' in the route" do
+  it 'should correctly accept "." in the route' do
     mock_app do
       get "test.php", :provides => [:html, :json] do
         content_type.inspect
@@ -557,7 +556,7 @@ describe "Routing" do
     assert_equal ":json", body
   end
 
-  should "correctly accept priority of format" do
+  it 'should correctly accept priority of format' do
     mock_app do
       get "test.php", :provides => [:html, :json, :xml] do
         content_type.inspect
@@ -574,7 +573,7 @@ describe "Routing" do
     assert_equal ":json", body
   end
 
-  should "generate routes for format with controller" do
+  it 'should generate routes for format with controller' do
     mock_app do
       controller :posts do
         get(:index, :provides => [:html, :rss, :atom, :js]) { render :haml, "Index.#{content_type}" }
@@ -597,7 +596,7 @@ describe "Routing" do
     assert_equal "Show.atom\n", body
   end
 
-  should 'map routes' do
+  it 'should map routes' do
     mock_app do
       get(:bar){ "bar" }
     end
@@ -606,7 +605,7 @@ describe "Routing" do
     assert_equal "/bar", @app.url(:bar)
   end
 
-  should 'remove index from path' do
+  it 'should remove index from path' do
     mock_app do
       get(:index){ "index" }
       get("/accounts/index"){ "accounts" }
@@ -618,7 +617,7 @@ describe "Routing" do
     assert_equal "accounts", body
   end
 
-  should 'remove index from path with params' do
+  it 'should remove index from path with params' do
     mock_app do
       get(:index, :with => :name){ "index with #{params[:name]}" }
     end
@@ -627,7 +626,7 @@ describe "Routing" do
     assert_equal "/john", @app.url(:index, :name => "john")
   end
 
-  should 'parse named params' do
+  it 'should parse named params' do
     mock_app do
       get(:print, :with => :id){ "Im #{params[:id]}" }
     end
@@ -636,7 +635,7 @@ describe "Routing" do
     assert_equal "/print/9", @app.url(:print, :id => 9)
   end
 
-  should '405 on wrong request_method' do
+  it 'should 405 on wrong request_method' do
     mock_app do
       post('/bar'){ "bar" }
     end
@@ -644,7 +643,7 @@ describe "Routing" do
     assert_equal 405, status
   end
 
-  should 'respond to' do
+  it 'should respond to' do
     mock_app do
       get(:a, :provides => :js){ "js" }
       get(:b, :provides => :any){ "any" }
@@ -673,7 +672,7 @@ describe "Routing" do
     assert_equal "html,js", body
   end
 
-  should 'respond_to and set content_type' do
+  it 'should respond_to and set content_type' do
     Rack::Mime::MIME_TYPES['.foo'] = 'application/foo'
     mock_app do
       get :a, :provides => :any do
@@ -699,7 +698,7 @@ describe "Routing" do
     assert_equal 'text/html;charset=utf-8', response["Content-Type"]
   end
 
-  should 'use controllers' do
+  it 'should use controllers' do
     mock_app do
       controller "/admin" do
         get("/"){ "index" }
@@ -712,7 +711,7 @@ describe "Routing" do
     assert_equal "show 1", body
   end
 
-  should 'use named controllers' do
+  it 'should use named controllers' do
     mock_app do
       controller :admin do
         get(:index, :with => :id){ params[:id] }
@@ -732,7 +731,7 @@ describe "Routing" do
     assert_equal "foo_bar_index", body
   end
 
-  should 'use map and with' do
+  it 'should use map and with' do
     mock_app do
       get :index, :map => '/bugs', :with => :id do
         params[:id]
@@ -743,7 +742,7 @@ describe "Routing" do
     assert_equal "/bugs/4", @app.url(:index, :id => 4)
   end
 
-  should "ignore trailing delimiters within a named controller" do
+  it 'should ignore trailing delimiters within a named controller' do
     mock_app do
       controller :posts do
         get(:index, :provides => [:html, :js]){ "index" }
@@ -765,7 +764,7 @@ describe "Routing" do
     assert_equal "new", body
   end
 
-  should "ignore trailing delimiters within a named controller for unnamed actions" do
+  it 'should ignore trailing delimiters within a named controller for unnamed actions' do
     mock_app do
       controller :accounts do
         get("/") { "account_index" }
@@ -789,7 +788,7 @@ describe "Routing" do
     assert_equal "vote_index", body
   end
 
-  should 'use named controllers with array routes' do
+  it 'should use named controllers with array routes' do
     mock_app do
       controller :admin do
         get(:index){ "index" }
@@ -809,7 +808,7 @@ describe "Routing" do
     assert_equal "foo_bar_index", body
   end
 
-  should "support a reindex action and remove index inside controller" do
+  it 'should support a reindex action and remove index inside controller' do
     mock_app do
       controller :posts do
         get(:index){ "index" }
@@ -823,7 +822,7 @@ describe "Routing" do
     assert_equal "reindex", body
   end
 
-  should 'use uri_root' do
+  it 'should use uri_root' do
     mock_app do
       get(:foo){ "foo" }
     end
@@ -837,7 +836,7 @@ describe "Routing" do
     assert_equal "/testing/bar/foo", @app.url(:foo)
   end
 
-  should 'use uri_root with controllers' do
+  it 'should use uri_root with controllers' do
     mock_app do
       controller :foo do
         get(:bar){ "bar" }
@@ -847,7 +846,7 @@ describe "Routing" do
     assert_equal "/testing/foo/bar", @app.url(:foo, :bar)
   end
 
-  should 'use RACK_BASE_URI' do
+  it 'should use RACK_BASE_URI' do
     mock_app do
       get(:foo){ "foo" }
     end
@@ -859,7 +858,7 @@ describe "Routing" do
     ENV['RACK_BASE_URI'] = nil
   end
 
-  should 'reset routes' do
+  it 'should reset routes' do
     mock_app do
       get("/"){ "foo" }
       reset_router!
@@ -868,7 +867,7 @@ describe "Routing" do
     assert_equal 404, status
   end
 
-  should "match params and format" do
+  it 'should match params and format' do
     app = mock_app do
       get '/:id', :provides => [:json, :html] do |id, _|
         id
@@ -887,7 +886,7 @@ describe "Routing" do
   end
 
 
-  should 'respect priorities' do
+  it 'should respect priorities' do
     route_order = []
     mock_app do
       get(:index, :priority => :normal) { route_order << :normal; pass }
@@ -899,7 +898,7 @@ describe "Routing" do
     assert_equal "hello", body
   end
 
-  should 'catch all after controllers' do
+  it 'should catch all after controllers' do
     mock_app do
       get(:index, :with => :slug, :priority => :low) { "catch all" }
       controllers :contact do
@@ -912,7 +911,7 @@ describe "Routing" do
     assert_equal "catch all", body
   end
 
-  should 'allow optionals' do
+  it 'should allow optionals' do
     mock_app do
       get(:show, :map => "/stories/:type(/:category)") do
         "#{params[:type]}/#{params[:category]}"
@@ -924,7 +923,7 @@ describe "Routing" do
     assert_equal "foo/bar", body
   end
 
-  should 'apply maps' do
+  it 'should apply maps' do
     mock_app do
       controllers :admin do
         get(:index, :map => "/"){ "index" }
@@ -945,7 +944,7 @@ describe "Routing" do
     assert_equal "wacky 1-2", body
   end
 
-  should 'apply maps when given path is kind of hash' do
+  it 'should apply maps when given path is kind of hash' do
     mock_app do
       controllers :admin do
         get(:foobar, "/foo/bar"){ "foobar" }
@@ -955,7 +954,7 @@ describe "Routing" do
     assert_equal "foobar", body
   end
 
-  should "apply parent to route" do
+  it 'should apply parent to route' do
     mock_app do
       controllers :project do
         get(:index, :parent => :user) { "index #{params[:user_id]}" }
@@ -974,7 +973,7 @@ describe "Routing" do
     assert_equal "show 3 1 2", body
   end
 
-  should "respect parent precedence: controllers parents go before route parents" do
+  it 'should respect parent precedence: controllers parents go before route parents' do
     mock_app do
       controllers :project do
         get(:index, :parent => :user) { "index #{params[:user_id]}" }
@@ -994,7 +993,7 @@ describe "Routing" do
     assert_equal "index on foo 1 @ baz 2 @ bar", body
   end
 
-  should "keep a reference to the parent on the route" do
+  it 'should keep a reference to the parent on the route' do
     mock_app do
       controllers :project do
         get(:index, :parent => :user) { "index #{params[:user_id]}" }
@@ -1023,7 +1022,7 @@ describe "Routing" do
     assert_equal [:foo, :baz], @app.routes[10].parent
   end
 
-  should "apply parent to controller" do
+  it 'should apply parent to controller' do
     mock_app do
       controller :project, :parent => :user do
         get(:index) { "index #{params[:user_id]}"}
@@ -1048,7 +1047,7 @@ describe "Routing" do
     assert_equal user_product_project_url, @app.url(:project, :show, :user_id => 1, :product_id => 2, :id => 3)
   end
 
-  should "apply parent with shallowing to controller" do
+  it 'should apply parent with shallowing to controller' do
     mock_app do
       controller :project do
         parent :user
@@ -1093,7 +1092,7 @@ describe "Routing" do
     assert_equal user_product_project_url, @app.url(:project, :show, :user_id => 1, :product_id => 2, :id => 3, :shop_id => 1)
   end
 
-  should "respect map in parents with shallowing" do
+  it 'should respect map in parents with shallowing' do
     mock_app do
       controller :project do
         parent :shop, :map => "/foo/bar"
@@ -1107,7 +1106,7 @@ describe "Routing" do
     assert_equal shop_project_url, @app.url(:project, :index, :shop_id => 1)
   end
 
-  should "use default values" do
+  it 'should use default values' do
     mock_app do
       controller :lang => :it do
         get(:index, :map => "/:lang") { "lang is #{params[:lang]}" }
@@ -1122,7 +1121,7 @@ describe "Routing" do
     assert_equal "lang is en", body
   end
 
-  should "transitions to the next matching route on pass" do
+  it 'should transitions to the next matching route on pass' do
     mock_app do
       get '/:foo' do
         pass
@@ -1137,7 +1136,43 @@ describe "Routing" do
     assert_equal 'Hello World', body
   end
 
-  should "filters by accept header" do
+  it 'should filters by media type' do
+    mock_app do
+      get '/foo', :accepts => [:xml, :json] do
+        request.env['CONTENT_TYPE']
+      end
+    end
+
+    get '/foo', {}, { 'CONTENT_TYPE' => 'application/xml' }
+    assert ok?
+    assert_equal 'application/xml', body
+    assert_equal 'application/xml;charset=utf-8', response.headers['Content-Type']
+    get '/foo'
+    assert_equal 406, status
+    get '/foo.xml'
+    assert_equal 404, status
+
+    get '/foo', {}, { 'CONTENT_TYPE' => 'application/json' }
+    assert ok?
+    assert_equal 'application/json', body
+    assert_equal 'application/json', response.headers['Content-Type']
+  end
+
+  it 'should filters by media type when using :accepts as controller option' do
+    mock_app do
+      controller accepts: [:xml, :js] do
+        get '/foo' do
+          request.env['CONTENT_TYPE']
+        end
+      end
+    end
+
+    get '/foo', {}, { 'CONTENT_TYPE' => 'application/javascript' }
+    assert ok?
+    assert_equal 'application/javascript', body
+  end
+
+  it 'should filters by accept header' do
     mock_app do
       get '/foo', :provides => [:xml, :js] do
         request.env['HTTP_ACCEPT']
@@ -1166,7 +1201,7 @@ describe "Routing" do
     assert_equal 406, status
   end
 
-  should "does not allow global provides" do
+  it 'should does not allow global provides' do
     mock_app do
       provides :xml
 
@@ -1183,7 +1218,7 @@ describe "Routing" do
     assert_equal 'Bar in nil', body
   end
 
-  should "does not allow global provides in controller" do
+  it 'should does not allow global provides in controller' do
     mock_app do
       controller :base do
         provides :xml
@@ -1202,7 +1237,7 @@ describe "Routing" do
     assert_equal 'Bar in nil', body
   end
 
-  should "map non named routes in controllers" do
+  it 'should map non named routes in controllers' do
     mock_app do
       controller :base do
         get("/foo") { "ok" }
@@ -1216,7 +1251,7 @@ describe "Routing" do
     assert ok?
   end
 
-  should "set content_type to :html for both empty Accept as well as Accept text/html" do
+  it 'should set content_type to :html for both empty Accept as well as Accept text/html' do
     mock_app do
       provides :html
 
@@ -1230,7 +1265,7 @@ describe "Routing" do
     assert_equal 'html', body
   end
 
-  should "set content_type to :html if Accept */*" do
+  it 'should set content_type to :html if Accept */*' do
     mock_app do
       get("/foo", :provides => [:html, :js]) { content_type.to_s }
     end
@@ -1241,7 +1276,7 @@ describe "Routing" do
     assert_equal 'html', body
   end
 
-  should "set content_type to :js if Accept includes both application/javascript and */*;q=0.5" do
+  it 'should set content_type to :js if Accept includes both application/javascript and */*;q=0.5' do
     mock_app do
       get("/foo", :provides => [:html, :js]) { content_type.to_s }
     end
@@ -1249,7 +1284,7 @@ describe "Routing" do
     assert_equal 'js', body
   end
 
-  should "set content_type to :html if Accept */* and provides of :any" do
+  it 'should set content_type to :html if Accept */* and provides of :any' do
     mock_app do
       get("/foo", :provides => :any) { content_type.to_s }
     end
@@ -1258,7 +1293,7 @@ describe "Routing" do
     assert_equal 'html', body
   end
 
-  should "set content_type to :js if Accept includes both application/javascript, */*;q=0.5 and provides of :any" do
+  it 'should set content_type to :js if Accept includes both application/javascript, */*;q=0.5 and provides of :any' do
     mock_app do
       get("/foo", :provides => :any) { content_type.to_s }
     end
@@ -1267,7 +1302,7 @@ describe "Routing" do
     assert_equal 'js', body
   end
 
-  should 'allows custom route-conditions to be set via route options and halt' do
+  it 'should allows custom route-conditions to be set via route options and halt' do
     protector = Module.new do
       def protect(*args)
         condition {
@@ -1301,7 +1336,7 @@ describe "Routing" do
     assert_equal "hey", body
   end
 
-  should 'allows custom route-conditions to be set via route options using two routes' do
+  it 'should allows custom route-conditions to be set via route options using two routes' do
     protector = Module.new do
       def protect(*args)
         condition { authorize(params["user"], params["password"]) }
@@ -1334,7 +1369,7 @@ describe "Routing" do
     assert_equal "hey", body
   end
 
-  should "allow concise routing" do
+  it 'should allow concise routing' do
     mock_app do
       get :index, ":id" do
         params[:id]
@@ -1352,7 +1387,7 @@ describe "Routing" do
     assert_equal "123", body
   end
 
-  should "support halting with 404 and message" do
+  it 'should support halting with 404 and message' do
     mock_app do
       controller do
         get :index do
@@ -1366,7 +1401,7 @@ describe "Routing" do
     assert_equal "not found", body
   end
 
-  should "allow passing & halting in before filters" do
+  it 'should allow passing & halting in before filters' do
     mock_app do
       controller do
         before { env['QUERY_STRING'] == 'secret' or pass }
@@ -1394,7 +1429,7 @@ describe "Routing" do
     assert_equal "index", body
   end
 
-  should 'scope filters in the given controller' do
+  it 'should scope filters in the given controller' do
     mock_app do
       before { @global = 'global' }
       after { @global = nil }
@@ -1424,7 +1459,7 @@ describe "Routing" do
     assert_equal "global", body
   end
 
-  should 'works with optionals params' do
+  it 'should works with optionals params' do
     mock_app do
       get("/foo(/:bar)") { params[:bar] }
     end
@@ -1436,7 +1471,7 @@ describe "Routing" do
     assert_equal "", body
   end
 
-  should 'work with multiple dashed params' do
+  it 'should work with multiple dashed params' do
     mock_app do
       get "/route/:foo/:bar/:baz", :provides => :html do
         "#{params[:foo]};#{params[:bar]};#{params[:baz]}"
@@ -1450,7 +1485,7 @@ describe "Routing" do
     assert_equal 'foo;bar-whatever;baz', body
   end
 
-  should 'work with arbitrary params' do
+  it 'should work with arbitrary params' do
     mock_app do
       get(:testing) { params[:foo] }
     end
@@ -1461,7 +1496,7 @@ describe "Routing" do
     assert_equal "bar", body
   end
 
-  should 'ignore nil params' do
+  it 'should ignore nil params' do
     mock_app do
       get(:testing, :provides => [:html, :json]) do
       end
@@ -1470,7 +1505,7 @@ describe "Routing" do
     assert_equal '/testing', @app.url(:testing, :format => nil)
   end
 
-  should 'be able to access params in a before filter' do
+  it 'should be able to access params in a before filter' do
     username_from_before_filter = nil
 
     mock_app do
@@ -1485,7 +1520,7 @@ describe "Routing" do
     assert_equal 'josh', username_from_before_filter
   end
 
-  should "be able to access params normally when a before filter is specified" do
+  it 'should be able to access params normally when a before filter is specified' do
     mock_app do
       before { }
       get :index do
@@ -1496,7 +1531,7 @@ describe "Routing" do
     assert_equal '{"test"=>"what"}', body
   end
 
-  should "work only for the given controller and route when using before-filter with route's name" do
+  it 'should work only for the given controller and route when using before-filter with route name' do
     mock_app do
       controller :foo do
         before(:index) { @a = "only to :index" }
@@ -1510,7 +1545,7 @@ describe "Routing" do
     assert_equal '', body
   end
 
-  should "work only for the given controller and route when using after-filter with route's name" do
+  it 'should work only for the given controller and route when using after-filter with route name' do
     mock_app do
       controller :after_controller do
         global = "global variable"
@@ -1525,7 +1560,7 @@ describe "Routing" do
     assert_equal '', body
   end
 
-  should "execute the before/after filters when they are inserted after the target route" do
+  it 'should execute the before/after filters when they are inserted after the target route' do
     mock_app do
       controller :after_test do
         global = "global variable"
@@ -1541,7 +1576,7 @@ describe "Routing" do
     assert_equal 'after', body
   end
 
-  should 'work with controller and arbitrary params' do
+  it 'should work with controller and arbitrary params' do
     mock_app do
       get(:testing) { params[:foo] }
       controller :test1 do
@@ -1561,7 +1596,7 @@ describe "Routing" do
     assert_equal "bar2", body
   end
 
-  should "parse two routes with the same path but different http verbs" do
+  it 'should parse two routes with the same path but different http verbs' do
     mock_app do
       get(:index) { "This is the get index" }
       post(:index) { "This is the post index" }
@@ -1572,7 +1607,7 @@ describe "Routing" do
     assert_equal "This is the post index", body
   end
 
-  should "use optionals params" do
+  it 'should use optionals params' do
     mock_app do
       get(:index, :map => "/(:foo(/:bar))") { "#{params[:foo]}-#{params[:bar]}" }
     end
@@ -1582,7 +1617,7 @@ describe "Routing" do
     assert_equal "foo-bar", body
   end
 
-  should "parse two routes with the same path but different http verbs and provides" do
+  it 'should parse two routes with the same path but different http verbs and provides' do
     mock_app do
       get(:index, :provides => [:html, :json]) { "This is the get index.#{content_type}" }
       post(:index, :provides => [:html, :json]) { "This is the post index.#{content_type}" }
@@ -1601,7 +1636,7 @@ describe "Routing" do
     assert_equal 404, status
   end
 
-  should "allow controller level mapping" do
+  it 'should allow controller level mapping' do
     mock_app do
       controller :map => "controller-:id" do
         get(:url3) { "#{params[:id]}" }
@@ -1620,7 +1655,7 @@ describe "Routing" do
     assert_equal "1, 2", body
   end
 
-  should "replace name of named controller with mapping path" do
+  it 'should replace name of named controller with mapping path' do
     mock_app do
       controller :ugly, :map => "/pretty/:id" do
         get(:url3) { "#{params[:id]}" }
@@ -1647,7 +1682,7 @@ describe "Routing" do
     assert_equal 'okay', body
   end
 
-  should 'use absolute and relative maps' do
+  it 'should use absolute and relative maps' do
     mock_app do
       controller :one do
         parent :three
@@ -1667,7 +1702,7 @@ describe "Routing" do
     assert_equal "/two/four_id", @app.url(:two, :index2, 'four_id')
   end
 
-  should "work with params and parent options" do
+  it 'should work with params and parent options' do
     mock_app do
       controller :test2, :parent => :parent1, :parent1_id => 1 do
         get(:url3) { params[:foo] }
@@ -1692,7 +1727,7 @@ describe "Routing" do
     assert_equal "bar5", body
   end
 
-  should "parse params without explicit provides for every matching route" do
+  it 'should parse params without explicit provides for every matching route' do
     mock_app do
       get(:index, :map => "/foos/:bar") { "get bar = #{params[:bar]}" }
       post :create, :map => "/foos/:bar", :provides => [:html, :js] do
@@ -1708,7 +1743,7 @@ describe "Routing" do
     assert_equal "post bar = hello", body
   end
 
-  should "properly route to first foo with two similar routes" do
+  it 'should properly route to first foo with two similar routes' do
     mock_app do
       controllers do
         get('/foo/') { "this is foo" }
@@ -1723,7 +1758,7 @@ describe "Routing" do
     assert_equal "/foo/5/10", body
   end
 
-  should "index routes should be optional when nested" do
+  it 'should index routes should be optional when nested' do
     mock_app do
       controller '/users', :provides => [:json] do
         get '/' do
@@ -1735,7 +1770,7 @@ describe "Routing" do
     assert_equal "foo", body
   end
 
-  should "use provides as conditional" do
+  it 'should use provides as conditional' do
     mock_app do
       provides :json
       get "/" do
@@ -1746,7 +1781,9 @@ describe "Routing" do
     assert_equal "foo", body
   end
 
-  should_eventually "reset provides for routes that didn't use it" do
+  it 'should reset provides for routes that did not use it' do
+    skip
+    #FIXME
     mock_app do
       get('/foo', :provides => :js){}
       get('/bar'){}
@@ -1761,7 +1798,7 @@ describe "Routing" do
     assert_equal 404, status
   end
 
-  should "pass controller conditions to each route" do
+  it 'should pass controller conditions to each route' do
     counter = 0
 
     mock_app do
@@ -1781,7 +1818,7 @@ describe "Routing" do
     assert_equal 2, counter
   end
 
-  should "allow controller conditions to be overridden" do
+  it 'should allow controller conditions to be overridden' do
     counter = 0
 
     mock_app do
@@ -1801,7 +1838,7 @@ describe "Routing" do
     assert_equal 1, counter
   end
 
-  should "parse params with class level provides" do
+  it 'should parse params with class level provides' do
     mock_app do
       controllers :posts, :provides => [:html, :js] do
         post(:create, :map => "/foo/:bar/:baz/:id") {
@@ -1823,7 +1860,7 @@ describe "Routing" do
     assert_equal "POST CREATE bar - baz - 5", body
   end
 
-  should "parse params properly with inline provides" do
+  it 'should parse params properly with inline provides' do
     mock_app do
       controllers :posts do
         post(:create, :map => "/foo/:bar/:baz/:id", :provides => [:html, :js]) {
@@ -1841,7 +1878,7 @@ describe "Routing" do
     assert_equal "POST CREATE bar - baz - 5", body, "should properly post to create action"
   end
 
-  should "have overideable format" do
+  it 'should have overideable format' do
     ::Rack::Mime::MIME_TYPES[".other"] = "text/html"
     mock_app do
       before do
@@ -1854,7 +1891,7 @@ describe "Routing" do
     ::Rack::Mime::MIME_TYPES.delete('.other')
   end
 
-  should 'invokes handlers registered with ::error when raised' do
+  it 'should invokes handlers registered with ::error when raised' do
     mock_app do
       set :raise_errors, false
       error(FooError) { 'Foo!' }
@@ -1867,7 +1904,7 @@ describe "Routing" do
     assert_equal 'Foo!', body
   end
 
-  should 'have MethodOverride middleware' do
+  it 'should have MethodOverride middleware' do
     mock_app do
       put('/') { 'okay' }
     end
@@ -1877,7 +1914,7 @@ describe "Routing" do
     assert_equal 'okay', body
   end
 
-  should 'return value from params' do
+  it 'should return value from params' do
     mock_app do
       get("/foo/:bar"){ raise "'bar' should be a string" unless params[:bar].kind_of? String}
     end
@@ -1885,7 +1922,7 @@ describe "Routing" do
     assert ok?
   end
 
-  should 'return params as a HashWithIndifferentAccess object via GET' do
+  it 'should return params as a HashWithIndifferentAccess object via GET' do
     mock_app do
       get('/foo/:bar') { "#{params["bar"]} #{params[:bar]}" }
       get(:foo, :map => '/prefix/:var') { "#{params["var"]} #{params[:var]}" }
@@ -1898,7 +1935,7 @@ describe "Routing" do
     assert_equal "var var", body
   end
 
-  should 'return params as a HashWithIndifferentAccess object via POST' do
+  it 'should return params as a HashWithIndifferentAccess object via POST' do
     mock_app do
       post('/user') do
         "#{params["user"]["full_name"]} #{params[:user][:full_name]}"
@@ -1912,7 +1949,7 @@ describe "Routing" do
     assert_equal "example user example user", body
   end
 
-  should 'have MethodOverride middleware with more options' do
+  it 'should have MethodOverride middleware with more options' do
     mock_app do
       put('/hi', :provides => [:json]) { 'hi' }
     end
@@ -1926,7 +1963,7 @@ describe "Routing" do
     assert_equal 405, status
   end
 
-  should 'parse nested params' do
+  it 'should parse nested params' do
     mock_app do
       get(:index) { "%s %s" % [params[:account][:name], params[:account][:surname]] }
     end
@@ -1936,14 +1973,14 @@ describe "Routing" do
     assert_equal 'foo bar', body
   end
 
-  should 'render sinatra NotFound page' do
+  it 'should render sinatra NotFound page' do
     mock_app { set :environment, :development }
     get "/"
     assert_equal 404, status
     assert_match %r{(Sinatra doesn&rsquo;t know this ditty.|<h1>Not Found</h1>)}, body
   end
 
-  should 'render a custom NotFound page' do
+  it 'should render a custom NotFound page' do
     mock_app do
       error(Sinatra::NotFound) { "not found" }
     end
@@ -1952,7 +1989,7 @@ describe "Routing" do
     assert_match /not found/, body
   end
 
-  should 'render a custom 404 page using not_found' do
+  it 'should render a custom 404 page using not_found' do
     mock_app do
       not_found { "custom 404 not found" }
     end
@@ -1961,8 +1998,7 @@ describe "Routing" do
     assert_equal "custom 404 not found", body
   end
 
-  should 'render a custom error page using error method' do
-    skip # TODO sinatra bug?
+  it 'should render a custom error page using error method' do
     mock_app do
       error(404) { "custom 404 error" }
     end
@@ -1971,7 +2007,7 @@ describe "Routing" do
     assert_equal "custom 404 error", body
   end
 
-  should 'render a custom 403 page' do
+  it 'should render a custom 403 page' do
     mock_app do
       error(403) { "custom 403 not found" }
       get("/") { status 403 }
@@ -1981,7 +2017,7 @@ describe "Routing" do
     assert_equal "custom 403 not found", body
   end
 
-  should 'recognize paths' do
+  it 'should recognize paths' do
     mock_app do
       controller :foo do
         get(:bar, :map => "/my/:id/custom-route") { }
@@ -1999,7 +2035,7 @@ describe "Routing" do
     assert_equal [:with_format, { :id => "9", :format => "js" }], @app.recognize_path(@app.url(:with_format, :id => 9, :format => :js))
   end
 
-  should 'have current_path' do
+  it 'should have current_path' do
     mock_app do
       controller :foo do
         get(:index) { current_path }
@@ -2017,7 +2053,7 @@ describe "Routing" do
     assert_equal "/foo", body
   end
 
-  should 'accept :map and :parent' do
+  it 'should accept :map and :parent' do
     mock_app do
       controller :posts do
         get :show, :parent => :users, :map => "posts/:id" do
@@ -2029,7 +2065,7 @@ describe "Routing" do
     assert_equal "123-321", body
   end
 
-  should 'change params in current_path' do
+  it 'should change params in current_path' do
     mock_app do
       get :index, :map => "/paginate/:page" do
         current_path(:page => 66)
@@ -2039,7 +2075,7 @@ describe "Routing" do
     assert_equal "/paginate/66", body
   end
 
-  should 'not route get :users, :with => :id to /users//' do
+  it 'should not route get :users, :with => :id to /users//' do
     mock_app do
       get(:users, :with => :id) { 'boo' }
     end