padrino-core 0.12.0 → 0.12.1

data/test/fixtures/apps/demo_app.rb

@@ -0,0 +1,7 @@
+PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+
+module Demo
+  class App < Padrino::Application
+    set :reload, true
+  end
+end

data/test/fixtures/apps/demo_demo.rb

@@ -0,0 +1,7 @@
+PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+
+module Demo
+  class Demo < Padrino::Application
+    set :reload, true
+  end
+end

data/test/helper.rb

@@ -2,21 +2,21 @@ ENV['RACK_ENV'] = 'test'
 PADRINO_ROOT = File.dirname(__FILE__) unless defined?(PADRINO_ROOT)
 
 require File.expand_path('../../../load_paths', __FILE__)
-require File.expand_path('../mini_shoulda', __FILE__)
+require 'minitest/autorun'
+require 'minitest/pride'
+require 'i18n'
+require 'padrino-support'
 require 'padrino-core'
 require 'json'
+require 'builder'
 require 'rack/test'
 require 'rack'
+require 'yaml'
 
 # Rubies < 1.9 don't handle hashes in the properly order so to prevent
 # this issue for now we remove extra values from mimetypes.
 Rack::Mime::MIME_TYPES.delete(".xsl") # In this way application/xml respond only to .xml
 
-class Sinatra::Base
-  # Allow assertions in request context
-  include MiniTest::Assertions
-end
-
 class MiniTest::Spec
   include Rack::Test::Methods
 
@@ -49,35 +49,4 @@ class MiniTest::Spec
   end
 
   alias :response :last_response
-
-  def create_template(name, content, options={})
-    FileUtils.mkdir_p(File.dirname(__FILE__) + "/views")
-    FileUtils.mkdir_p(File.dirname(__FILE__) + "/views/layouts")
-    path  = "/views/#{name}"
-    path += ".#{options.delete(:locale)}" if options[:locale].present?
-    path += ".#{options[:format]}" if options[:format].present?
-    path += ".erb" unless options[:format].to_s =~ /erb|slim|haml|rss|atom/
-    path += ".builder" if options[:format].to_s =~ /rss|atom/
-    file  = File.dirname(__FILE__) + path
-    File.open(file, 'w') { |io| io.write content }
-    file
-  end
-  alias :create_view   :create_template
-  alias :create_layout :create_template
-
-  def remove_views
-    FileUtils.rm_rf(File.dirname(__FILE__) + "/views")
-  end
-
-  def with_template(name, content, options={})
-    # Build a temp layout
-    template = create_template(name, content, options)
-    yield
-  ensure
-    # Remove temp layout
-    File.unlink(template) rescue nil
-    remove_views
-  end
-  alias :with_view   :with_template
-  alias :with_layout :with_template
 end

data/test/test_application.rb

@@ -7,11 +7,10 @@ class PadrinoTestApp2 < Padrino::Application; end
 
 describe "Application" do
   before { Padrino.clear! }
-  after  { remove_views }
 
-  context 'for application functionality' do
+  describe 'for application functionality' do
 
-    should 'check default options' do
+    it 'should check default options' do
       assert File.identical?(__FILE__, PadrinoPristine.app_file)
       assert_equal :padrino_pristine, PadrinoPristine.app_name
       assert_equal :test, PadrinoPristine.environment
@@ -25,7 +24,7 @@ describe "Application" do
       assert !Padrino.configure_apps
     end
 
-    should 'check padrino specific options' do
+    it 'should check padrino specific options' do
       assert !PadrinoPristine.instance_variable_get(:@_configured)
       PadrinoPristine.send(:setup_application!)
       assert_equal :padrino_pristine, PadrinoPristine.app_name
@@ -34,7 +33,7 @@ describe "Application" do
       assert !PadrinoPristine.reload?
     end
 
-    should 'set global project settings' do
+    it 'should set global project settings' do
       Padrino.configure_apps { enable :sessions; set :foo, "bar" }
       PadrinoTestApp.send(:default_configuration!)
       PadrinoTestApp2.send(:default_configuration!)
@@ -43,7 +42,7 @@ describe "Application" do
       assert_equal PadrinoTestApp.session_secret, PadrinoTestApp2.session_secret
     end
 
-    should 'be able to configure_apps multiple times' do
+    it 'should be able to configure_apps multiple times' do
       Padrino.configure_apps { set :foo1, "bar" }
       Padrino.configure_apps { set :foo1, "bam" }
       Padrino.configure_apps { set :foo2, "baz" }
@@ -52,7 +51,7 @@ describe "Application" do
       assert_equal "baz", PadrinoTestApp.settings.foo2, "should have foo2 assigned to baz"
     end
 
-    should "have shared sessions accessible in project" do
+    it 'should have shared sessions accessible in project' do
       Padrino.configure_apps { enable :sessions; set :session_secret, 'secret' }
       Padrino.mount("PadrinoTestApp").to("/write")
       Padrino.mount("PadrinoTestApp2").to("/read")
@@ -67,7 +66,7 @@ describe "Application" do
     end
 
     # compare to: test_routing: allow global provides
-    should "set content_type to nil if none can be determined" do
+    it 'should set content_type to nil if none can be determined' do
       mock_app do
         provides :xml
 
@@ -84,25 +83,25 @@ describe "Application" do
       assert_equal "Foo in nil", body
     end
 
-    should "resolve views and layouts paths" do
+    it 'should resolve views and layouts paths' do
       assert_equal Padrino.root('views')+'/users/index', PadrinoPristine.view_path('users/index')
       assert_equal Padrino.root('views')+'/layouts/app', PadrinoPristine.layout_path(:app)
     end
 
-    context "errors" do
-      should "haven't mapped errors on development" do
+    describe "errors" do
+      it 'should have not mapped errors on development' do
         mock_app { get('/'){ 'HI' } }
         get "/"
         assert @app.errors.empty?
       end
 
-      should "have mapped errors on production" do
+      it 'should have mapped errors on production' do
         mock_app { set :environment, :production; get('/'){ 'HI' } }
         get "/"
         assert_equal 1, @app.errors.size
       end
 
-      should "overide errors" do
+      it 'should overide errors' do
         mock_app do
           set :environment, :production
           get('/'){ raise }

data/test/test_core.rb

@@ -5,9 +5,8 @@ describe "Core" do
     Padrino.clear!
   end
 
-  context 'for core functionality' do
-
-    should 'check some global methods' do
+  describe 'for core functionality' do
+    it 'should check some global methods' do
       assert_respond_to Padrino, :root
       assert_respond_to Padrino, :env
       assert_respond_to Padrino, :application
@@ -18,28 +17,28 @@ describe "Core" do
       assert_respond_to Padrino, :configure_apps
     end
 
-
-    should 'validate global helpers' do
+    it 'should validate global helpers' do
       assert_equal :test, Padrino.env
       assert_match /\/test/, Padrino.root
-      assert_not_nil Padrino.version
+      refute_nil Padrino.version
     end
 
-    should 'set correct utf-8 encoding' do
+    it 'should set correct utf-8 encoding' do
       Padrino.set_encoding
       assert_equal Encoding.default_external, Encoding::UTF_8
       assert_equal Encoding.default_internal, Encoding::UTF_8
     end
 
-    should 'have load paths' do
+    it 'should have load paths' do
       assert_equal [Padrino.root('lib'), Padrino.root('models'), Padrino.root('shared')], Padrino.load_paths
     end
 
-    should 'raise application error if I instantiate a new padrino application without mounted apps' do
-      assert_raises(Padrino::ApplicationLoadError) { Padrino.application.new }
+    it 'should raise application error if I instantiate a new padrino application without mounted apps' do
+      text = capture_io { Padrino.application }
+      assert_match /No apps are mounted/, text.to_s
     end
 
-    should "check before/after padrino load hooks" do
+    it 'should check before/after padrino load hooks' do
       Padrino.before_load { @_foo  = 1 }
       Padrino.after_load  { @_foo += 1 }
       Padrino.load!
@@ -48,7 +47,7 @@ describe "Core" do
       assert_equal 2, @_foo
     end
 
-    should "add middlewares in front if specified" do
+    it 'should add middlewares in front if specified' do
       test = Class.new {
         def initialize(app)
           @app = app
@@ -70,7 +69,7 @@ describe "Core" do
       assert_equal "yes", res["Middleware-Called"]
     end
 
-    should "properly set default options" do
+    it 'should properly set default options' do
       mock_app do
         default :foo, :bar
         default :zoo, :baz

data/test/test_csrf_protection.rb

@@ -2,10 +2,9 @@ require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 describe "Application" do
   before { Padrino.clear! }
-  after  { remove_views }
 
-  context 'CSRF protection' do
-    context "with CSRF protection on" do
+  describe 'CSRF protection' do
+    describe "with CSRF protection on" do
       before do
         mock_app do
           enable :sessions
@@ -14,23 +13,23 @@ describe "Application" do
         end
       end
 
-      should "not allow requests without tokens" do
+      it 'should not allow requests without tokens' do
         post "/"
         assert_equal 403, status
       end
 
-      should "allow requests with correct tokens" do
+      it 'should allow requests with correct tokens' do
         post "/", {"authenticity_token" => "a"}, 'rack.session' => {:csrf => "a"}
         assert_equal 200, status
       end
 
-      should "not allow requests with incorrect tokens" do
+      it 'should not allow requests with incorrect tokens' do
         post "/", {"authenticity_token" => "a"}, 'rack.session' => {:csrf => "b"}
         assert_equal 403, status
       end
     end
 
-    context "without CSRF protection on" do
+    describe "without CSRF protection on" do
       before do
         mock_app do
           enable :sessions
@@ -39,45 +38,46 @@ describe "Application" do
         end
       end
 
-      should "allows requests without tokens" do
+      it 'should allows requests without tokens' do
         post "/"
         assert_equal 200, status
       end
 
-      should "allow requests with correct tokens" do
+      it 'should allow requests with correct tokens' do
         post "/", {"authenticity_token" => "a"}, 'rack.session' => {:csrf => "a"}
         assert_equal 200, status        
       end
 
-      should "allow requests with incorrect tokens" do
+      it 'should allow requests with incorrect tokens' do
         post "/", {"authenticity_token" => "a"}, 'rack.session' => {:csrf => "b"}
         assert_equal 200, status
       end
     end
 
-    context "with optional CSRF protection" do
+    describe "with optional CSRF protection" do
       before do
         mock_app do
           enable :sessions
           enable :protect_from_csrf
-          set :allow_disabled_csrf, true
+          enable :allow_disabled_csrf
           post('/on') { 'HI' }
           post('/off', :csrf_protection => false) { 'HI' }
         end
       end
 
-      should "allow access to routes with csrf_protection off" do
+      it 'should allow access to routes with csrf_protection off' do
         post "/off"
         assert_equal 200, status
       end
 
-      should "not allow access to routes with csrf_protection on" do
+      it 'should not allow access to routes with csrf_protection on' do
         post "/on"
         assert_equal 403, status
+        assert_equal 'Forbidden', body
       end
     end
 
-    context "with :except option that is using Proc" do
+    describe "with :except option that is using Proc" do
       before do
         mock_app do
           enable :sessions
@@ -88,7 +88,7 @@ describe "Application" do
         end
       end
 
-      should "allow ignoring CSRF protection on specific routes" do
+      it 'should allow ignoring CSRF protection on specific routes' do
         post "/"
         assert_equal 200, status
         post "/foo"
@@ -98,7 +98,7 @@ describe "Application" do
       end
     end
 
-    context "with :except option that is using String and Regexp" do
+    describe "with :except option that is using String and Regexp" do
       before do
         mock_app do
           enable :sessions
@@ -109,7 +109,7 @@ describe "Application" do
         end
       end
 
-      should "allow ignoring CSRF protection on specific routes" do
+      it 'should allow ignoring CSRF protection on specific routes' do
         post "/a"
         assert_equal 200, status
         post "/abc"
@@ -119,22 +119,28 @@ describe "Application" do
       end
     end
 
-    context "with custom protection options" do
+    describe "with custom protection options" do
       before do
         mock_app do
           enable :sessions
-          set :protect_from_csrf, :authenticity_param => 'foobar'
+          set :protect_from_csrf, :authenticity_param => 'foobar', :message => 'sucker!'
           post("/a") { "a" }
         end
       end
 
-      should "allow configuring protection options" do
+      it 'should allow configuring protection options' do
         post "/a", {"foobar" => "a"}, 'rack.session' => {:csrf => "a"}
         assert_equal 200, status
       end
+
+      it 'should allow configuring message' do
+        post "/a"
+        assert_equal 403, status
+        assert_equal 'sucker!', body
+      end
     end
 
-    context "with middleware" do
+    describe "with middleware" do
       before do
         class Middleware < Sinatra::Base
           post("/middleware") { "Hello, middleware" }
@@ -148,7 +154,7 @@ describe "Application" do
         end
       end
 
-      should "allow ignoring CSRF protection on specific routes of middleware" do
+      it 'should allow ignoring CSRF protection on specific routes of middleware' do
         post "/"
         assert_equal 200, status
         post "/middleware"
@@ -157,5 +163,25 @@ describe "Application" do
         assert_equal 403, status
       end
     end
+
+    describe "with standard report layout" do
+      before do
+        mock_app do
+          enable :sessions
+          set :protect_from_csrf, :message => 'sucker!'
+          enable :report_csrf_failure
+          post("/a") { "a" }
+          error 403 do
+            halt 406, 'please, do not hack'
+          end
+        end
+      end
+
+      it 'should allow configuring protection options' do
+        post "/a"
+        assert_equal 406, status
+        assert_equal 'please, do not hack', body
+      end
+    end
   end
 end

data/test/test_dependencies.rb

@@ -1,20 +1,20 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 describe "Dependencies" do
-  context 'when we require a dependency that have another dependency' do
-    setup do
+  describe 'when we require a dependency that have another dependency' do
+    before do
       @log_level = Padrino::Logger::Config[:test]
       @io = StringIO.new
       Padrino::Logger::Config[:test] = { :log_level => :error, :stream => @io }
       Padrino::Logger.setup!
     end
 
-    teardown do
+    after do
       Padrino::Logger::Config[:test] = @log_level
       Padrino::Logger.setup!
     end
 
-    should 'raise an error without reloading it twice' do
+    it 'should raise an error without reloading it twice' do
       capture_io do
         assert_raises(RuntimeError) do
           Padrino.require_dependencies(
@@ -26,10 +26,10 @@ describe "Dependencies" do
         end
       end
       assert_equal 1, D
-      assert_match /RuntimeError: SomeThing/, @io.string
+      assert_match /RuntimeError - SomeThing/, @io.string
     end
 
-    should 'resolve dependency problems' do
+    it 'should resolve dependency problems' do
       capture_io do
         Padrino.require_dependencies(
           Padrino.root("fixtures/dependencies/a.rb"),
@@ -42,7 +42,7 @@ describe "Dependencies" do
       assert_equal "", @io.string
     end
 
-    should 'remove partially loaded constants' do
+    it 'should remove partially loaded constants' do
       capture_io do
         Padrino.require_dependencies(
           Padrino.root("fixtures/dependencies/circular/e.rb"),