thumblemonks-chicago 0.3.2.2 → 0.3.3

data/Rakefile

@@ -1,23 +1,33 @@
 require 'rubygems'
 require 'rake'
+require 'rake/testtask'
 
 desc 'Default task: run all tests'
 task :default => [:test]
 
-task(:set_test_env) { ENV['SINATRA_ENV'] ||= 'test' }
-
-task :environment do
-  # Nothing yet
-end
+task(:set_test_env) { ENV['RACK_ENV'] ||= 'test' }
 
 desc "Run all tests"
-task :test => [:set_test_env, :environment] do
+task :test => [:set_test_env] do
   require 'protest'
   $:.concat ['./lib', './test']
   Dir.glob("./test/*_test.rb").each { |test| require test }
-  Protest.run
+  Protest.report
 end
 
+task "test:shoulda" => [:set_test_env]
+desc "Run all Shoulda based tests"
+Rake::TestTask.new("test:shoulda") do |t|
+  t.libs << "test/shoulda_tests"
+  t.test_files = FileList['test/shoulda_tests/*_test.rb']
+  t.verbose = true
+end
+
+# task :test => [:set_test_env] do
+#   $:.concat ['./lib', './test/shoulda_tests']
+#   Dir.glob("./test/shoulda_tests/*_test.rb").each { |test| require test }
+# end
+
 desc "Open an irb session preloaded with this library"
 task :console do
   exec "irb -rubygems"

data/chicago.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "chicago"
-  s.version  = "0.3.2.2"
-  s.date     = "2009-06-28"
+  s.version  = "0.3.3"
+  s.date     = "2009-07-05"
   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"

data/lib/chicago/protest/macros.rb

@@ -4,29 +4,29 @@ module Chicago
   module Protest
     module Macros
       def asserts_response_status(expected)
-        asserts("response status is #{expected}").equals(expected) { last_response.status }
+        asserts("response status is #{expected}") { last_response.status }.equals(expected)
       end
       
       def asserts_content_type(expected)
-        asserts("content type is #{expected}").equals(expected) { last_response.headers['Content-type'] }
+        asserts("content type is #{expected}") { last_response.headers['Content-type'] }.equals(expected)
       end
 
       def asserts_response_body(expected)
-        asserts("response body matches #{expected.inspect}").matches(expected) { last_response.body }
+        asserts("response body matches #{expected.inspect}") { last_response.body }.matches(expected)
       end
 
       def asserts_location(expected_path)
-        asserts("location matches #{expected_path}").matches(expected_path) do
+        asserts("location matches #{expected_path}") do
           last_response.headers["Location"]
-        end
+        end.matches(expected_path)
       end
 
       def asserts_json_response(json, &block)
         asserts_content_type 'application/json'
-        asserts("response body has JSON").equals(last_response.body) do
+        asserts("response body has JSON") do
           json = json.to_json unless json.instance_of?(String)
           json
-        end
+        end.equals(last_response.body)
       end
 
       # Usage:

data/lib/chicago/shoulda/sinatra.rb

@@ -80,4 +80,4 @@ module ThumbleMonks
   end # Chicago
 end # ThumbleMonks
 
-Test::Unit::TestCase.instance_eval { include ThumbleMonks::Chicago::Shoulda }
+Test::Unit::TestCase.instance_eval { include ThumbleMonks::Chicago::Shoulda }

data/test/application_test.rb

@@ -36,7 +36,7 @@ context "Application Test:" do
     context "with path that's not a defined a sass file" do
       setup { get '/stylesheets/zoo.css' }
       asserts_response_status 404
-      asserts_content_type 'text/html'
+      asserts_content_type 'text/css'
     end
   end # catching all css
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thumblemonks-chicago
 version: !ruby/object:Gem::Version 
-  version: 0.3.2.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Justin Knowlden
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-28 00:00:00 -07:00
+date: 2009-07-05 00:00:00 -07:00
 default_executable: 
 dependencies: []