- Removed test-unit dependency
- updated minitest to 5.0 - Removed Test::Unit::TestCase and started using Minitest::Test instead - Fixed usage of assert_raise - Fixed usage of refute_nil - Fixed and removed usage of assert_nothing_raised
This commit is contained in:
parent
5f6168bfc9
commit
23c2e197c8
6
Gemfile
6
Gemfile
|
@ -33,7 +33,7 @@ if RUBY_ENGINE == 'jruby'
|
||||||
end
|
end
|
||||||
|
|
||||||
if RUBY_ENGINE == "ruby" and RUBY_VERSION > '1.9.2'
|
if RUBY_ENGINE == "ruby" and RUBY_VERSION > '1.9.2'
|
||||||
gem "minitest", "~> 4.0"
|
gem "minitest", "~> 5.0"
|
||||||
gem 'less', '~> 2.0'
|
gem 'less', '~> 2.0'
|
||||||
gem 'therubyracer'
|
gem 'therubyracer'
|
||||||
gem 'redcarpet'
|
gem 'redcarpet'
|
||||||
|
@ -65,10 +65,6 @@ if RUBY_ENGINE == "ruby" and RUBY_VERSION > '1.9.2'
|
||||||
gem 'sass'
|
gem 'sass'
|
||||||
end
|
end
|
||||||
|
|
||||||
if RUBY_ENGINE == "ruby" and RUBY_VERSION > '2.1'
|
|
||||||
gem 'test-unit', '~> 3.0'
|
|
||||||
end
|
|
||||||
|
|
||||||
if RUBY_ENGINE == "rbx"
|
if RUBY_ENGINE == "rbx"
|
||||||
gem 'json'
|
gem 'json'
|
||||||
gem 'rubysl'
|
gem 'rubysl'
|
||||||
|
|
|
@ -2387,10 +2387,10 @@ wird empfohlen:
|
||||||
|
|
||||||
```ruby
|
```ruby
|
||||||
require 'my_sinatra_app'
|
require 'my_sinatra_app'
|
||||||
require 'test/unit'
|
require 'minitest/autorun'
|
||||||
require 'rack/test'
|
require 'rack/test'
|
||||||
|
|
||||||
class MyAppTest < Test::Unit::TestCase
|
class MyAppTest < Minitest::Test
|
||||||
include Rack::Test::Methods
|
include Rack::Test::Methods
|
||||||
|
|
||||||
def app
|
def app
|
||||||
|
|
|
@ -2215,10 +2215,10 @@ cualquier framework o librería de pruebas basada en Rack. Se recomienda usar
|
||||||
|
|
||||||
``` ruby
|
``` ruby
|
||||||
require 'mi_app_sinatra'
|
require 'mi_app_sinatra'
|
||||||
require 'test/unit'
|
require 'minitest/autorun'
|
||||||
require 'rack/test'
|
require 'rack/test'
|
||||||
|
|
||||||
class MiAppTest < Test::Unit::TestCase
|
class MiAppTest < Minitest::Test
|
||||||
include Rack::Test::Methods
|
include Rack::Test::Methods
|
||||||
|
|
||||||
def app
|
def app
|
||||||
|
|
|
@ -2394,10 +2394,10 @@ recommandé :
|
||||||
|
|
||||||
``` ruby
|
``` ruby
|
||||||
require 'mon_application_sinatra'
|
require 'mon_application_sinatra'
|
||||||
require 'test/unit'
|
require 'minitest/autorun'
|
||||||
require 'rack/test'
|
require 'rack/test'
|
||||||
|
|
||||||
class MonTest < Test::Unit::TestCase
|
class MonTest < Minitest::Test
|
||||||
include Rack::Test::Methods
|
include Rack::Test::Methods
|
||||||
|
|
||||||
def app
|
def app
|
||||||
|
|
|
@ -545,7 +545,7 @@ könyvtárat ajánljuk:
|
||||||
require 'my_sinatra_app'
|
require 'my_sinatra_app'
|
||||||
require 'rack/test'
|
require 'rack/test'
|
||||||
|
|
||||||
class MyAppTest < Test::Unit::TestCase
|
class MyAppTest < Minitest::Test
|
||||||
include Rack::Test::Methods
|
include Rack::Test::Methods
|
||||||
|
|
||||||
def app
|
def app
|
||||||
|
|
|
@ -2198,10 +2198,10 @@ SinatraでのテストはRackベースのテストライブラリまたはフレ
|
||||||
|
|
||||||
``` ruby
|
``` ruby
|
||||||
require 'my_sinatra_app'
|
require 'my_sinatra_app'
|
||||||
require 'test/unit'
|
require 'minitest/autorun'
|
||||||
require 'rack/test'
|
require 'rack/test'
|
||||||
|
|
||||||
class MyAppTest < Test::Unit::TestCase
|
class MyAppTest < Minitest::Test
|
||||||
include Rack::Test::Methods
|
include Rack::Test::Methods
|
||||||
|
|
||||||
def app
|
def app
|
||||||
|
|
|
@ -2373,10 +2373,10 @@ Sinatra 테스트는 많은 Rack 기반 테스팅 라이브러리, 프레임워
|
||||||
|
|
||||||
``` ruby
|
``` ruby
|
||||||
require 'my_sinatra_app'
|
require 'my_sinatra_app'
|
||||||
require 'test/unit'
|
require 'minitest/autorun'
|
||||||
require 'rack/test'
|
require 'rack/test'
|
||||||
|
|
||||||
class MyAppTest < Test::Unit::TestCase
|
class MyAppTest < Minitest::Test
|
||||||
include Rack::Test::Methods
|
include Rack::Test::Methods
|
||||||
|
|
||||||
def app
|
def app
|
||||||
|
|
|
@ -2421,10 +2421,10 @@ is recommended:
|
||||||
|
|
||||||
``` ruby
|
``` ruby
|
||||||
require 'my_sinatra_app'
|
require 'my_sinatra_app'
|
||||||
require 'test/unit'
|
require 'minitest/autorun'
|
||||||
require 'rack/test'
|
require 'rack/test'
|
||||||
|
|
||||||
class MyAppTest < Test::Unit::TestCase
|
class MyAppTest < Minitest::Test
|
||||||
include Rack::Test::Methods
|
include Rack::Test::Methods
|
||||||
|
|
||||||
def app
|
def app
|
||||||
|
|
|
@ -809,7 +809,7 @@ framework de teste baseados no Rack.
|
||||||
require 'minha_aplicacao_sinatra'
|
require 'minha_aplicacao_sinatra'
|
||||||
require 'rack/test'
|
require 'rack/test'
|
||||||
|
|
||||||
class MinhaAplicacaoTeste < Test::Unit::TestCase
|
class MinhaAplicacaoTeste < Minitest::Test
|
||||||
include Rack::Test::Methods
|
include Rack::Test::Methods
|
||||||
|
|
||||||
def app
|
def app
|
||||||
|
|
|
@ -635,7 +635,7 @@ framework de teste baseados no Rack.
|
||||||
require 'minha_aplicacao_sinatra'
|
require 'minha_aplicacao_sinatra'
|
||||||
require 'rack/test'
|
require 'rack/test'
|
||||||
|
|
||||||
class MinhaAplicacaoTeste < Test::Unit::TestCase
|
class MinhaAplicacaoTeste < Minitest::Test
|
||||||
include Rack::Test::Methods
|
include Rack::Test::Methods
|
||||||
|
|
||||||
def app
|
def app
|
||||||
|
|
|
@ -2304,10 +2304,10 @@ Rack распространяется с различными стандартн
|
||||||
|
|
||||||
```ruby
|
```ruby
|
||||||
require 'my_sinatra_app'
|
require 'my_sinatra_app'
|
||||||
require 'test/unit'
|
require 'minitest/autorun'
|
||||||
require 'rack/test'
|
require 'rack/test'
|
||||||
|
|
||||||
class MyAppTest < Test::Unit::TestCase
|
class MyAppTest < Minitest::Test
|
||||||
include Rack::Test::Methods
|
include Rack::Test::Methods
|
||||||
|
|
||||||
def app
|
def app
|
||||||
|
|
|
@ -1701,10 +1701,10 @@ Sinatra的测试可以使用任何基于Rack的测试程序库或者框架来编
|
||||||
|
|
||||||
~~~~ ruby
|
~~~~ ruby
|
||||||
require 'my_sinatra_app'
|
require 'my_sinatra_app'
|
||||||
require 'test/unit'
|
require 'minitest/autorun'
|
||||||
require 'rack/test'
|
require 'rack/test'
|
||||||
|
|
||||||
class MyAppTest < Test::Unit::TestCase
|
class MyAppTest < Minitest::Test
|
||||||
include Rack::Test::Methods
|
include Rack::Test::Methods
|
||||||
|
|
||||||
def app
|
def app
|
||||||
|
|
|
@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
|
||||||
begin
|
begin
|
||||||
require 'asciidoctor'
|
require 'asciidoctor'
|
||||||
|
|
||||||
class AsciidoctorTest < Test::Unit::TestCase
|
class AsciidoctorTest < Minitest::Test
|
||||||
def asciidoc_app(&block)
|
def asciidoc_app(&block)
|
||||||
mock_app do
|
mock_app do
|
||||||
set :views, File.dirname(__FILE__) + '/views'
|
set :views, File.dirname(__FILE__) + '/views'
|
||||||
|
@ -33,7 +33,7 @@ begin
|
||||||
|
|
||||||
it 'raises error if template not found' do
|
it 'raises error if template not found' do
|
||||||
mock_app { get('/') { asciidoc :no_such_template } }
|
mock_app { get('/') { asciidoc :no_such_template } }
|
||||||
assert_raise(Errno::ENOENT) { get('/') }
|
assert_raises(Errno::ENOENT) { get('/') }
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'renders with inline layouts' do
|
it 'renders with inline layouts' do
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
require File.expand_path('../helper', __FILE__)
|
require File.expand_path('../helper', __FILE__)
|
||||||
|
|
||||||
class BaseTest < Test::Unit::TestCase
|
class BaseTest < Minitest::Test
|
||||||
describe 'Sinatra::Base subclasses' do
|
describe 'Sinatra::Base subclasses' do
|
||||||
class TestApp < Sinatra::Base
|
class TestApp < Sinatra::Base
|
||||||
get('/') { 'Hello World' }
|
get('/') { 'Hello World' }
|
||||||
|
|
|
@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
|
||||||
begin
|
begin
|
||||||
require 'builder'
|
require 'builder'
|
||||||
|
|
||||||
class BuilderTest < Test::Unit::TestCase
|
class BuilderTest < Minitest::Test
|
||||||
def builder_app(options = {}, &block)
|
def builder_app(options = {}, &block)
|
||||||
mock_app do
|
mock_app do
|
||||||
set :views, File.dirname(__FILE__) + '/views'
|
set :views, File.dirname(__FILE__) + '/views'
|
||||||
|
@ -82,7 +82,7 @@ class BuilderTest < Test::Unit::TestCase
|
||||||
mock_app do
|
mock_app do
|
||||||
get('/') { builder :no_such_template }
|
get('/') { builder :no_such_template }
|
||||||
end
|
end
|
||||||
assert_raise(Errno::ENOENT) { get('/') }
|
assert_raises(Errno::ENOENT) { get('/') }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ rescue Exception
|
||||||
raise LoadError, 'unable to execute JavaScript'
|
raise LoadError, 'unable to execute JavaScript'
|
||||||
end
|
end
|
||||||
|
|
||||||
class CoffeeTest < Test::Unit::TestCase
|
class CoffeeTest < Minitest::Test
|
||||||
def coffee_app(options = {}, &block)
|
def coffee_app(options = {}, &block)
|
||||||
mock_app do
|
mock_app do
|
||||||
set :views, File.dirname(__FILE__) + '/views'
|
set :views, File.dirname(__FILE__) + '/views'
|
||||||
|
@ -65,7 +65,7 @@ class CoffeeTest < Test::Unit::TestCase
|
||||||
mock_app {
|
mock_app {
|
||||||
get('/') { coffee :no_such_template }
|
get('/') { coffee :no_such_template }
|
||||||
}
|
}
|
||||||
assert_raise(Errno::ENOENT) { get('/') }
|
assert_raises(Errno::ENOENT) { get('/') }
|
||||||
end
|
end
|
||||||
|
|
||||||
it "passes coffee options to the coffee engine" do
|
it "passes coffee options to the coffee engine" do
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# I like coding: UTF-8
|
# I like coding: UTF-8
|
||||||
require File.expand_path('../helper', __FILE__)
|
require File.expand_path('../helper', __FILE__)
|
||||||
|
|
||||||
class CompileTest < Test::Unit::TestCase
|
class CompileTest < Minitest::Test
|
||||||
|
|
||||||
def self.converts pattern, expected_regexp
|
def self.converts pattern, expected_regexp
|
||||||
it "generates #{expected_regexp.source} from #{pattern}" do
|
it "generates #{expected_regexp.source} from #{pattern}" do
|
||||||
|
|
|
@ -17,24 +17,15 @@
|
||||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
# THE SOFTWARE.
|
# THE SOFTWARE.
|
||||||
require "test/unit"
|
require "rubygems"
|
||||||
|
require "minitest/autorun"
|
||||||
# Test::Unit loads a default test if the suite is empty, whose purpose is to
|
|
||||||
# fail. Since having empty contexts is a common practice, we decided to
|
|
||||||
# overwrite TestSuite#empty? in order to allow them. Having a failure when no
|
|
||||||
# tests have been defined seems counter-intuitive.
|
|
||||||
class Test::Unit::TestSuite
|
|
||||||
def empty?
|
|
||||||
false
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
# Contest adds +teardown+, +test+ and +context+ as class methods, and the
|
# Contest adds +teardown+, +test+ and +context+ as class methods, and the
|
||||||
# instance methods +setup+ and +teardown+ now iterate on the corresponding
|
# instance methods +setup+ and +teardown+ now iterate on the corresponding
|
||||||
# blocks. Note that all setup and teardown blocks must be defined with the
|
# blocks. Note that all setup and teardown blocks must be defined with the
|
||||||
# block syntax. Adding setup or teardown instance methods defeats the purpose
|
# block syntax. Adding setup or teardown instance methods defeats the purpose
|
||||||
# of this library.
|
# of this library.
|
||||||
class Test::Unit::TestCase
|
class Minitest::Test
|
||||||
def self.setup(&block) setup_blocks << block end
|
def self.setup(&block) setup_blocks << block end
|
||||||
def self.teardown(&block) teardown_blocks << block end
|
def self.teardown(&block) teardown_blocks << block end
|
||||||
def self.setup_blocks() @setup_blocks ||= [] end
|
def self.setup_blocks() @setup_blocks ||= [] end
|
||||||
|
|
|
@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
|
||||||
begin
|
begin
|
||||||
require 'creole'
|
require 'creole'
|
||||||
|
|
||||||
class CreoleTest < Test::Unit::TestCase
|
class CreoleTest < Minitest::Test
|
||||||
def creole_app(&block)
|
def creole_app(&block)
|
||||||
mock_app do
|
mock_app do
|
||||||
set :views, File.dirname(__FILE__) + '/views'
|
set :views, File.dirname(__FILE__) + '/views'
|
||||||
|
@ -26,7 +26,7 @@ class CreoleTest < Test::Unit::TestCase
|
||||||
|
|
||||||
it "raises error if template not found" do
|
it "raises error if template not found" do
|
||||||
mock_app { get('/') { creole :no_such_template } }
|
mock_app { get('/') { creole :no_such_template } }
|
||||||
assert_raise(Errno::ENOENT) { get('/') }
|
assert_raises(Errno::ENOENT) { get('/') }
|
||||||
end
|
end
|
||||||
|
|
||||||
it "renders with inline layouts" do
|
it "renders with inline layouts" do
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
require File.expand_path('../helper', __FILE__)
|
require File.expand_path('../helper', __FILE__)
|
||||||
|
|
||||||
class DelegatorTest < Test::Unit::TestCase
|
class DelegatorTest < Minitest::Test
|
||||||
class Mirror
|
class Mirror
|
||||||
attr_reader :last_call
|
attr_reader :last_call
|
||||||
def method_missing(*a, &b)
|
def method_missing(*a, &b)
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
require File.expand_path('../helper', __FILE__)
|
require File.expand_path('../helper', __FILE__)
|
||||||
require 'erb'
|
require 'erb'
|
||||||
|
|
||||||
class BaseTest < Test::Unit::TestCase
|
class BaseTest < Minitest::Test
|
||||||
setup do
|
setup do
|
||||||
@base = Sinatra.new(Sinatra::Base)
|
@base = Sinatra.new(Sinatra::Base)
|
||||||
@base.set :views, File.dirname(__FILE__) + "/views"
|
@base.set :views, File.dirname(__FILE__) + "/views"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
require File.expand_path('../helper', __FILE__)
|
require File.expand_path('../helper', __FILE__)
|
||||||
|
|
||||||
class ERBTest < Test::Unit::TestCase
|
class ERBTest < Minitest::Test
|
||||||
def engine
|
def engine
|
||||||
Tilt::ERBTemplate
|
Tilt::ERBTemplate
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
require File.expand_path('../helper', __FILE__)
|
require File.expand_path('../helper', __FILE__)
|
||||||
|
|
||||||
class ExtensionsTest < Test::Unit::TestCase
|
class ExtensionsTest < Minitest::Test
|
||||||
module FooExtensions
|
module FooExtensions
|
||||||
def foo
|
def foo
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
require File.expand_path('../helper', __FILE__)
|
require File.expand_path('../helper', __FILE__)
|
||||||
|
|
||||||
class BeforeFilterTest < Test::Unit::TestCase
|
class BeforeFilterTest < Minitest::Test
|
||||||
it "executes filters in the order defined" do
|
it "executes filters in the order defined" do
|
||||||
count = 0
|
count = 0
|
||||||
mock_app do
|
mock_app do
|
||||||
|
@ -176,7 +176,7 @@ class BeforeFilterTest < Test::Unit::TestCase
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class AfterFilterTest < Test::Unit::TestCase
|
class AfterFilterTest < Minitest::Test
|
||||||
it "executes before and after filters in correct order" do
|
it "executes before and after filters in correct order" do
|
||||||
invoked = 0
|
invoked = 0
|
||||||
mock_app do
|
mock_app do
|
||||||
|
|
|
@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
|
||||||
begin
|
begin
|
||||||
require 'haml'
|
require 'haml'
|
||||||
|
|
||||||
class HAMLTest < Test::Unit::TestCase
|
class HAMLTest < Minitest::Test
|
||||||
def haml_app(&block)
|
def haml_app(&block)
|
||||||
mock_app do
|
mock_app do
|
||||||
set :views, File.dirname(__FILE__) + '/views'
|
set :views, File.dirname(__FILE__) + '/views'
|
||||||
|
@ -42,7 +42,7 @@ class HAMLTest < Test::Unit::TestCase
|
||||||
|
|
||||||
it "raises error if template not found" do
|
it "raises error if template not found" do
|
||||||
mock_app { get('/') { haml :no_such_template } }
|
mock_app { get('/') { haml :no_such_template } }
|
||||||
assert_raise(Errno::ENOENT) { get('/') }
|
assert_raises(Errno::ENOENT) { get('/') }
|
||||||
end
|
end
|
||||||
|
|
||||||
it "passes HAML options to the Haml engine" do
|
it "passes HAML options to the Haml engine" do
|
||||||
|
|
|
@ -16,13 +16,19 @@ $LOAD_PATH.unshift testdir unless $LOAD_PATH.include?(testdir)
|
||||||
libdir = File.dirname(File.dirname(__FILE__)) + '/lib'
|
libdir = File.dirname(File.dirname(__FILE__)) + '/lib'
|
||||||
$LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir)
|
$LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir)
|
||||||
|
|
||||||
|
require 'minitest'
|
||||||
require 'contest'
|
require 'contest'
|
||||||
require 'rack/test'
|
require 'rack/test'
|
||||||
require 'sinatra/base'
|
require 'sinatra/base'
|
||||||
|
|
||||||
class Sinatra::Base
|
class Sinatra::Base
|
||||||
|
include Minitest::Assertions
|
||||||
# Allow assertions in request context
|
# Allow assertions in request context
|
||||||
include Test::Unit::Assertions
|
def assertions
|
||||||
|
@assertions ||= 0
|
||||||
|
end
|
||||||
|
|
||||||
|
attr_writer :assertions
|
||||||
end
|
end
|
||||||
|
|
||||||
class Rack::Builder
|
class Rack::Builder
|
||||||
|
@ -33,7 +39,7 @@ end
|
||||||
|
|
||||||
Sinatra::Base.set :environment, :test
|
Sinatra::Base.set :environment, :test
|
||||||
|
|
||||||
class Test::Unit::TestCase
|
class Minitest::Test
|
||||||
include Rack::Test::Methods
|
include Rack::Test::Methods
|
||||||
|
|
||||||
class << self
|
class << self
|
||||||
|
|
|
@ -2,7 +2,7 @@ require File.expand_path('../helper', __FILE__)
|
||||||
require 'date'
|
require 'date'
|
||||||
require 'json'
|
require 'json'
|
||||||
|
|
||||||
class HelpersTest < Test::Unit::TestCase
|
class HelpersTest < Minitest::Test
|
||||||
def test_default
|
def test_default
|
||||||
assert true
|
assert true
|
||||||
end
|
end
|
||||||
|
@ -647,7 +647,7 @@ class HelpersTest < Test::Unit::TestCase
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
assert_raise(RuntimeError) { get '/foo.xml' }
|
assert_raises(RuntimeError) { get '/foo.xml' }
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'only sets default charset for specific mime types' do
|
it 'only sets default charset for specific mime types' do
|
||||||
|
@ -975,12 +975,12 @@ class HelpersTest < Test::Unit::TestCase
|
||||||
|
|
||||||
it 'sets the Expires header' do
|
it 'sets the Expires header' do
|
||||||
get '/foo'
|
get '/foo'
|
||||||
assert_not_nil response['Expires']
|
refute_nil response['Expires']
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'allows passing Time.now objects' do
|
it 'allows passing Time.now objects' do
|
||||||
get '/bar'
|
get '/bar'
|
||||||
assert_not_nil response['Expires']
|
refute_nil response['Expires']
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'allows passing Time.at objects' do
|
it 'allows passing Time.at objects' do
|
||||||
|
@ -994,7 +994,7 @@ class HelpersTest < Test::Unit::TestCase
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'fails when Time.parse raises an ArgumentError' do
|
it 'fails when Time.parse raises an ArgumentError' do
|
||||||
assert_raise(ArgumentError) { get '/boom' }
|
assert_raises(ArgumentError) { get '/boom' }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -1763,7 +1763,7 @@ class HelpersTest < Test::Unit::TestCase
|
||||||
"that's weak, dude."
|
"that's weak, dude."
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
assert_raise(ArgumentError) { get('/') }
|
assert_raises(ArgumentError) { get('/') }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ require File.expand_path('../integration_helper', __FILE__)
|
||||||
# Every test runs with every detected server.
|
# Every test runs with every detected server.
|
||||||
#
|
#
|
||||||
# See test/integration/app.rb for the code of the app we test against.
|
# See test/integration/app.rb for the code of the app we test against.
|
||||||
class IntegrationTest < Test::Unit::TestCase
|
class IntegrationTest < Minitest::Test
|
||||||
extend IntegrationHelper
|
extend IntegrationHelper
|
||||||
attr_accessor :server
|
attr_accessor :server
|
||||||
|
|
||||||
|
@ -87,7 +87,7 @@ class IntegrationTest < Test::Unit::TestCase
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not generate warnings' do
|
it 'does not generate warnings' do
|
||||||
assert_raise(OpenURI::HTTPError) { server.get '/' }
|
assert_raises(OpenURI::HTTPError) { server.get '/' }
|
||||||
server.get '/app_file'
|
server.get '/app_file'
|
||||||
assert_equal [], server.warnings
|
assert_equal [], server.warnings
|
||||||
end
|
end
|
||||||
|
|
|
@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
|
||||||
begin
|
begin
|
||||||
require 'less'
|
require 'less'
|
||||||
|
|
||||||
class LessTest < Test::Unit::TestCase
|
class LessTest < Minitest::Test
|
||||||
def less_app(options = {}, &block)
|
def less_app(options = {}, &block)
|
||||||
mock_app do
|
mock_app do
|
||||||
set :views, File.dirname(__FILE__) + '/views'
|
set :views, File.dirname(__FILE__) + '/views'
|
||||||
|
@ -60,7 +60,7 @@ class LessTest < Test::Unit::TestCase
|
||||||
|
|
||||||
it "raises error if template not found" do
|
it "raises error if template not found" do
|
||||||
mock_app { get('/') { less :no_such_template } }
|
mock_app { get('/') { less :no_such_template } }
|
||||||
assert_raise(Errno::ENOENT) { get('/') }
|
assert_raises(Errno::ENOENT) { get('/') }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
|
||||||
begin
|
begin
|
||||||
require 'liquid'
|
require 'liquid'
|
||||||
|
|
||||||
class LiquidTest < Test::Unit::TestCase
|
class LiquidTest < Minitest::Test
|
||||||
def liquid_app(&block)
|
def liquid_app(&block)
|
||||||
mock_app do
|
mock_app do
|
||||||
set :views, File.dirname(__FILE__) + '/views'
|
set :views, File.dirname(__FILE__) + '/views'
|
||||||
|
@ -42,7 +42,7 @@ class LiquidTest < Test::Unit::TestCase
|
||||||
|
|
||||||
it "raises error if template not found" do
|
it "raises error if template not found" do
|
||||||
mock_app { get('/') { liquid :no_such_template } }
|
mock_app { get('/') { liquid :no_such_template } }
|
||||||
assert_raise(Errno::ENOENT) { get('/') }
|
assert_raises(Errno::ENOENT) { get('/') }
|
||||||
end
|
end
|
||||||
|
|
||||||
it "allows passing locals" do
|
it "allows passing locals" do
|
||||||
|
|
|
@ -21,7 +21,7 @@ end
|
||||||
class FirstError < RuntimeError; end
|
class FirstError < RuntimeError; end
|
||||||
class SecondError < RuntimeError; end
|
class SecondError < RuntimeError; end
|
||||||
|
|
||||||
class MappedErrorTest < Test::Unit::TestCase
|
class MappedErrorTest < Minitest::Test
|
||||||
def test_default
|
def test_default
|
||||||
assert true
|
assert true
|
||||||
end
|
end
|
||||||
|
@ -104,7 +104,7 @@ class MappedErrorTest < Test::Unit::TestCase
|
||||||
set :raise_errors, true
|
set :raise_errors, true
|
||||||
get('/') { raise FooError }
|
get('/') { raise FooError }
|
||||||
end
|
end
|
||||||
assert_raise(FooError) { get '/' }
|
assert_raises(FooError) { get '/' }
|
||||||
end
|
end
|
||||||
|
|
||||||
it "calls error handlers before raising errors even when raise_errors is set" do
|
it "calls error handlers before raising errors even when raise_errors is set" do
|
||||||
|
@ -113,7 +113,7 @@ class MappedErrorTest < Test::Unit::TestCase
|
||||||
error(FooError) { "she's there." }
|
error(FooError) { "she's there." }
|
||||||
get('/') { raise FooError }
|
get('/') { raise FooError }
|
||||||
end
|
end
|
||||||
assert_nothing_raised { get '/' }
|
get '/'
|
||||||
assert_equal 500, status
|
assert_equal 500, status
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -121,7 +121,7 @@ class MappedErrorTest < Test::Unit::TestCase
|
||||||
mock_app(Sinatra::Application) do
|
mock_app(Sinatra::Application) do
|
||||||
get('/') { raise Sinatra::NotFound }
|
get('/') { raise Sinatra::NotFound }
|
||||||
end
|
end
|
||||||
assert_nothing_raised { get '/' }
|
get '/'
|
||||||
assert_equal 404, status
|
assert_equal 404, status
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -131,7 +131,7 @@ class MappedErrorTest < Test::Unit::TestCase
|
||||||
error(FooNotFound) { "foo! not found." }
|
error(FooNotFound) { "foo! not found." }
|
||||||
get('/') { raise FooNotFound }
|
get('/') { raise FooNotFound }
|
||||||
end
|
end
|
||||||
assert_nothing_raised { get '/' }
|
get '/'
|
||||||
assert_equal 404, status
|
assert_equal 404, status
|
||||||
assert_equal 'foo! not found.', body
|
assert_equal 'foo! not found.', body
|
||||||
end
|
end
|
||||||
|
|
|
@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
|
||||||
begin
|
begin
|
||||||
require 'markaby'
|
require 'markaby'
|
||||||
|
|
||||||
class MarkabyTest < Test::Unit::TestCase
|
class MarkabyTest < Minitest::Test
|
||||||
def markaby_app(&block)
|
def markaby_app(&block)
|
||||||
mock_app do
|
mock_app do
|
||||||
set :views, File.dirname(__FILE__) + '/views'
|
set :views, File.dirname(__FILE__) + '/views'
|
||||||
|
@ -63,7 +63,7 @@ class MarkabyTest < Test::Unit::TestCase
|
||||||
|
|
||||||
it "raises error if template not found" do
|
it "raises error if template not found" do
|
||||||
mock_app { get('/') { markaby :no_such_template } }
|
mock_app { get('/') { markaby :no_such_template } }
|
||||||
assert_raise(Errno::ENOENT) { get('/') }
|
assert_raises(Errno::ENOENT) { get('/') }
|
||||||
end
|
end
|
||||||
|
|
||||||
it "allows passing locals" do
|
it "allows passing locals" do
|
||||||
|
|
|
@ -34,7 +34,7 @@ MarkdownTest = proc do
|
||||||
|
|
||||||
it "raises error if template not found" do
|
it "raises error if template not found" do
|
||||||
mock_app { get('/') { markdown :no_such_template } }
|
mock_app { get('/') { markdown :no_such_template } }
|
||||||
assert_raise(Errno::ENOENT) { get('/') }
|
assert_raises(Errno::ENOENT) { get('/') }
|
||||||
end
|
end
|
||||||
|
|
||||||
it "renders with inline layouts" do
|
it "renders with inline layouts" do
|
||||||
|
@ -75,7 +75,7 @@ map.each do |t|
|
||||||
begin
|
begin
|
||||||
t = eval(t) if t.is_a? String
|
t = eval(t) if t.is_a? String
|
||||||
t.new { "" }
|
t.new { "" }
|
||||||
klass = Class.new(Test::Unit::TestCase) { define_method(:engine) { t }}
|
klass = Class.new(Minitest::Test) { define_method(:engine) { t }}
|
||||||
klass.class_eval(&MarkdownTest)
|
klass.class_eval(&MarkdownTest)
|
||||||
name = t.name[/[^:]+$/].sub(/Template$/, '') << "Test"
|
name = t.name[/[^:]+$/].sub(/Template$/, '') << "Test"
|
||||||
Object.const_set name, klass
|
Object.const_set name, klass
|
||||||
|
|
|
@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
|
||||||
begin
|
begin
|
||||||
require 'wikicloth'
|
require 'wikicloth'
|
||||||
|
|
||||||
class MediaWikiTest < Test::Unit::TestCase
|
class MediaWikiTest < Minitest::Test
|
||||||
def mediawiki_app(&block)
|
def mediawiki_app(&block)
|
||||||
mock_app do
|
mock_app do
|
||||||
set :views, File.dirname(__FILE__) + '/views'
|
set :views, File.dirname(__FILE__) + '/views'
|
||||||
|
@ -30,7 +30,7 @@ begin
|
||||||
|
|
||||||
it 'raises error if template not found' do
|
it 'raises error if template not found' do
|
||||||
mock_app { get('/') { mediawiki :no_such_template } }
|
mock_app { get('/') { mediawiki :no_such_template } }
|
||||||
assert_raise(Errno::ENOENT) { get('/') }
|
assert_raises(Errno::ENOENT) { get('/') }
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'renders with inline layouts' do
|
it 'renders with inline layouts' do
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
require File.expand_path('../helper', __FILE__)
|
require File.expand_path('../helper', __FILE__)
|
||||||
|
|
||||||
class MiddlewareTest < Test::Unit::TestCase
|
class MiddlewareTest < Minitest::Test
|
||||||
setup do
|
setup do
|
||||||
@app = mock_app(Sinatra::Application) do
|
@app = mock_app(Sinatra::Application) do
|
||||||
get('/*')do
|
get('/*')do
|
||||||
|
|
|
@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
|
||||||
begin
|
begin
|
||||||
require 'nokogiri'
|
require 'nokogiri'
|
||||||
|
|
||||||
class NokogiriTest < Test::Unit::TestCase
|
class NokogiriTest < Minitest::Test
|
||||||
def nokogiri_app(&block)
|
def nokogiri_app(&block)
|
||||||
mock_app do
|
mock_app do
|
||||||
set :views, File.dirname(__FILE__) + '/views'
|
set :views, File.dirname(__FILE__) + '/views'
|
||||||
|
@ -58,7 +58,7 @@ class NokogiriTest < Test::Unit::TestCase
|
||||||
|
|
||||||
it "raises error if template not found" do
|
it "raises error if template not found" do
|
||||||
mock_app { get('/') { nokogiri :no_such_template } }
|
mock_app { get('/') { nokogiri :no_such_template } }
|
||||||
assert_raise(Errno::ENOENT) { get('/') }
|
assert_raises(Errno::ENOENT) { get('/') }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ require 'ostruct'
|
||||||
require 'json'
|
require 'json'
|
||||||
require 'active_support/core_ext/hash/conversions'
|
require 'active_support/core_ext/hash/conversions'
|
||||||
|
|
||||||
class RablTest < Test::Unit::TestCase
|
class RablTest < Minitest::Test
|
||||||
def rabl_app(&block)
|
def rabl_app(&block)
|
||||||
mock_app {
|
mock_app {
|
||||||
set :views, File.dirname(__FILE__) + '/views'
|
set :views, File.dirname(__FILE__) + '/views'
|
||||||
|
@ -48,7 +48,7 @@ class RablTest < Test::Unit::TestCase
|
||||||
mock_app {
|
mock_app {
|
||||||
get('/') { rabl :no_such_template }
|
get('/') { rabl :no_such_template }
|
||||||
}
|
}
|
||||||
assert_raise(Errno::ENOENT) { get('/') }
|
assert_raises(Errno::ENOENT) { get('/') }
|
||||||
end
|
end
|
||||||
|
|
||||||
it "passes rabl options to the rabl engine" do
|
it "passes rabl options to the rabl engine" do
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
require File.expand_path('../helper', __FILE__)
|
require File.expand_path('../helper', __FILE__)
|
||||||
require 'rack'
|
require 'rack'
|
||||||
|
|
||||||
class RackTest < Test::Unit::TestCase
|
class RackTest < Minitest::Test
|
||||||
setup do
|
setup do
|
||||||
@foo = Sinatra.new { get('/foo') { 'foo' }}
|
@foo = Sinatra.new { get('/foo') { 'foo' }}
|
||||||
@bar = Sinatra.new { get('/bar') { 'bar' }}
|
@bar = Sinatra.new { get('/bar') { 'bar' }}
|
||||||
|
|
|
@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
|
||||||
begin
|
begin
|
||||||
require 'radius'
|
require 'radius'
|
||||||
|
|
||||||
class RadiusTest < Test::Unit::TestCase
|
class RadiusTest < Minitest::Test
|
||||||
def radius_app(&block)
|
def radius_app(&block)
|
||||||
mock_app do
|
mock_app do
|
||||||
set :views, File.dirname(__FILE__) + '/views'
|
set :views, File.dirname(__FILE__) + '/views'
|
||||||
|
@ -42,7 +42,7 @@ class RadiusTest < Test::Unit::TestCase
|
||||||
|
|
||||||
it "raises error if template not found" do
|
it "raises error if template not found" do
|
||||||
mock_app { get('/') { radius :no_such_template } }
|
mock_app { get('/') { radius :no_such_template } }
|
||||||
assert_raise(Errno::ENOENT) { get('/') }
|
assert_raises(Errno::ENOENT) { get('/') }
|
||||||
end
|
end
|
||||||
|
|
||||||
it "allows passing locals" do
|
it "allows passing locals" do
|
||||||
|
|
|
@ -4,7 +4,7 @@ begin
|
||||||
require 'rdoc'
|
require 'rdoc'
|
||||||
require 'rdoc/markup/to_html'
|
require 'rdoc/markup/to_html'
|
||||||
|
|
||||||
class RdocTest < Test::Unit::TestCase
|
class RdocTest < Minitest::Test
|
||||||
def rdoc_app(&block)
|
def rdoc_app(&block)
|
||||||
mock_app do
|
mock_app do
|
||||||
set :views, File.dirname(__FILE__) + '/views'
|
set :views, File.dirname(__FILE__) + '/views'
|
||||||
|
@ -27,7 +27,7 @@ class RdocTest < Test::Unit::TestCase
|
||||||
|
|
||||||
it "raises error if template not found" do
|
it "raises error if template not found" do
|
||||||
mock_app { get('/') { rdoc :no_such_template } }
|
mock_app { get('/') { rdoc :no_such_template } }
|
||||||
assert_raise(Errno::ENOENT) { get('/') }
|
assert_raises(Errno::ENOENT) { get('/') }
|
||||||
end
|
end
|
||||||
|
|
||||||
it "renders with inline layouts" do
|
it "renders with inline layouts" do
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Tests to check if all the README examples work.
|
# Tests to check if all the README examples work.
|
||||||
require File.expand_path('../helper', __FILE__)
|
require File.expand_path('../helper', __FILE__)
|
||||||
|
|
||||||
class ReadmeTest < Test::Unit::TestCase
|
class ReadmeTest < Minitest::Test
|
||||||
example do
|
example do
|
||||||
mock_app { get('/') { 'Hello world!' } }
|
mock_app { get('/') { 'Hello world!' } }
|
||||||
get '/'
|
get '/'
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
require File.expand_path('../helper', __FILE__)
|
require File.expand_path('../helper', __FILE__)
|
||||||
require 'stringio'
|
require 'stringio'
|
||||||
|
|
||||||
class RequestTest < Test::Unit::TestCase
|
class RequestTest < Minitest::Test
|
||||||
it 'responds to #user_agent' do
|
it 'responds to #user_agent' do
|
||||||
request = Sinatra::Request.new({'HTTP_USER_AGENT' => 'Test'})
|
request = Sinatra::Request.new({'HTTP_USER_AGENT' => 'Test'})
|
||||||
assert request.respond_to?(:user_agent)
|
assert request.respond_to?(:user_agent)
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
require File.expand_path('../helper', __FILE__)
|
require File.expand_path('../helper', __FILE__)
|
||||||
|
|
||||||
class ResponseTest < Test::Unit::TestCase
|
class ResponseTest < Minitest::Test
|
||||||
setup { @response = Sinatra::Response.new }
|
setup { @response = Sinatra::Response.new }
|
||||||
|
|
||||||
def assert_same_body(a, b)
|
def assert_same_body(a, b)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
require File.expand_path('../helper', __FILE__)
|
require File.expand_path('../helper', __FILE__)
|
||||||
|
|
||||||
class ResultTest < Test::Unit::TestCase
|
class ResultTest < Minitest::Test
|
||||||
it "sets response.body when result is a String" do
|
it "sets response.body when result is a String" do
|
||||||
mock_app { get('/') { 'Hello World' } }
|
mock_app { get('/') { 'Hello World' } }
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@ class ResultTest < Test::Unit::TestCase
|
||||||
get('/') { [409, 'formula of', 'something else', 'even more'] }
|
get('/') { [409, 'formula of', 'something else', 'even more'] }
|
||||||
}
|
}
|
||||||
|
|
||||||
assert_raise(ArgumentError) { get '/' }
|
assert_raises(ArgumentError) { get '/' }
|
||||||
end
|
end
|
||||||
|
|
||||||
it "sets status when result is a Fixnum status code" do
|
it "sets status when result is a Fixnum status code" do
|
||||||
|
|
|
@ -10,7 +10,7 @@ module RouteAddedTest
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class RouteAddedHookTest < Test::Unit::TestCase
|
class RouteAddedHookTest < Minitest::Test
|
||||||
setup do
|
setup do
|
||||||
RouteAddedTest.routes.clear
|
RouteAddedTest.routes.clear
|
||||||
RouteAddedTest.procs.clear
|
RouteAddedTest.procs.clear
|
||||||
|
|
|
@ -22,7 +22,7 @@ class RegexpLookAlike
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class RoutingTest < Test::Unit::TestCase
|
class RoutingTest < Minitest::Test
|
||||||
%w[get put post delete options patch link unlink].each do |verb|
|
%w[get put post delete options patch link unlink].each do |verb|
|
||||||
it "defines #{verb.upcase} request handlers with #{verb}" do
|
it "defines #{verb.upcase} request handlers with #{verb}" do
|
||||||
mock_app {
|
mock_app {
|
||||||
|
@ -601,7 +601,7 @@ class RoutingTest < Test::Unit::TestCase
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'raises a TypeError when pattern is not a String or Regexp' do
|
it 'raises a TypeError when pattern is not a String or Regexp' do
|
||||||
assert_raise(TypeError) {
|
assert_raises(TypeError) {
|
||||||
mock_app { get(42){} }
|
mock_app { get(42){} }
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
@ -1228,7 +1228,7 @@ class RoutingTest < Test::Unit::TestCase
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
assert_raise(ArgumentError) { get '/a/b/c' }
|
assert_raises(ArgumentError) { get '/a/b/c' }
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'raises an ArgumentError with block param arity > 1 and too few values' do
|
it 'raises an ArgumentError with block param arity > 1 and too few values' do
|
||||||
|
@ -1238,7 +1238,7 @@ class RoutingTest < Test::Unit::TestCase
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
assert_raise(ArgumentError) { get '/a/b' }
|
assert_raises(ArgumentError) { get '/a/b' }
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'succeeds if no block parameters are specified' do
|
it 'succeeds if no block parameters are specified' do
|
||||||
|
@ -1313,7 +1313,7 @@ class RoutingTest < Test::Unit::TestCase
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
assert_raise(ArgumentError) { get '/foo' }
|
assert_raises(ArgumentError) { get '/foo' }
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'raises an ArgumentError with block param arity 1 and too many values' do
|
it 'raises an ArgumentError with block param arity 1 and too many values' do
|
||||||
|
@ -1323,7 +1323,7 @@ class RoutingTest < Test::Unit::TestCase
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
assert_raise(ArgumentError) { get '/a/b/c' }
|
assert_raises(ArgumentError) { get '/a/b/c' }
|
||||||
end
|
end
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
|
@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
|
||||||
begin
|
begin
|
||||||
require 'sass'
|
require 'sass'
|
||||||
|
|
||||||
class SassTest < Test::Unit::TestCase
|
class SassTest < Minitest::Test
|
||||||
def sass_app(options = {}, &block)
|
def sass_app(options = {}, &block)
|
||||||
mock_app do
|
mock_app do
|
||||||
set :views, File.dirname(__FILE__) + '/views'
|
set :views, File.dirname(__FILE__) + '/views'
|
||||||
|
@ -56,7 +56,7 @@ class SassTest < Test::Unit::TestCase
|
||||||
|
|
||||||
it "raises error if template not found" do
|
it "raises error if template not found" do
|
||||||
mock_app { get('/') { sass :no_such_template } }
|
mock_app { get('/') { sass :no_such_template } }
|
||||||
assert_raise(Errno::ENOENT) { get('/') }
|
assert_raises(Errno::ENOENT) { get('/') }
|
||||||
end
|
end
|
||||||
|
|
||||||
it "passes SASS options to the Sass engine" do
|
it "passes SASS options to the Sass engine" do
|
||||||
|
@ -102,7 +102,7 @@ class SassTest < Test::Unit::TestCase
|
||||||
get '/'
|
get '/'
|
||||||
assert ok?
|
assert ok?
|
||||||
assert_equal "#sass { background-color: white; color: black; }\n", body
|
assert_equal "#sass { background-color: white; color: black; }\n", body
|
||||||
assert_raise(Sass::SyntaxError) { get('/raised') }
|
assert_raises(Sass::SyntaxError) { get('/raised') }
|
||||||
get '/expanded_normal'
|
get '/expanded_normal'
|
||||||
assert ok?
|
assert ok?
|
||||||
assert_equal "#sass {\n background-color: white;\n color: black;\n}\n",
|
assert_equal "#sass {\n background-color: white;\n color: black;\n}\n",
|
||||||
|
|
|
@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
|
||||||
begin
|
begin
|
||||||
require 'sass'
|
require 'sass'
|
||||||
|
|
||||||
class ScssTest < Test::Unit::TestCase
|
class ScssTest < Minitest::Test
|
||||||
def scss_app(options = {}, &block)
|
def scss_app(options = {}, &block)
|
||||||
mock_app do
|
mock_app do
|
||||||
set :views, File.dirname(__FILE__) + '/views'
|
set :views, File.dirname(__FILE__) + '/views'
|
||||||
|
@ -56,7 +56,7 @@ class ScssTest < Test::Unit::TestCase
|
||||||
|
|
||||||
it "raises error if template not found" do
|
it "raises error if template not found" do
|
||||||
mock_app { get('/') { scss(:no_such_template) } }
|
mock_app { get('/') { scss(:no_such_template) } }
|
||||||
assert_raise(Errno::ENOENT) { get('/') }
|
assert_raises(Errno::ENOENT) { get('/') }
|
||||||
end
|
end
|
||||||
|
|
||||||
it "passes scss options to the scss engine" do
|
it "passes scss options to the scss engine" do
|
||||||
|
|
|
@ -3,7 +3,15 @@ require 'stringio'
|
||||||
|
|
||||||
module Rack::Handler
|
module Rack::Handler
|
||||||
class Mock
|
class Mock
|
||||||
extend Test::Unit::Assertions
|
extend Minitest::Assertions
|
||||||
|
# Allow assertions in request context
|
||||||
|
def self.assertions
|
||||||
|
@assertions ||= 0
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.assertions= assertions
|
||||||
|
@assertions = assertions
|
||||||
|
end
|
||||||
|
|
||||||
def self.run(app, options={})
|
def self.run(app, options={})
|
||||||
assert(app < Sinatra::Base)
|
assert(app < Sinatra::Base)
|
||||||
|
@ -19,7 +27,7 @@ module Rack::Handler
|
||||||
register 'mock', 'Rack::Handler::Mock'
|
register 'mock', 'Rack::Handler::Mock'
|
||||||
end
|
end
|
||||||
|
|
||||||
class ServerTest < Test::Unit::TestCase
|
class ServerTest < Minitest::Test
|
||||||
setup do
|
setup do
|
||||||
mock_app do
|
mock_app do
|
||||||
set :server, 'mock'
|
set :server, 'mock'
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
require File.expand_path('../helper', __FILE__)
|
require File.expand_path('../helper', __FILE__)
|
||||||
|
|
||||||
class SettingsTest < Test::Unit::TestCase
|
class SettingsTest < Minitest::Test
|
||||||
setup do
|
setup do
|
||||||
@base = Sinatra.new(Sinatra::Base)
|
@base = Sinatra.new(Sinatra::Base)
|
||||||
@base.set :environment => :foo, :app_file => nil
|
@base.set :environment => :foo, :app_file => nil
|
||||||
|
@ -28,14 +28,14 @@ class SettingsTest < Test::Unit::TestCase
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'raises an error with a value and a block' do
|
it 'raises an error with a value and a block' do
|
||||||
assert_raise ArgumentError do
|
assert_raises ArgumentError do
|
||||||
@base.set(:fiz, 'boom!'){ 'baz' }
|
@base.set(:fiz, 'boom!'){ 'baz' }
|
||||||
end
|
end
|
||||||
assert !@base.respond_to?(:fiz)
|
assert !@base.respond_to?(:fiz)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'raises an error without value and block' do
|
it 'raises an error without value and block' do
|
||||||
assert_raise(ArgumentError) { @base.set(:fiz) }
|
assert_raises(ArgumentError) { @base.set(:fiz) }
|
||||||
assert !@base.respond_to?(:fiz)
|
assert !@base.respond_to?(:fiz)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@ class SettingsTest < Test::Unit::TestCase
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'raises an error with the app class as value and a block' do
|
it 'raises an error with the app class as value and a block' do
|
||||||
assert_raise ArgumentError do
|
assert_raises ArgumentError do
|
||||||
@base.set(:fiz, @base) { 'baz' }
|
@base.set(:fiz, @base) { 'baz' }
|
||||||
end
|
end
|
||||||
assert !@base.respond_to?(:fiz)
|
assert !@base.respond_to?(:fiz)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
require File.expand_path('../helper', __FILE__)
|
require File.expand_path('../helper', __FILE__)
|
||||||
|
|
||||||
class SinatraTest < Test::Unit::TestCase
|
class SinatraTest < Minitest::Test
|
||||||
it 'creates a new Sinatra::Base subclass on new' do
|
it 'creates a new Sinatra::Base subclass on new' do
|
||||||
app = Sinatra.new { get('/') { 'Hello World' } }
|
app = Sinatra.new { get('/') { 'Hello World' } }
|
||||||
assert_same Sinatra::Base, app.superclass
|
assert_same Sinatra::Base, app.superclass
|
||||||
|
|
|
@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
|
||||||
begin
|
begin
|
||||||
require 'slim'
|
require 'slim'
|
||||||
|
|
||||||
class SlimTest < Test::Unit::TestCase
|
class SlimTest < Minitest::Test
|
||||||
def slim_app(&block)
|
def slim_app(&block)
|
||||||
mock_app do
|
mock_app do
|
||||||
set :views, File.dirname(__FILE__) + '/views'
|
set :views, File.dirname(__FILE__) + '/views'
|
||||||
|
@ -42,7 +42,7 @@ class SlimTest < Test::Unit::TestCase
|
||||||
|
|
||||||
it "raises error if template not found" do
|
it "raises error if template not found" do
|
||||||
mock_app { get('/') { slim(:no_such_template) } }
|
mock_app { get('/') { slim(:no_such_template) } }
|
||||||
assert_raise(Errno::ENOENT) { get('/') }
|
assert_raises(Errno::ENOENT) { get('/') }
|
||||||
end
|
end
|
||||||
|
|
||||||
HTML4_DOCTYPE = "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">"
|
HTML4_DOCTYPE = "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
require File.expand_path('../helper', __FILE__)
|
require File.expand_path('../helper', __FILE__)
|
||||||
|
|
||||||
class StaticTest < Test::Unit::TestCase
|
class StaticTest < Minitest::Test
|
||||||
setup do
|
setup do
|
||||||
mock_app do
|
mock_app do
|
||||||
set :static, true
|
set :static, true
|
||||||
|
@ -233,4 +233,4 @@ class StaticTest < Test::Unit::TestCase
|
||||||
assert response.headers.include?('Last-Modified')
|
assert response.headers.include?('Last-Modified')
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
require File.expand_path('../helper', __FILE__)
|
require File.expand_path('../helper', __FILE__)
|
||||||
|
|
||||||
class StreamingTest < Test::Unit::TestCase
|
class StreamingTest < Minitest::Test
|
||||||
Stream = Sinatra::Helpers::Stream
|
Stream = Sinatra::Helpers::Stream
|
||||||
|
|
||||||
it 'returns the concatenated body' do
|
it 'returns the concatenated body' do
|
||||||
|
@ -105,7 +105,7 @@ class StreamingTest < Test::Unit::TestCase
|
||||||
scheduler = MockScheduler.new
|
scheduler = MockScheduler.new
|
||||||
Stream.new(scheduler) { fail 'should be caught' }.each { }
|
Stream.new(scheduler) { fail 'should be caught' }.each { }
|
||||||
scheduler.defer!
|
scheduler.defer!
|
||||||
assert_raise(RuntimeError) { scheduler.schedule! }
|
assert_raises(RuntimeError) { scheduler.schedule! }
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not trigger an infinite loop if you call close in a callback' do
|
it 'does not trigger an infinite loop if you call close in a callback' do
|
||||||
|
|
|
@ -10,7 +10,7 @@ begin
|
||||||
raise LoadError, 'unable to find Stylus compiler'
|
raise LoadError, 'unable to find Stylus compiler'
|
||||||
end
|
end
|
||||||
|
|
||||||
class StylusTest < Test::Unit::TestCase
|
class StylusTest < Minitest::Test
|
||||||
def stylus_app(options = {}, &block)
|
def stylus_app(options = {}, &block)
|
||||||
mock_app do
|
mock_app do
|
||||||
set :views, File.dirname(__FILE__) + '/views'
|
set :views, File.dirname(__FILE__) + '/views'
|
||||||
|
@ -65,7 +65,7 @@ begin
|
||||||
mock_app {
|
mock_app {
|
||||||
get('/') { stylus :no_such_template }
|
get('/') { stylus :no_such_template }
|
||||||
}
|
}
|
||||||
assert_raise(Errno::ENOENT) { get('/') }
|
assert_raises(Errno::ENOENT) { get('/') }
|
||||||
end
|
end
|
||||||
|
|
||||||
it "passes stylus options to the stylus engine" do
|
it "passes stylus options to the stylus engine" do
|
||||||
|
|
|
@ -14,7 +14,7 @@ class TestTemplate < Tilt::Template
|
||||||
Tilt.register 'test', self
|
Tilt.register 'test', self
|
||||||
end
|
end
|
||||||
|
|
||||||
class TemplatesTest < Test::Unit::TestCase
|
class TemplatesTest < Minitest::Test
|
||||||
def render_app(base=Sinatra::Base, options = {}, &block)
|
def render_app(base=Sinatra::Base, options = {}, &block)
|
||||||
base, options = Sinatra::Base, base if base.is_a? Hash
|
base, options = Sinatra::Base, base if base.is_a? Hash
|
||||||
mock_app(base) do
|
mock_app(base) do
|
||||||
|
@ -197,7 +197,7 @@ class TemplatesTest < Test::Unit::TestCase
|
||||||
end
|
end
|
||||||
|
|
||||||
test 'inline_templates ignores IO errors' do
|
test 'inline_templates ignores IO errors' do
|
||||||
assert_nothing_raised { mock_app { set(:inline_templates, '/foo/bar') } }
|
mock_app { set(:inline_templates, '/foo/bar') }
|
||||||
|
|
||||||
assert @app.templates.empty?
|
assert @app.templates.empty?
|
||||||
end
|
end
|
||||||
|
|
|
@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
|
||||||
begin
|
begin
|
||||||
require 'redcloth'
|
require 'redcloth'
|
||||||
|
|
||||||
class TextileTest < Test::Unit::TestCase
|
class TextileTest < Minitest::Test
|
||||||
def textile_app(&block)
|
def textile_app(&block)
|
||||||
mock_app do
|
mock_app do
|
||||||
set :views, File.dirname(__FILE__) + '/views'
|
set :views, File.dirname(__FILE__) + '/views'
|
||||||
|
@ -26,7 +26,7 @@ class TextileTest < Test::Unit::TestCase
|
||||||
|
|
||||||
it "raises error if template not found" do
|
it "raises error if template not found" do
|
||||||
mock_app { get('/') { textile(:no_such_template) } }
|
mock_app { get('/') { textile(:no_such_template) } }
|
||||||
assert_raise(Errno::ENOENT) { get('/') }
|
assert_raises(Errno::ENOENT) { get('/') }
|
||||||
end
|
end
|
||||||
|
|
||||||
it "renders with inline layouts" do
|
it "renders with inline layouts" do
|
||||||
|
|
|
@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
|
||||||
begin
|
begin
|
||||||
require 'wlang'
|
require 'wlang'
|
||||||
|
|
||||||
class WLangTest < Test::Unit::TestCase
|
class WLangTest < Minitest::Test
|
||||||
def engine
|
def engine
|
||||||
Tilt::WLangTemplate
|
Tilt::WLangTemplate
|
||||||
end
|
end
|
||||||
|
|
|
@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
|
||||||
begin
|
begin
|
||||||
require 'yajl'
|
require 'yajl'
|
||||||
|
|
||||||
class YajlTest < Test::Unit::TestCase
|
class YajlTest < Minitest::Test
|
||||||
def yajl_app(&block)
|
def yajl_app(&block)
|
||||||
mock_app do
|
mock_app do
|
||||||
set :views, File.dirname(__FILE__) + '/views'
|
set :views, File.dirname(__FILE__) + '/views'
|
||||||
|
@ -26,7 +26,7 @@ class YajlTest < Test::Unit::TestCase
|
||||||
|
|
||||||
it 'raises error if template not found' do
|
it 'raises error if template not found' do
|
||||||
mock_app { get('/') { yajl(:no_such_template) } }
|
mock_app { get('/') { yajl(:no_such_template) } }
|
||||||
assert_raise(Errno::ENOENT) { get('/') }
|
assert_raises(Errno::ENOENT) { get('/') }
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'accepts a :locals option' do
|
it 'accepts a :locals option' do
|
||||||
|
|
Loading…
Reference in New Issue