dock_test 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c43981a27f80adac84538b16c9ae454d8bb3eed
-  data.tar.gz: eb96234292816cd2308d78441ef9894c4006d716
+  metadata.gz: 2593cb3492af382c4c090f672028a58e0a3b9c0b
+  data.tar.gz: 4bee1ab15ad6a3c4b9338abb3ec440fe712f07f0
 SHA512:
-  metadata.gz: d662ffa52961ac51da3f33f1a08f0b48af5181857938a34b626654ff035f2fbe8ee4479409d81ef66479c8022d9c66d08532ad89e39e3d09ea0cebc782e1f305
-  data.tar.gz: 93cd0d97755211dbca00c9f0ed640492d1acd1c80371e75a250993858d9d1b3ae456e1d674c9b52c5b86bb6f5da656a85f2b221c26fcac6d807c51d4800b9746
+  metadata.gz: 76960e6d4db18d638ba19ad7d55c737338aa751db20b66a7f13e925ec87fc69b1ffd044b6f1736aeaa0150c467ca074ad62d504bb8004e11f728ce8be4e9a182
+  data.tar.gz: eecf368bab9ce45dd794f97cbdb9b91ab09b5edb58bfe42390c38940f33a3e1b34fd74567137e6e9b7f6384b57608afaec4fc2d8d2f7c22d5de66748f1cc807c

data/lib/dock_test/assertions.rb

@@ -1,23 +1,24 @@
 module Minitest::Assertions
   def assert_response_status(status)
-    assert last_response.code == status.to_s, "The response status is expected to be #{last_response.code}"
+    assert last_response.code == status.to_s, "The actual response status is #{last_response.code}"
   end
 
   def assert_response_content_type(content_type)
-    assert last_response['Content-Type'] == content_type.to_s, "The response content_type is expected to be #{last_response['Content-Type']}"
+    assert last_response['Content-Type'] == content_type.to_s, "The actual response content_type is #{last_response['Content-Type']}"
   end
 
   def assert_response_headers(headers, options = {})
     exclude_keys = Array(options[:exclude] || [])
     response_headers = last_response.to_hash.delete_if {|k, _| exclude_keys.include?(k)}
+    assert response_headers == headers, "The actual response headers are #{response_headers.inspect}"
   end
 
   def assert_response_body(body_string)
-    assert last_response.body == body_string, "The response body is expected to be #{last_response.body}"
+    assert last_response.body == body_string, "The actual response body is #{last_response.body}"
   end
 
   def assert_response_json_schema(schema_path)
     schema = File.open(schema_path).read
-    assert JSON::Validator.validate(schema, last_response.body), "The response is expected to have a schema defined in #{schema_path}"
+    assert JSON::Validator.validate(schema, last_response.body), "The actual response does not match the schema defined in #{schema_path}"
   end
 end

data/lib/dock_test/dsl.rb

@@ -0,0 +1,44 @@
+module DockTest
+  module DSL
+
+    attr_reader :url
+    # sets the test url
+    # also creates a new webrick server process
+    def url=(value)
+      @url = value
+
+      if localhost? && @server_thread.nil?
+        require "rack"
+        require 'webrick'
+        server = WEBrick::HTTPServer.new(:Port => port).tap do |server|
+          server.mount '/', Rack::Handler::WEBrick, Rack::Server.new.app
+        end
+        @server_thread = Thread.new { server.start }
+        trap('INT') do
+          server.shutdown
+          exit
+        end
+      end
+    end
+
+    def port
+      URI.parse(@url).port
+    end
+
+    def localhost?
+      @url && ['127.0.0.1', 'localhost'].include?(URI.parse(@url).host)
+    end
+
+    def skippy=(envs)
+      @skippy_envs = Array(envs).map(&:to_s)
+    end
+
+    def skippy_envs
+      @skippy_envs ||= ['production']
+    end
+
+    def configure(&block)
+      block.call(DockTest)
+    end
+  end
+end

data/lib/dock_test/version.rb

@@ -1,3 +1,3 @@
 module DockTest
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lib/dock_test.rb

@@ -1,7 +1,8 @@
 require 'multi_json'
 require 'json-schema'
-require "dock_test/version"
-require "dock_test/methods"
+require 'dock_test/version'
+require 'dock_test/methods'
+require 'dock_test/dsl'
 
 if defined?(::Minitest)
   require 'dock_test/assertions'
@@ -9,44 +10,5 @@ else
 end
 
 module DockTest
-
-  class << self
-
-    attr_reader :url
-    # sets the test url
-    # also creates a new webrick server process
-    def url=(value)
-      @url = value
-
-      if localhost? && @server_thread.nil?
-        require "rack"
-        require 'webrick'
-        server = WEBrick::HTTPServer.new(:Port => port).tap do |server|
-          server.mount '/', Rack::Handler::WEBrick, Rack::Server.new.app
-        end
-        @server_thread = Thread.new { server.start }
-        trap('INT') do
-          server.shutdown
-          exit
-        end
-      end
-    end
-
-    def port
-      URI.parse(@url).port
-    end
-
-    def localhost?
-      @url && ['127.0.0.1', 'localhost'].include?(URI.parse(@url).host)
-    end
-
-    attr_reader :skippy_envs
-    def skippy=(envs)
-      @skippy_envs = Array(envs).map(&:to_s)
-    end
-
-    def config(&block)
-      block.call(DockTest)
-    end
-  end
+  extend DSL
 end

data/test/test_helper.rb

@@ -4,7 +4,7 @@ Bundler.require(:default, :test)
 
 require 'dock_test'
 
-DockTest.config do |c|
+DockTest.configure do |c|
   c.url = case ENV['DOCK_ENV']
           when 'production'
             'http://floating-mesa-6194.herokuapp.com'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dock_test
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Jack Xu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -97,6 +97,7 @@ files:
 - dock_test.gemspec
 - lib/dock_test.rb
 - lib/dock_test/assertions.rb
+- lib/dock_test/dsl.rb
 - lib/dock_test/methods.rb
 - lib/dock_test/version.rb
 - schemas/response.schema.json