thumblemonks-chicago 0.3.1 → 0.3.2

data/README.markdown

@@ -31,7 +31,13 @@ Assuming you have required 'rack/test', like so:
 
     require 'rack/test'
 
-This is because these macros use last_request defined by the Rack/Test library. If you're using Shoulda in your tests of your Sinatra app, do this:
+This is because these macros use last_request defined by the Rack/Test library. If you're using [Protest](http://github.com/thumblemonks/protest) in your tests of your Sinatra app, do this:
+
+    require 'chicago/protest'
+
+... and you'll get a bunch of cool Protest macros for testing specific Sinatra stuff.
+
+If you're using Shoulda in your tests of your Sinatra app, do this:
 
     require 'chicago/shoulda'
 

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'rake'
-require 'rake/testtask'
 
 desc 'Default task: run all tests'
 task :default => [:test]
@@ -11,11 +10,12 @@ task :environment do
   # Nothing yet
 end
 
-task :test => [:set_test_env, :environment]
-desc 'Run all tests'
-Rake::TestTask.new do |t|
-  t.test_files = FileList['test/*_test.rb']
-  t.verbose = true
+desc "Run all tests"
+task :test => [:set_test_env, :environment] do
+  require 'protest'
+  $:.concat ['./lib', './test']
+  Dir.glob("./test/*_test.rb").each { |test| require test }
+  Protest.run
 end
 
 desc "Open an irb session preloaded with this library"

data/chicago.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "chicago"
-  s.version  = "0.3.1"
-  s.date     = "2009-06-10"
+  s.version  = "0.3.2"
+  s.date     = "2009-06-28"
   s.summary  = "Sinatra runtime and testing extensions used commonly by Thumblemonks"
   s.email    = %w[gus@gusg.us gabriel.gironda@gmail.com]
   s.homepage = "http://github.com/thumblemonks/chicago/tree/master"
@@ -22,6 +22,8 @@ Gem::Specification.new do |s|
     lib/chicago.rb
     lib/chicago/application.rb
     lib/chicago/helpers.rb
+    lib/chicago/protest.rb
+    lib/chicago/protest/macros.rb
     lib/chicago/responders.rb
     lib/chicago/shoulda.rb
     lib/chicago/shoulda/sinatra.rb

data/lib/chicago/protest/macros.rb

@@ -0,0 +1,34 @@
+require 'json'
+
+module Chicago
+  module Protest
+    module Macros
+      def asserts_response_status(expected)
+        asserts("response status").equals(expected) { last_response.status }
+      end
+      
+      def asserts_content_type(expected)
+        asserts("content type").equals(expected) { last_response.headers['Content-type'] }
+      end
+
+      def asserts_response_body(expected)
+        # TODO: implement a matches operator
+        asserts("response body").not do
+          expected = %r[#{expected}] if expected.kind_of?(String)
+          expected.match(last_response.body).nil?
+        end
+      end
+
+      def asserts_json_response(json, &block)
+        asserts_content_type 'application/json'
+        asserts("response body has JSON") do
+          json = json.to_json unless json.instance_of?(String)
+          last_response.body == json
+        end
+      end
+
+    end # Macros
+  end # Protest
+end # Chicago
+
+Protest::Context.instance_eval { include Chicago::Protest::Macros }

data/lib/chicago/protest.rb

@@ -0,0 +1 @@
+require 'chicago/protest/macros'

data/test/application_test.rb

@@ -1,8 +1,8 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 
-class ApplicationTest < Test::Unit::TestCase
+context "ApplicationTest:" do
 
-  def app
+  setup do
     mock_app {
       register Sinatra::Chicago
 
@@ -17,15 +17,16 @@ class ApplicationTest < Test::Unit::TestCase
     }
   end
 
+  # TODO: change to namespace
   context "catching all css" do
     context "with default path" do
       setup do
         get '/stylesheets/foo.css'
       end
 
-      should_have_response_status 200
-      should_have_content_type 'text/css'
-      should_have_response_body %r[.bar \{\s+display: none; \}\s]
+      asserts_response_status 200
+      asserts_content_type 'text/css'
+      asserts_response_body %r[.bar \{\s+display: none; \}\s]
     end
 
     context "with specified path" do
@@ -33,9 +34,9 @@ class ApplicationTest < Test::Unit::TestCase
         get '/css/goo.css'
       end
 
-      should_have_response_status 200
-      should_have_content_type 'text/css'
-      should_have_response_body %r[.car \{\s+display: some; \}\s]
+      asserts_response_status 200
+      asserts_content_type 'text/css'
+      asserts_response_body %r[.car \{\s+display: some; \}\s]
     end
 
     context "with path that's not a defined a sass file" do
@@ -43,17 +44,14 @@ class ApplicationTest < Test::Unit::TestCase
         get '/stylesheets/zoo.css'
       end
 
-      should_have_response_status 404
-      should_have_content_type 'text/html'
+      asserts_response_status 404
+      asserts_content_type 'text/html'
     end
   end # catching all css
 
   context "getting obvious views" do
-    setup do
-      get '/baz'
-    end
-
-    should_have_response_body "Whatever man. That's just like, your opinion."
-  end
+    setup { get '/baz' }
+    asserts_response_body "Whatever man. That's just like, your opinion."
+  end # getting obvious views
 
 end

data/test/helpers_test.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 
-class HelpersTest < Test::Unit::TestCase
-  def app
+context "HelpersTest:" do
+  setup do
     mock_app {
       helpers Sinatra::Chicago::Helpers
     }
@@ -17,11 +17,11 @@ class HelpersTest < Test::Unit::TestCase
         get '/foo'
       end
 
-      should_have_response_body %r[^<link( \w+=".+"){4}/>$]
-      should_have_response_body %r[href="/stylesheets/foo\.css"]
-      should_have_response_body %r[media="screen"]
-      should_have_response_body %r[rel="stylesheet"]
-      should_have_response_body %r[type="text/css"]
+      asserts_response_body %r[^<link( \w+=".+"){4}/>$]
+      asserts_response_body %r[href="/stylesheets/foo\.css"]
+      asserts_response_body %r[media="screen"]
+      asserts_response_body %r[rel="stylesheet"]
+      asserts_response_body %r[type="text/css"]
     end # for plain old foo
 
     context "for bar with options" do
@@ -33,12 +33,12 @@ class HelpersTest < Test::Unit::TestCase
         get '/foo'
       end
 
-      should_have_response_body %r[^<link( \w+=".+"){5}/>$]
-      should_have_response_body %r[href="/stylesheets/bar\.css"]
-      should_have_response_body %r[media="print"]
-      should_have_response_body %r[rel="stylesheet"]
-      should_have_response_body %r[type="text/css"]
-      should_have_response_body %r[baz="boo"]
+      asserts_response_body %r[^<link( \w+=".+"){5}/>$]
+      asserts_response_body %r[href="/stylesheets/bar\.css"]
+      asserts_response_body %r[media="print"]
+      asserts_response_body %r[rel="stylesheet"]
+      asserts_response_body %r[type="text/css"]
+      asserts_response_body %r[baz="boo"]
     end # for bar with options
 
     context "with a specific href" do
@@ -49,7 +49,7 @@ class HelpersTest < Test::Unit::TestCase
         }
         get '/foo'
       end
-      should_have_response_body %r[href="http://example.com"]
+      asserts_response_body %r[href="http://example.com"]
     end # with a specific href
   end # including stylesheets
 
@@ -63,9 +63,9 @@ class HelpersTest < Test::Unit::TestCase
         get '/foo'
       end
 
-      should_have_response_body %r[^<script( \w+=".+"){2}></script>$]
-      should_have_response_body %r[src="/javascripts/foo\.js"]
-      should_have_response_body %r[type="text/javascript"]
+      asserts_response_body %r[^<script( \w+=".+"){2}></script>$]
+      asserts_response_body %r[src="/javascripts/foo\.js"]
+      asserts_response_body %r[type="text/javascript"]
     end # for plain old foo
 
     context "for foo with options" do
@@ -77,10 +77,10 @@ class HelpersTest < Test::Unit::TestCase
         get '/foo'
       end
 
-      should_have_response_body %r[^<script( \w+=".+"){3}></script>$]
-      should_have_response_body %r[src="/javascripts/foo\.js"]
-      should_have_response_body %r[type="text/blarg"]
-      should_have_response_body %r[gus="nice"]
+      asserts_response_body %r[^<script( \w+=".+"){3}></script>$]
+      asserts_response_body %r[src="/javascripts/foo\.js"]
+      asserts_response_body %r[type="text/blarg"]
+      asserts_response_body %r[gus="nice"]
     end # for foo with options
 
     context "with a specific src" do
@@ -91,7 +91,7 @@ class HelpersTest < Test::Unit::TestCase
         }
         get '/foo'
       end
-      should_have_response_body %r[src="http://example.com"]
+      asserts_response_body %r[src="http://example.com"]
     end # with a specific src
   end # including javascript
 
@@ -105,7 +105,7 @@ class HelpersTest < Test::Unit::TestCase
         get '/foo'
       end
 
-      should_have_response_body %Q[<a href="/bar">foo</a>]
+      asserts_response_body %Q[<a href="/bar">foo</a>]
     end # for plain old foo
 
     context "with options" do
@@ -117,9 +117,9 @@ class HelpersTest < Test::Unit::TestCase
         get '/foo'
       end
 
-      should_have_response_body %r[^<a( \w+=".+"){2}>foo bear</a>$]
-      should_have_response_body %r[href="/bar/ler"]
-      should_have_response_body %r[title="gus is nice"]
+      asserts_response_body %r[^<a( \w+=".+"){2}>foo bear</a>$]
+      asserts_response_body %r[href="/bar/ler"]
+      asserts_response_body %r[title="gus is nice"]
     end # with options
   end # using an anchor
 end

data/test/responders_test.rb

@@ -1,8 +1,8 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 
-class RespondersTest < Test::Unit::TestCase
+context "RespondersTest" do
 
-  def app
+  setup do
     mock_app {
       helpers Sinatra::Chicago::Responders
       get "/json_bait" do
@@ -17,8 +17,8 @@ class RespondersTest < Test::Unit::TestCase
       get "/json_bait"
     end
 
-    should_have_response_status 201
-    should_have_json_response({:foo => :bar})
+    asserts_response_status 201
+    asserts_json_response({:foo => :bar})
   end # json response
 
 end

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-%w[ rubygems haml sass chicago test/unit rack/test shoulda chicago/shoulda ].each do |lib|
+%w[ rubygems protest haml sass chicago rack/test chicago/protest ].each do |lib|
   require lib
 end
 
@@ -14,8 +14,12 @@ module Rack::Test::Methods
     @_rack_test_session ||= Rack::Test::Session.new(app)
     @app.instance_eval(&block)
   end
+
+  def app
+    @app
+  end
 end
 
-class Test::Unit::TestCase
+class Protest::Context
   include Rack::Test::Methods
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thumblemonks-chicago
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Justin Knowlden
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-10 00:00:00 -07:00
+date: 2009-06-28 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +34,8 @@ files:
 - lib/chicago.rb
 - lib/chicago/application.rb
 - lib/chicago/helpers.rb
+- lib/chicago/protest.rb
+- lib/chicago/protest/macros.rb
 - lib/chicago/responders.rb
 - lib/chicago/shoulda.rb
 - lib/chicago/shoulda/sinatra.rb