Syd-sinatra 0.3.2 → 0.9.0.2

data/compat/mapped_error_test.rb

@@ -0,0 +1,72 @@
+require File.dirname(__FILE__) + '/helper'
+
+class FooError < RuntimeError; end
+
+context "Mapped errors" do
+
+  setup do
+    Sinatra.application = nil
+    Sinatra.application.options.raise_errors = false
+  end
+
+  specify "are rescued and run in context" do
+
+    error FooError do
+      'MAPPED ERROR!'
+    end
+
+    get '/' do
+      raise FooError
+    end
+
+    get_it '/'
+
+    should.be.server_error
+    body.should.equal 'MAPPED ERROR!'
+
+  end
+
+  specify "renders empty if no each method on result" do
+
+    error FooError do
+      nil
+    end
+
+    get '/' do
+      raise FooError
+    end
+
+    get_it '/'
+
+    should.be.server_error
+    body.should.be.empty
+
+  end
+
+  specify "doesn't override status if set" do
+
+    error FooError do
+      status(200)
+    end
+
+    get '/' do
+      raise FooError
+    end
+
+    get_it '/'
+
+    should.be.ok
+
+  end
+
+  specify "raises errors when the raise_errors option is set" do
+    Sinatra.application.options.raise_errors = true
+    error FooError do
+    end
+    get '/' do
+      raise FooError
+    end
+    assert_raises(FooError) { get_it('/') }
+  end
+
+end

data/{test → compat}/pipeline_test.rb

@@ -23,24 +23,29 @@ context "Middleware Pipelines" do
     Sinatra.application = nil
   end
 
-  specify "includes default middleware with options set" do
+  # Sessions and logging are tested elsewhere. This is a bad test because it
+  # asserts things about the implementation and not the effect.
+  xspecify "includes default middleware with options set" do
     @app.set_options :sessions => true, :logging => true
     @app.send(:optional_middleware).should.include([Rack::Session::Cookie, [], nil])
     @app.send(:optional_middleware).should.include([Rack::CommonLogger, [], nil])
   end
 
-  specify "does not include default middleware with options unset" do
+  # Bad test.
+  xspecify "does not include default middleware with options unset" do
     @app.set_options :sessions => false, :logging => false
     @app.send(:optional_middleware).should.not.include([Rack::Session::Cookie, [], nil])
     @app.send(:optional_middleware).should.not.include([Rack::CommonLogger, [], nil])
   end
 
-  specify "includes only optional middleware when no explicit middleware added" do
+  # Bad test.
+  xspecify "includes only optional middleware when no explicit middleware added" do
     @app.set_options :sessions => true, :logging => true
     @app.send(:middleware).should.equal @app.send(:optional_middleware)
   end
 
-  specify "should clear middleware before reload" do
+  # Bad test.
+  xspecify "should clear middleware before reload" do
     @app.clearables.should.include(@app.send(:explicit_middleware))
   end
 

data/compat/sass_test.rb

@@ -0,0 +1,57 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "Sass" do
+
+  setup do
+    Sinatra.application = nil
+  end
+
+  context "Templates (in general)" do
+
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify "are read from files if Symbols" do
+
+      get '/from_file' do
+        sass :foo, :views_directory => File.dirname(__FILE__) + "/views"
+      end
+
+      get_it '/from_file'
+      should.be.ok
+      body.should.equal "#sass {\n  background_color: #FFF; }\n"
+
+    end
+
+    specify "raise an error if template not found" do
+      get '/' do
+        sass :not_found
+      end
+
+      lambda { get_it '/' }.should.raise(Errno::ENOENT)
+    end
+
+    specify "ignore default layout file with .sass extension" do
+      get '/' do
+        sass :foo, :views_directory => File.dirname(__FILE__) + "/views/layout_test"
+      end
+
+      get_it '/'
+      should.be.ok
+      body.should.equal "#sass {\n  background_color: #FFF; }\n"
+    end
+
+    specify "ignore explicitly specified layout file" do
+      get '/' do
+        sass :foo, :layout => :layout, :views_directory => File.dirname(__FILE__) + "/views/layout_test"
+      end
+
+      get_it '/'
+      should.be.ok
+      body.should.equal "#sass {\n  background_color: #FFF; }\n"
+    end
+
+  end
+
+end

data/{test → compat}/streaming_test.rb

@@ -62,6 +62,7 @@ context "Static files (by default)" do
     headers['Last-Modified'].should.equal last_modified.httpdate
   end
 
+  # Deprecated. Use: ConditionalGet middleware.
   specify "are not served when If-Modified-Since matches" do
     last_modified = File.mtime(Sinatra.application.options.public + '/foo.xml')
     @request = Rack::MockRequest.new(Sinatra.application)
@@ -91,7 +92,8 @@ context "SendData" do
     Sinatra.application = nil
   end
 
-  specify "should send the data with options" do
+  # Deprecated. send_data is going away.
+  xspecify "should send the data with options" do
     get '/' do
       send_data 'asdf', :status => 500
     end
@@ -102,6 +104,7 @@ context "SendData" do
     body.should.equal 'asdf'
   end
 
+  # Deprecated. The Content-Disposition is no longer handled by sendfile.
   specify "should include a Content-Disposition header" do
     get '/' do
       send_file File.dirname(__FILE__) + '/public/foo.xml'