kookaburra 0.18.3 → 0.20.0

data/spec/kookaburra/api_driver_spec.rb

@@ -0,0 +1,126 @@
+require 'kookaburra/api_driver'
+
+describe Kookaburra::APIDriver do
+  let(:api) { Kookaburra::APIDriver.new(:http_client => client) }
+
+  let(:response) {
+    stub('Patron::Response', :body => 'foo', :status => 200, :url => '/foo')
+  }
+
+  let(:client) {
+         mock('Patron::Session', :post => response, :get => response,
+         :put => response, :delete => response)
+  }
+
+  describe '#initialize' do
+    it 'instantiates a new http client if no :http_client option is passed' do
+      Patron::Session.should_receive(:new).and_return(stub.as_null_object)
+      Kookaburra::APIDriver.new({})
+    end
+
+    it 'does not instantiate a new http client if an :http_client option is passed' do
+      Patron::Session.should_receive(:new).never
+      Kookaburra::APIDriver.new(:http_client => stub.as_null_object)
+    end
+  end
+
+  describe '#post' do
+    before(:each) do
+      response.stub!(:status => 201)
+    end
+
+    it 'delegates to the http client' do
+      client.should_receive(:post).with('/foo', 'bar', {}) \
+        .and_return(response)
+      api.post('/foo', 'bar')
+    end
+
+    it 'returns the response body' do
+      api.post('/foo', 'bar').should == 'foo'
+    end
+
+    it 'does not raise an UnexpectedResponse if the response status matches the specified expectation' do
+      response.stub!(:status => 666)
+      lambda { api.post('/foo', 'bar', :expected_response_status => 666) } \
+        .should_not raise_error
+    end
+
+    it 'raises an UnexpectedResponse if the response status is not the specified status' do
+      lambda { api.post('/foo', 'bar', :expected_response_status => 666) } \
+        .should raise_error(Kookaburra::UnexpectedResponse,
+                            "POST to /foo responded with 201 status, not 666 as expected\n\nfoo")
+    end
+  end
+
+  describe '#put' do
+    it 'delegates to the http client' do
+      client.should_receive(:put).with('/foo', 'bar', {}) \
+        .and_return(response)
+      api.put('/foo', 'bar')
+    end
+
+    it 'returns the response body' do
+      api.put('/foo', 'bar').should == 'foo'
+    end
+
+    it 'does not raise an UnexpectedResponse if the response status matches the specified expectation' do
+      response.stub!(:status => 666)
+      lambda { api.put('/foo', 'bar', :expected_response_status => 666) } \
+        .should_not raise_error
+    end
+
+    it 'raises an UnexpectedResponse if the response status is not the specified status' do
+      lambda { api.put('/foo', 'bar', :expected_response_status => 666) } \
+        .should raise_error(Kookaburra::UnexpectedResponse,
+                            "PUT to /foo responded with 200 status, not 666 as expected\n\nfoo")
+    end
+  end
+
+  describe '#get' do
+    it 'delegates to the http client' do
+      client.should_receive(:get).with('/foo', {}) \
+        .and_return(response)
+      api.get('/foo')
+    end
+
+    it 'returns the response body' do
+      api.get('/foo').should == 'foo'
+    end
+
+    it 'does not raise an UnexpectedResponse if the response status matches the specified expectation' do
+      response.stub!(:status => 666)
+      lambda { api.get('/foo', :expected_response_status => 666) } \
+        .should_not raise_error
+    end
+
+    it 'raises an UnexpectedResponse if the response status is not the specified status' do
+      lambda { api.get('/foo', :expected_response_status => 666) } \
+        .should raise_error(Kookaburra::UnexpectedResponse,
+                            "GET to /foo responded with 200 status, not 666 as expected\n\nfoo")
+    end
+  end
+
+  describe '#delete' do
+    it 'delegates to the http client' do
+      client.should_receive(:delete).with('/foo', {}) \
+        .and_return(response)
+      api.delete('/foo')
+    end
+
+    it 'returns the response body' do
+      api.delete('/foo').should == 'foo'
+    end
+
+    it 'does not raise an UnexpectedResponse if the response status matches the specified expectation' do
+      response.stub!(:status => 666)
+      lambda { api.delete('/foo', :expected_response_status => 666) } \
+        .should_not raise_error
+    end
+
+    it 'raises an UnexpectedResponse if the response status is not the specified status' do
+      lambda { api.delete('/foo', :expected_response_status => 666) } \
+        .should raise_error(Kookaburra::UnexpectedResponse,
+                            "DELETE to /foo responded with 200 status, not 666 as expected\n\nfoo")
+    end
+  end
+end

data/spec/kookaburra/json_api_driver_spec.rb

@@ -1,36 +1,91 @@
 require 'kookaburra/json_api_driver'
 
 describe Kookaburra::JsonApiDriver do
-  describe 'protected methods (for use by subclasses)' do
-    ['post', 'put', 'get'].each do |method|
-      describe "##{method}" do
-        it "sends a #{method} request with JSON data to the specified path within the application" do
-          app_driver = mock('RackDriver')
-          app_driver.should_receive(method.to_sym) \
-            .with('/foo', '{"bar":"baz"}',
-                  'Content-Type' => 'application/json',
-                  'Accept' => 'application/json') \
-            .and_return('{"foo":"bar"}')
-          driver = Kookaburra::JsonApiDriver.new(app_driver)
-          driver.send(method.to_sym, '/foo', {:bar => :baz})
-        end
-
-        it 'returns the response body parsed from JSON' do
-          app_driver = stub('RackDriver', method.to_sym => '{"ham":"spam"}')
-          driver = Kookaburra::JsonApiDriver.new(app_driver)
-          driver.send(method.to_sym, '/foo', {:bar => :baz}) \
-            .should == {'ham' => 'spam'}
-        end
-      end
-    end
-
-    describe '#authorize' do
-      it 'sets the authorization credentials on the app driver' do
-        app_driver = mock('RackDriver')
-        app_driver.should_receive(:authorize).with('a user', 'a password')
-        driver = Kookaburra::JsonApiDriver.new(app_driver)
-        driver.send(:authorize, 'a user', 'a password')
-      end
+  let(:response) { '{"foo":"bar"}' }
+
+  let(:api) {
+    stub('APIDriver', :get => response, :post => response, :put => response,
+         :delete => response, :headers => {})
+  }
+
+  let(:json) { Kookaburra::JsonApiDriver.new(:api_driver => api) }
+
+  describe '#initialize' do
+    it 'instantiates a new APIDriver if no :api_driver option is passed' do
+      Kookaburra::APIDriver.should_receive(:new).and_return(stub.as_null_object)
+      Kookaburra::JsonApiDriver.new({})
+    end
+
+    it 'does not instantiate a new APIDriver if an :api_driver option is passed' do
+      Kookaburra::APIDriver.should_receive(:new).never
+      Kookaburra::JsonApiDriver.new(:api_driver => stub.as_null_object)
+    end
+
+    it 'sets appropriate headers for a JSON API request' do
+      Kookaburra::JsonApiDriver.new(:api_driver => api)
+      api.headers.should == {
+        'Content-Type' => 'application/json',
+        'Accept' => 'application/json'
+      }
+    end
+  end
+
+  it 'delegates to a Kookaburra::APIDriver by default' do
+    delegate = stub('Kookaburra::APIDriver', :foo => :bar).as_null_object
+    Kookaburra::APIDriver.should_receive(:new).once.and_return(delegate)
+    json = Kookaburra::JsonApiDriver.new
+    json.foo.should == :bar
+  end
+
+  describe '#post' do
+    it 'delegates to the api driver as a JSON request' do
+      api.should_receive(:post) \
+        .with('/foo', '{"foo":"bar"}') \
+        .and_return('{"baz":"bam"}')
+      json.post('/foo', 'foo' => 'bar')
+    end
+
+    it 'returns the JSON-decoded response body' do
+      json.post('/foo', 'bar').should == {'foo' => 'bar'}
+    end
+  end
+
+  describe '#put' do
+    it 'delegates to the api driver as a JSON request' do
+      api.should_receive(:put) \
+        .with('/foo', '{"foo":"bar"}') \
+        .and_return('{"baz":"bam"}')
+      json.put('/foo', 'foo' => 'bar')
+    end
+
+    it 'returns the JSON-decoded response body' do
+      json.put('/foo', 'bar').should == {'foo' => 'bar'}
+    end
+  end
+
+  describe '#get' do
+    it 'delegates to the api driver as a JSON request' do
+      api.should_receive(:get) \
+        .with('/foo') \
+        .and_return('{"baz":"bam"}')
+      json.get('/foo')
+    end
+
+    it 'returns the JSON-decoded response body' do
+      json.get('/foo').should == {'foo' => 'bar'}
+    end
+  end
+
+  describe '#delete' do
+    it 'delegates to the api driver as a JSON request' do
+      api.should_receive(:delete) \
+        .with('/foo') \
+        .and_return('{"baz":"bam"}')
+      json.delete('/foo')
+    end
+
+    it 'returns the JSON-decoded response body' do
+      json.delete('/foo').should == {'foo' => 'bar'}
     end
   end
 end

data/spec/kookaburra/{test_data_spec.rb → mental_model_spec.rb}

@@ -1,9 +1,9 @@
-require 'kookaburra/test_data'
+require 'kookaburra/mental_model'
 
-describe Kookaburra::TestData do
+describe Kookaburra::MentalModel do
   describe '#method_missing' do
     it 'returns a Collection' do
-      subject.foo.should be_kind_of(Kookaburra::TestData::Collection)
+      subject.foo.should be_kind_of(Kookaburra::MentalModel::Collection)
     end
 
     it 'returns different Collections for different messages' do
@@ -11,8 +11,8 @@ describe Kookaburra::TestData do
     end
   end
 
-  describe Kookaburra::TestData::Collection do
-    let(:collection) { Kookaburra::TestData::Collection.new('widgets') }
+  describe Kookaburra::MentalModel::Collection do
+    let(:collection) { Kookaburra::MentalModel::Collection.new('widgets') }
 
     describe '#slice' do
       it 'returns an array of items matching the specified keys' do
@@ -25,7 +25,7 @@ describe Kookaburra::TestData do
 
     it 'raises a Kookaburra::UnknownKeyError exception for #[] with a missing key' do
       lambda { collection[:foo] }.should \
-        raise_error(Kookaburra::UnknownKeyError, "Can't find test_data.widgets[:foo]. Did you forget to set it?")
+        raise_error(Kookaburra::UnknownKeyError, "Can't find mental_model.widgets[:foo]. Did you forget to set it?")
     end
   end
 end

data/spec/kookaburra/ui_driver_spec.rb

@@ -6,14 +6,16 @@ describe Kookaburra::UIDriver do
     it 'adds an accessor method for the named component that defaults to an instance of the specified class' do
       foo_component_class = mock(Class)
       foo_component_class.should_receive(:new) \
-        .with(:browser => :a_browser, :server_error_detection => :server_error_detection) \
+        .with(:browser => :a_browser, :server_error_detection => :server_error_detection,
+              :app_host => :a_url) \
         .and_return(:a_foo_component)
 
       ui_driver_class = Class.new(Kookaburra::UIDriver) do
         ui_component :foo, foo_component_class
       end
 
-      ui = ui_driver_class.new(:browser => :a_browser, :server_error_detection => :server_error_detection)
+      ui = ui_driver_class.new(:browser => :a_browser, :server_error_detection => :server_error_detection,
+                               :app_host => :a_url)
       ui.foo.should == :a_foo_component
     end
   end
@@ -21,6 +23,6 @@ describe Kookaburra::UIDriver do
   describe 'dependency accessors' do
     let(:subject_class) { Kookaburra::UIDriver }
 
-    it_behaves_like :it_has_a_dependency_accessor, :test_data
+    it_behaves_like :it_has_a_dependency_accessor, :mental_model
   end
 end

data/spec/kookaburra_spec.rb

@@ -2,47 +2,15 @@ require 'kookaburra'
 
 describe Kookaburra do
   describe '#given' do
-    context 'without a :rack_app specified' do
-      it 'returns an instance of the configured GivenDriver' do
-        my_api_driver_class = mock(Class)
-        my_api_driver_class.should_receive(:new) \
-          .with(nil) \
-          .and_return(:an_api_driver)
-
-        my_given_driver_class = mock(Class)
-        my_given_driver_class.should_receive(:new) do |options|
-          options[:api].should == :an_api_driver
-          :a_given_driver
-        end
-
-        k = Kookaburra.new(:given_driver_class => my_given_driver_class,
-                           :api_driver_class => my_api_driver_class)
-        k.given.should == :a_given_driver
+    it 'returns an instance of the configured GivenDriver' do
+      my_given_driver_class = mock(Class)
+      my_given_driver_class.should_receive(:new) do |options|
+        options[:mental_model].should be_kind_of(Kookaburra::MentalModel)
+        :a_given_driver
       end
-    end
-
-    context 'with a :rack_app specified' do
-      it 'returns an instance of the configured GivenDriver' do
-        Kookaburra::RackDriver.should_receive(:new) \
-          .with(:a_rack_app) \
-          .and_return(:a_rack_driver)
 
-        my_api_driver_class = mock(Class)
-        my_api_driver_class.should_receive(:new) \
-          .with(:a_rack_driver) \
-          .and_return(:an_api_driver)
-
-        my_given_driver_class = mock(Class)
-        my_given_driver_class.should_receive(:new) do |options|
-          options[:api].should == :an_api_driver
-          :a_given_driver
-        end
-
-        k = Kookaburra.new(:given_driver_class => my_given_driver_class,
-                           :api_driver_class => my_api_driver_class,
-                           :rack_app => :a_rack_app)
-        k.given.should == :a_given_driver
-      end
+      k = Kookaburra.new(:given_driver_class => my_given_driver_class)
+      k.given.should == :a_given_driver
     end
   end
 
@@ -65,8 +33,8 @@ describe Kookaburra do
     it 'returns a equivalent copy of the test data collection specified' do
       k = Kookaburra.new
       foos = {:spam => 'ham'}
-      test_data = stub(:foos => foos)
-      k.stub!(:test_data => test_data)
+      mental_model = stub(:foos => foos)
+      k.stub!(:mental_model => mental_model)
       k.get_data(:foos).should == foos
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kookaburra
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 79
   prerelease: 
   segments: 
   - 0
-  - 18
-  - 3
-  version: 0.18.3
+  - 20
+  - 0
+  version: 0.20.0
 platform: ruby
 authors: 
 - John Wilger
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-18 00:00:00 Z
+date: 2012-03-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -72,7 +72,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rack-test
+  name: patron
   prerelease: false
   type: :runtime
   requirement: *id004
@@ -216,18 +216,16 @@ files:
 - lib/kookaburra/exceptions.rb
 - lib/kookaburra/given_driver.rb
 - lib/kookaburra/json_api_driver.rb
+- lib/kookaburra/mental_model.rb
 - lib/kookaburra/null_browser.rb
-- lib/kookaburra/rack_driver.rb
-- lib/kookaburra/test_data.rb
 - lib/kookaburra/test_helpers.rb
 - lib/kookaburra/ui_driver.rb
 - lib/kookaburra/ui_driver/ui_component.rb
-- lib/kookaburra/utils/active_record_shared_connection.rb
 - spec/integration/test_a_rack_application_spec.rb
+- spec/kookaburra/api_driver_spec.rb
 - spec/kookaburra/json_api_driver_spec.rb
+- spec/kookaburra/mental_model_spec.rb
 - spec/kookaburra/null_browser_spec.rb
-- spec/kookaburra/rack_driver_spec.rb
-- spec/kookaburra/test_data_spec.rb
 - spec/kookaburra/test_helpers_spec.rb
 - spec/kookaburra/ui_driver/ui_component_spec.rb
 - spec/kookaburra/ui_driver_spec.rb

data/lib/kookaburra/rack_driver.rb

@@ -1,109 +0,0 @@
-require 'kookaburra/exceptions'
-require 'rack/test'
-
-class Kookaburra
-  # This is a small wrapper around the `Rack::Test::Methods` which is used by
-  # your {APIDriver}.
-  class RackDriver
-    include Rack::Test::Methods
-
-    # This is the Rack application instance
-    attr_reader :app
-
-    # @param [#call] rack_app The Rack application object for the application under test
-    def initialize(rack_app)
-      @app = rack_app
-    end
-
-    # Sends a POST request to the application.
-    #
-    # Similar to `Rack::Test::Methods#post` except that it adds more convenient
-    # access to setting request headers, it raises an exception if the response
-    # status is not 201, and it returns the response body.
-    #
-    # @param [String] path The path portion of the URI to request from the
-    #   application
-    # @param [Object] params The request params or body
-    # @param [Hash] headers A hash of any additional HTTP headers to be set on
-    #   the request.
-    # @param [Hash] env Additional environment variables that should be present
-    #   on the request.
-    # @yield [Rack::Response] Yields the last response to the block if a
-    #   block is given.
-    def post(path, params = {}, headers = {}, env = {}, &block)
-      set_headers(headers)
-      super path, params, env, &block
-      check_response_status!(:post, 201, path)
-      last_response.body
-    end
-
-    # Sends a PUT request to the application.
-    #
-    # Similar to `Rack::Test::Methods#put` except that it adds more convenient
-    # access to setting request headers, it raises an exception if the response
-    # status is not 200, and it returns the response body.
-    #
-    # @param [String] path The path portion of the URI to request from the
-    #   application
-    # @param [Object] params The request params or body
-    # @param [Hash] headers A hash of any additional HTTP headers to be set on
-    #   the request.
-    # @param [Hash] env Additional environment variables that should be present
-    #   on the request.
-    # @yield [Rack::Response] Yields the last response to the block if a
-    #   block is given.
-    def put(path, params = {}, headers = {}, env = {}, &block)
-      set_headers(headers)
-      super path, params, env, &block
-      check_response_status!(:put, 200, path)
-      last_response.body
-    end
-
-    # Sends a GET request to the application.
-    #
-    # Similar to `Rack::Test::Methods#get` except that it adds more convenient
-    # access to setting request headers, it raises an exception if the response
-    # status is not 200, and it returns the response body.
-    #
-    # @param [String] path The path portion of the URI to request from the
-    #   application
-    # @param [Object] params The request params or body
-    # @param [Hash] headers A hash of any additional HTTP headers to be set on
-    #   the request.
-    # @param [Hash] env Additional environment variables that should be present
-    #   on the request.
-    # @yield [Rack::Response] Yields the last response to the block if a
-    #   block is given.
-    def get(path, params = {}, headers = {}, env = {}, &block)
-      set_headers(headers)
-      super path, params, env, &block
-      check_response_status!(:get, 200, path)
-      last_response.body
-    end
-
-    private
-
-    def check_response_status!(verb, expected_status, path)
-      actual_status = response_status
-      unless actual_status == expected_status
-        raise UnexpectedResponse, 
-          "#{verb} to #{path} unexpectedly responded with an HTTP status of #{actual_status}:\n" \
-          + response_body
-      end
-    end
-
-    def response_status
-      last_response.status
-    end
-
-    def response_body
-      last_response.body
-    end
-
-    def set_headers(headers)
-      headers.each do |name, value|
-        header name, value
-      end
-    end
-  end
-end