rack-minitest 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f819d45d2a7c07292be70f52dcc9c67f7d39762b
-  data.tar.gz: 1a13aa8b329dbb245aebe25661350d80a200fdd3
+  metadata.gz: 6215e515b7bdbb2383d5025631a57cac7d73a4c8
+  data.tar.gz: 1e7fbb71c54b1215871c65ee45a3244e6288272f
 SHA512:
-  metadata.gz: c056f716d998fc19714ea12daf1c5c98bd9100be52ae64dd06839b2d9c25572154e9db5a7644f1c6ad12dfe75edda986e13ad533f17e265f2e0853986d412d5e
-  data.tar.gz: 1fb6170cb7539c421e5905e0ef751f73b308febcf0dffa6eea0c16ad50b5354d09c042c2318c0c3ec453d413199d0acdf69086d2e7bcc21d58e4ba8b27fabfb3
+  metadata.gz: 1157a7f46098fbd12f08b877a1291b8ce51907ba89d6ea6fdb0fe9fcecb466a7dab50b3caeb44165797b9de9d5fb1980b6f996ddd4fa1a55bb4f69bfd9756ff0
+  data.tar.gz: 8aba2ed83deae756c6b0f65a7fb1bdc7dfa99a78941aa7b20323d219b64f70611131a1e47fc9880f7005fd88f77fea185f2f34bb3c17c82895b27096c9c32687

data/README.md

@@ -1,17 +1,31 @@
 # rack-minitest
 
-`rack-minitest` = `rack-test` + `MiniTest`. See what I did there?
+`rack-minitest` = `rack-test` + `Minitest`. See what I did there?
 
-This gem adds some convenience methods to `rack-test` and `MiniTest` that I found myself duplicating over and over for every application I wrote. It adds a few methods for dealing with JSON to `rack-test` and `MiniTest` spec-style matchers for checking response status. The specific methods are:
+This gem adds some convenience methods to `rack-test` and `Minitest` that I found myself duplicating over and over for every application I wrote. It adds a few methods for dealing with JSON to `rack-test`, `Minitest` assertions, and spec-style matchers for checking response status. The specific methods are:
 
-```
+```ruby
+# json
 last_json_response
 
-get_json    path, params
-post_json   path, params
-put_json    path, params
-delete_json path, params
-
+get_json    path, params, headers
+post_json   path, params, headers
+put_json    path, params, headers
+delete_json path, params, headers
+
+# assertions
+assert_ok
+assert_created
+assert_no_content
+assert_moved_permanently
+assert_bad_request
+assert_unauthorized
+assert_forbidden
+assert_not_found
+assert_unprocessable_entity
+assert_internal_server_error
+
+# matchers
 last_response.must_be_ok
 last_response.must_be_created
 last_response.must_be_no_content
@@ -24,7 +38,11 @@ last_response.must_be_unprocessable_entity
 last_response.must_be_internal_server_error
 ```
 
-**NB**: This is a quick and dirty gem to hack in some functionality that I was surprised to find didn't already exist. There are tests, and they pass, but they're pretty gross. All improvements are welcome.
+## Requirements
+
+* [json](https://github.com/flori/json)
+* [rack-test](https://github.com/brynary/rack-test)
+* [minitest](https://github.com/seattlerb/minitest) ~> 5.0
 
 ## Installation
 
@@ -38,11 +56,31 @@ And then execute:
 
 ## Usage
 
-Just add the appropriate requires _after_ you load `rack-test` and `MiniTest`.
+You can use `rack-minitest` in one of two ways.
 
-```
+### Require only the modules you need
+
+```ruby
+require "rack-minitest/json"
 require "rack-minitest/assertions"
-require "rack-minitest/spec"
+
+class MyTestClass < Minitest::Test
+  include Rack::Test::Methods
+  include Rack::Minitest::JSON
+  include Rack::Minitest::Assertions
+
+  # use rack/test, the json methods, and assertions
+end
+```
+
+### All in one
+
+```ruby
+require "rack-minitest/test"
+
+describe SomeTestClass do
+  # adds rack-test and all the rack-minitest modules
+end
 ```
 
 ## Contributing

data/lib/rack-minitest/assertions.rb

@@ -1,58 +1,50 @@
-module MiniTest::Assertions
+module Rack
+  module Minitest
+    module Assertions
 
-  def assert_ok(response)
-    assert_response_status response, 200
-  end
+      def assert_ok(response)
+        assert_response_status response, 200
+      end
 
-  def assert_created(response)
-    assert_response_status response, 201
-  end
+      def assert_created(response)
+        assert_response_status response, 201
+      end
 
-  def assert_no_content(response)
-    assert_response_status response, 204
-  end
+      def assert_no_content(response)
+        assert_response_status response, 204
+      end
 
-  def assert_moved_permanently(response)
-    assert_response_status response, 301
-  end
+      def assert_moved_permanently(response)
+        assert_response_status response, 301
+      end
 
-  def assert_bad_request(response)
-    assert_response_status response, 400
-  end
+      def assert_bad_request(response)
+        assert_response_status response, 400
+      end
 
-  def assert_unauthorized(response)
-    assert_response_status response, 401
-  end
+      def assert_unauthorized(response)
+        assert_response_status response, 401
+      end
 
-  def assert_forbidden(response)
-    assert_response_status response, 403
-  end
+      def assert_forbidden(response)
+        assert_response_status response, 403
+      end
 
-  def assert_not_found(response)
-    assert_response_status response, 404
-  end
+      def assert_not_found(response)
+        assert_response_status response, 404
+      end
 
-  def assert_unprocessable_entity(response)
-    assert_response_status response, 422
-  end
+      def assert_unprocessable_entity(response)
+        assert_response_status response, 422
+      end
 
-  def assert_internal_server_error(response)
-    assert_response_status response, 500
-  end
+      def assert_internal_server_error(response)
+        assert_response_status response, 500
+      end
 
-  def assert_response_status(response, status)
-    assert response.status == status, "Expected response to be a #{status}, but was a #{response.status}"
+      def assert_response_status(response, status)
+        assert response.status == status, "Expected response to be a #{status}, but was a #{response.status}"
+      end
+    end
   end
-
 end
-
-Rack::MockResponse.infect_an_assertion :assert_ok,                    :must_be_ok,                    :only_one_argument
-Rack::MockResponse.infect_an_assertion :assert_created,               :must_be_created,               :only_one_argument
-Rack::MockResponse.infect_an_assertion :assert_no_content,            :must_be_no_content,            :only_one_argument
-Rack::MockResponse.infect_an_assertion :assert_moved_permanently,     :must_be_moved_permanently,     :only_one_argument
-Rack::MockResponse.infect_an_assertion :assert_bad_request,           :must_be_bad_request,           :only_one_argument
-Rack::MockResponse.infect_an_assertion :assert_unauthorized,          :must_be_unauthorized,          :only_one_argument
-Rack::MockResponse.infect_an_assertion :assert_forbidden,             :must_be_forbidden,             :only_one_argument
-Rack::MockResponse.infect_an_assertion :assert_not_found,             :must_be_not_found,             :only_one_argument
-Rack::MockResponse.infect_an_assertion :assert_unprocessable_entity,  :must_be_unprocessable_entity,  :only_one_argument
-Rack::MockResponse.infect_an_assertion :assert_internal_server_error, :must_be_internal_server_error, :only_one_argument

data/lib/rack-minitest/expectations.rb

@@ -0,0 +1,22 @@
+require "rack-minitest/assertions"
+
+module Rack
+  module Minitest
+    module Expectations
+      include Rack::Minitest::Assertions
+    end
+  end
+end
+
+class Rack::MockResponse
+  infect_an_assertion :assert_ok,                    :must_be_ok,                    :only_one_argument
+  infect_an_assertion :assert_created,               :must_be_created,               :only_one_argument
+  infect_an_assertion :assert_no_content,            :must_be_no_content,            :only_one_argument
+  infect_an_assertion :assert_moved_permanently,     :must_be_moved_permanently,     :only_one_argument
+  infect_an_assertion :assert_bad_request,           :must_be_bad_request,           :only_one_argument
+  infect_an_assertion :assert_unauthorized,          :must_be_unauthorized,          :only_one_argument
+  infect_an_assertion :assert_forbidden,             :must_be_forbidden,             :only_one_argument
+  infect_an_assertion :assert_not_found,             :must_be_not_found,             :only_one_argument
+  infect_an_assertion :assert_unprocessable_entity,  :must_be_unprocessable_entity,  :only_one_argument
+  infect_an_assertion :assert_internal_server_error, :must_be_internal_server_error, :only_one_argument
+end

data/lib/rack-minitest/json.rb

@@ -0,0 +1,33 @@
+require "json"
+
+module Rack
+  module Minitest
+    module JSON
+      def last_json_response
+        ::JSON.parse(last_response.body)
+      end
+
+      def get_json(path, params = {}, headers = {})
+        json_request :get, path, params, headers
+      end
+
+      def post_json(path, params = {}, headers = {})
+        json_request :post, path, params, headers
+      end
+
+      def put_json(path, params = {}, headers = {})
+        json_request :put, path, params, headers
+      end
+
+      def delete_json(path, params = {}, headers = {})
+        json_request :delete, path, params, headers
+      end
+
+      private
+
+      def json_request(verb, path, params = {}, headers = {})
+        send verb, path, params.to_json, headers.merge({ "CONTENT_TYPE" => "application/json" })
+      end
+    end
+  end
+end

data/lib/rack-minitest/test.rb

@@ -0,0 +1,9 @@
+require "rack/test"
+require "rack-minitest/expectations"
+require "rack-minitest/json"
+
+class Minitest::Test
+  include Rack::Test::Methods
+  include Rack::Minitest::Expectations
+  include Rack::Minitest::JSON
+end

data/lib/rack-minitest/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Minitest
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/rack-minitest.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version       = Rack::Minitest::VERSION
   gem.authors       = ["Brandon Weiss"]
   gem.email         = ["brandon@anti-pattern.com"]
-  gem.description   = %q{rack-minitest = rack-test + MiniTest}
-  gem.summary       = %q{rack-minitest = rack-test + MiniTest}
+  gem.description   = %q{rack-minitest = rack-test + Minitest}
+  gem.summary       = %q{rack-minitest = rack-test + Minitest}
   gem.homepage      = ""
 
   gem.files         = `git ls-files`.split($/)
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "json"
   gem.add_dependency "rack-test"
-  gem.add_dependency "minitest"
+  gem.add_dependency "minitest", "~> 5.0"
 
   gem.add_development_dependency "rake"
 end

data/test/assertions_test.rb

@@ -4,76 +4,78 @@ def stub_app(status_code)
   lambda { |env| [status_code, {}, [""]] }
 end
 
-describe MiniTest::Spec do
+describe Rack::Minitest::Assertions do
+  include Rack::Test::Methods
+  include Rack::Minitest::Assertions
 
-  it "should have a spec-style matcher for an ok response" do
+  it "should have an assertion for an ok response" do
     def app; stub_app(200); end
 
     get "/"
-    last_response.must_be_ok
+    assert_ok(last_response)
   end
 
-  it "should have a spec-style matcher for a created response" do
+  it "should have an assertion for a created response" do
     def app; stub_app(201); end
 
     get "/"
-    last_response.must_be_created
+    assert_created(last_response)
   end
 
-  it "should have a spec-style matcher for a no content response" do
+  it "should have an assertion for a no content response" do
     def app; stub_app(204); end
 
     get "/"
-    last_response.must_be_no_content
+    assert_no_content(last_response)
   end
 
-  it "should have a spec-style matcher for a moved permanently response" do
+  it "should have an assertion for a moved permanently response" do
     def app; stub_app(301); end
 
     get "/"
-    last_response.must_be_moved_permanently
+    assert_moved_permanently(last_response)
   end
 
-  it "should have a spec-style matcher for a bad request response" do
+  it "should have an assertion for a bad request response" do
     def app; stub_app(400); end
 
     get "/"
-    last_response.must_be_bad_request
+    assert_bad_request(last_response)
   end
 
-  it "should have a spec-style matcher for an unauthorized response" do
+  it "should have an assertion for an unauthorized response" do
     def app; stub_app(401); end
 
     get "/"
-    last_response.must_be_unauthorized
+    assert_unauthorized(last_response)
   end
 
-  it "should have a spec-style matcher for a forbidden response" do
+  it "should have an assertion for a forbidden response" do
     def app; stub_app(403); end
 
     get "/"
-    last_response.must_be_forbidden
+    assert_forbidden(last_response)
   end
 
-  it "should have a spec-style matcher for a not found response" do
+  it "should have an assertion for a not found response" do
     def app; stub_app(404); end
 
     get "/"
-    last_response.must_be_not_found
+    assert_not_found(last_response)
   end
 
- it "should have a spec-style matcher for an unprocessable entity response" do
+ it "should have an assertion for an unprocessable entity response" do
     def app; stub_app(422); end
 
     get "/"
-    last_response.must_be_unprocessable_entity
+    assert_unprocessable_entity(last_response)
   end
 
- it "should have a spec-style matcher for an internal server error response" do
+ it "should have an assertion for an internal server error response" do
     def app; stub_app(500); end
 
     get "/"
-    last_response.must_be_internal_server_error
+    assert_internal_server_error(last_response)
   end
 
 end

data/test/expectations_test.rb

@@ -0,0 +1,81 @@
+require File.expand_path("../test_helper", __FILE__)
+
+def stub_app(status_code)
+  lambda { |env| [status_code, {}, [""]] }
+end
+
+describe Rack::Minitest::Expectations do
+  include Rack::Test::Methods
+  include Rack::Minitest::Expectations
+
+  it "should have a spec-style matcher for an ok response" do
+    def app; stub_app(200); end
+
+    get "/"
+    last_response.must_be_ok
+  end
+
+  it "should have a spec-style matcher for a created response" do
+    def app; stub_app(201); end
+
+    get "/"
+    last_response.must_be_created
+  end
+
+  it "should have a spec-style matcher for a no content response" do
+    def app; stub_app(204); end
+
+    get "/"
+    last_response.must_be_no_content
+  end
+
+  it "should have a spec-style matcher for a moved permanently response" do
+    def app; stub_app(301); end
+
+    get "/"
+    last_response.must_be_moved_permanently
+  end
+
+  it "should have a spec-style matcher for a bad request response" do
+    def app; stub_app(400); end
+
+    get "/"
+    last_response.must_be_bad_request
+  end
+
+  it "should have a spec-style matcher for an unauthorized response" do
+    def app; stub_app(401); end
+
+    get "/"
+    last_response.must_be_unauthorized
+  end
+
+  it "should have a spec-style matcher for a forbidden response" do
+    def app; stub_app(403); end
+
+    get "/"
+    last_response.must_be_forbidden
+  end
+
+  it "should have a spec-style matcher for a not found response" do
+    def app; stub_app(404); end
+
+    get "/"
+    last_response.must_be_not_found
+  end
+
+ it "should have a spec-style matcher for an unprocessable entity response" do
+    def app; stub_app(422); end
+
+    get "/"
+    last_response.must_be_unprocessable_entity
+  end
+
+ it "should have a spec-style matcher for an internal server error response" do
+    def app; stub_app(500); end
+
+    get "/"
+    last_response.must_be_internal_server_error
+  end
+
+end

data/test/json_test.rb

@@ -0,0 +1,60 @@
+require File.expand_path("../test_helper", __FILE__)
+
+describe Rack::Minitest::JSON do
+  include Rack::Test::Methods
+  include Rack::Minitest::JSON
+
+  def app
+    json = { "foo" => "bar" }.to_json
+    lambda { |env| [200, { "Content-Type" => "text/html" }, [json]] }
+  end
+
+  it "should include Rack::Minitest::JSON" do
+    assert Minitest::Spec.include? Rack::Minitest::JSON
+  end
+
+  it "should parse JSON responses" do
+    get "/"
+    last_json_response.must_equal({ "foo" => "bar" })
+  end
+
+  it "should get as JSON" do
+    get_json "/"
+    assert_equal "application/json", last_request.env["CONTENT_TYPE"]
+  end
+
+  it "should post as JSON" do
+    post_json "/"
+    assert_equal "application/json", last_request.env["CONTENT_TYPE"]
+  end
+
+  it "should put as JSON" do
+    put_json "/"
+    assert_equal "application/json", last_request.env["CONTENT_TYPE"]
+  end
+
+  it "should delete as JSON" do
+    delete_json "/"
+    assert_equal "application/json", last_request.env["CONTENT_TYPE"]
+  end
+
+  it "should set custom headers on get" do
+    get_json "/", {}, { "HTTP_AUTHORIZATION" => "Token token=1111" }
+    assert_equal "Token token=1111", last_request.env["HTTP_AUTHORIZATION"]
+  end
+
+  it "should set custom headers on post" do
+    post_json "/", {}, { "HTTP_AUTHORIZATION" => "Token token=1111" }
+    assert_equal "Token token=1111", last_request.env["HTTP_AUTHORIZATION"]
+  end
+
+  it "should set custom headers on put" do
+    put_json "/", {}, { "HTTP_AUTHORIZATION" => "Token token=1111" }
+    assert_equal "Token token=1111", last_request.env["HTTP_AUTHORIZATION"]
+  end
+
+  it "should set custom headers on delete" do
+    delete_json "/", {}, { "HTTP_AUTHORIZATION" => "Token token=1111" }
+    assert_equal "Token token=1111", last_request.env["HTTP_AUTHORIZATION"]
+  end
+end

data/test/spec_test.rb

@@ -1,6 +1,7 @@
 require File.expand_path("../test_helper", __FILE__)
+require "minitest/test"
 
-describe MiniTest::Spec do
+describe Minitest::Spec do
 
   def app
     json = { "foo" => "bar" }.to_json
@@ -8,7 +9,7 @@ describe MiniTest::Spec do
   end
 
   it "should include Rack::Test::Methods" do
-    assert MiniTest::Spec.include? Rack::Test::Methods
+    assert Minitest::Spec.include? Rack::Test::Methods
   end
 
   it "should parse JSON responses" do

data/test/test_helper.rb

@@ -6,5 +6,6 @@ require "rack/test"
 require "minitest/autorun"
 
 require "json"
+require "rack-minitest/json"
 require "rack-minitest/assertions"
-require "rack-minitest/spec"
+require "rack-minitest/expectations"

data/test/unit_test.rb

@@ -0,0 +1,40 @@
+require File.expand_path("../test_helper", __FILE__)
+require "rack-minitest/test"
+
+class TestRackMinitestUnit < Minitest::Test
+
+  def app
+    json = { "foo" => "bar" }.to_json
+    lambda { |env| [200, { "Content-Type" => "text/html" }, [json]] }
+  end
+
+  def test_includes_rack_test_methods
+    assert Minitest::Test.include? Rack::Test::Methods
+  end
+
+  def test_parses_JSON_responses
+    get "/"
+    assert_equal({ "foo" => "bar" }, last_json_response)
+  end
+
+  def test_get_as_JSON
+    get_json "/"
+    assert_equal "application/json", last_request.env["CONTENT_TYPE"]
+  end
+
+  def test_post_as_JSON
+    post_json "/"
+    assert_equal "application/json", last_request.env["CONTENT_TYPE"]
+  end
+
+  def test_put_as_JSON
+    put_json "/"
+    assert_equal "application/json", last_request.env["CONTENT_TYPE"]
+  end
+
+  def test_delete_as_JSON
+    delete_json "/"
+    assert_equal "application/json", last_request.env["CONTENT_TYPE"]
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-minitest
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Brandon Weiss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -42,16 +42,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: rack-minitest = rack-test + MiniTest
+description: rack-minitest = rack-test + Minitest
 email:
 - brandon@anti-pattern.com
 executables: []
@@ -80,12 +80,17 @@ files:
 - Rakefile
 - lib/rack-minitest.rb
 - lib/rack-minitest/assertions.rb
-- lib/rack-minitest/spec.rb
+- lib/rack-minitest/expectations.rb
+- lib/rack-minitest/json.rb
+- lib/rack-minitest/test.rb
 - lib/rack-minitest/version.rb
 - rack-minitest.gemspec
 - test/assertions_test.rb
+- test/expectations_test.rb
+- test/json_test.rb
 - test/spec_test.rb
 - test/test_helper.rb
+- test/unit_test.rb
 homepage: ''
 licenses: []
 metadata: {}
@@ -105,11 +110,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
-summary: rack-minitest = rack-test + MiniTest
+summary: rack-minitest = rack-test + Minitest
 test_files:
 - test/assertions_test.rb
+- test/expectations_test.rb
+- test/json_test.rb
 - test/spec_test.rb
 - test/test_helper.rb
+- test/unit_test.rb

data/lib/rack-minitest/spec.rb

@@ -1,31 +0,0 @@
-class MiniTest::Spec
-
-  include Rack::Test::Methods
-
-  def last_json_response
-    JSON.parse(last_response.body)
-  end
-
-  def get_json(path, params = {})
-    json_request :get, path, params
-  end
-
-  def post_json(path, params = {})
-    json_request :post, path, params
-  end
-
-  def put_json(path, params = {})
-    json_request :put, path, params
-  end
-
-  def delete_json(path, params = {})
-    json_request :delete, path, params
-  end
-
-private
-
-  def json_request(verb, path, params = {})
-    send verb, path, params.to_json, "CONTENT_TYPE" => "application/json"
-  end
-
-end