kookaburra 0.16.1 → 0.17.0

data/Rakefile

@@ -20,7 +20,7 @@ Jeweler::Tasks.new do |gem|
   gem.summary = %Q{WindowDriver testing pattern for Ruby apps}
   gem.description = %Q{Cucumber + Capybara = Kookaburra? It made sense at the time.}
   gem.email = "johnwilger@gmail.com"
-  gem.authors = ["John Wilger", "Sam Livingston-Gray"]
+  gem.authors = ["John Wilger", "Sam Livingston-Gray", "Ravi Gadad"]
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.16.1
+0.17.0

data/kookaburra.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "kookaburra"
-  s.version = "0.16.1"
+  s.version = "0.17.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["John Wilger", "Sam Livingston-Gray"]
-  s.date = "2012-03-15"
+  s.authors = ["John Wilger", "Sam Livingston-Gray", "Ravi Gadad"]
+  s.date = "2012-03-16"
   s.description = "Cucumber + Capybara = Kookaburra? It made sense at the time."
   s.email = "johnwilger@gmail.com"
   s.extra_rdoc_files = [

data/lib/kookaburra/json_api_driver.rb

@@ -65,12 +65,26 @@ class Kookaburra
     #   api.create_widget(:name => 'Foo')
     #   #=> {:id => 1, :name => 'Foo', :description => ''}
     def post(path, data)
+      do_json_request(:post, path, data)
+    end
+
+    def put(path, data)
+      do_json_request(:put, path, data)
+    end
+
+    def get(path, data)
+      do_json_request(:get, path, data)
+    end
+
+  private
+
+    def do_json_request(method, path, data)
       json_request_headers = {
         'Content-Type' => 'application/json',
         'Accept' => 'application/json'
       }
-      response = @app_driver.post(path, J.encode(data), json_request_headers)
-      J.decode(response).symbolize_keys
+      response = @app_driver.send(method.to_sym, path, J.encode(data), json_request_headers)
+      J.decode(response)
     end
   end
 end

data/lib/kookaburra/rack_driver.rb

@@ -37,6 +37,50 @@ class Kookaburra
       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)

data/spec/kookaburra/json_api_driver_spec.rb

@@ -1,24 +1,26 @@
 require 'kookaburra/json_api_driver'
 
 describe Kookaburra::JsonApiDriver do
-  describe 'private methods (for use by subclasses)' do
-    describe '#post' do
-      it 'posts data as JSON to the specified path within the application' do
-        app_driver = mock('RackDriver')
-        app_driver.should_receive(:post) \
-          .with('/foo', '{"bar":"baz"}',
-                'Content-Type' => 'application/json',
-                'Accept' => 'application/json') \
-          .and_return('{"foo":"bar"}')
-        driver = Kookaburra::JsonApiDriver.new(app_driver)
-        driver.send(:post, '/foo', {:bar => :baz})
-      end
+  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', :post => '{"ham":"spam"}')
-        driver = Kookaburra::JsonApiDriver.new(app_driver)
-        driver.send(:post, '/foo', {:bar => :baz}) \
-          .should == {:ham => 'spam'}
+        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
 

data/spec/kookaburra/rack_driver_spec.rb

@@ -5,32 +5,38 @@ describe Kookaburra::RackDriver do
     Kookaburra::RackDriver.should include(Rack::Test::Methods)
   end
 
-  describe '#post' do
-    it 'returns the response body' do
-      app = stub('Rack App', :call => [201, {}, 'response body'])
-      driver = Kookaburra::RackDriver.new(app)
-      driver.post('/foo', 'req body').should == 'response body'
-    end
+  {
+    'post' => {:success => 201, :unexpected => 200},
+    'put'  => {:success => 200, :unexpected => 404},
+    'get'  => {:success => 200, :unexpected => 404}
+  }.each_pair do |method, codes|
+    describe "##{method}" do
+      it 'returns the response body' do
+        app = stub('Rack App', :call => [codes[:success], {}, 'response body'])
+        driver = Kookaburra::RackDriver.new(app)
+        driver.send(method.to_sym, '/foo', 'req body').should == 'response body'
+      end
 
-    it 'sets the specified headers on the request' do
-      app = mock('Rack App')
-      driver = Kookaburra::RackDriver.new(app)
-      app.should_receive(:call) do |env|
-        env['HTTP_HEADER_A'].should == 'foo'
-        env['HTTP_HEADER_B'].should == 'bar'
-        [201, {}, 'foo']
+      it 'sets the specified headers on the request' do
+        app = mock('Rack App')
+        driver = Kookaburra::RackDriver.new(app)
+        app.should_receive(:call) do |env|
+          env['HTTP_HEADER_A'].should == 'foo'
+          env['HTTP_HEADER_B'].should == 'bar'
+          [codes[:success], {}, 'foo']
+        end
+        driver.send(method.to_sym, '/foo', 'req body', 'header-a' => 'foo', 'header-b' => 'bar')
       end
-      driver.post('/foo', 'req body', 'header-a' => 'foo', 'header-b' => 'bar')
-    end
 
-    it 'raises a Kookabura::UnexpectedResponse if response status is not 201' do
-      app_response = [200, {'Content-Type' => 'application/json'}, 'Here is the response body']
-      app = stub('Rack App', :call => app_response)
-      driver = Kookaburra::RackDriver.new(app)
-      lambda { driver.send(:post, '/foo', {:bar => :baz}) } \
-        .should raise_error(Kookaburra::UnexpectedResponse,
-                            "post to /foo unexpectedly responded with an HTTP status of 200:\n" \
-                            + 'Here is the response body')
+      it "raises a Kookabura::UnexpectedResponse if response status is not #{codes[:success]}" do
+        app_response = [codes[:unexpected], {'Content-Type' => 'application/json'}, 'Here is the response body']
+        app = stub('Rack App', :call => app_response)
+        driver = Kookaburra::RackDriver.new(app)
+        lambda { driver.send(method, '/foo', {:bar => :baz}) } \
+          .should raise_error(Kookaburra::UnexpectedResponse,
+                              "#{method} to /foo unexpectedly responded with an HTTP status of #{codes[:unexpected]}:\n" \
+                              + 'Here is the response body')
+      end
     end
   end
 end

data/spec/kookaburra_integration_spec.rb

@@ -20,13 +20,13 @@ describe 'Kookaburra Integration' do
 
         class MyGivenDriver < Kookaburra::GivenDriver
           def a_user(name)
-            user = {:email => 'bob@example.com', :password => '12345'}
+            user = {'email' => 'bob@example.com', 'password' => '12345'}
             result = api.create_user(user)
             test_data.users[name] = result
           end
 
           def a_widget(name, attributes = {})
-            widget = {:name => 'Foo'}.merge(attributes)
+            widget = {'name' => 'Foo'}.merge(attributes)
             result = api.create_widget(widget)
             test_data.widgets[name] = result
           end
@@ -42,8 +42,8 @@ describe 'Kookaburra Integration' do
           end
 
           def sign_in(user_data)
-            fill_in 'Email:', :with => user_data[:email]
-            fill_in 'Password:', :with => user_data[:password]
+            fill_in 'Email:', :with => user_data['email']
+            fill_in 'Password:', :with => user_data['password']
             click_button 'Sign In'
           end
         end
@@ -73,15 +73,15 @@ describe 'Kookaburra Integration' do
           end
 
           def choose_to_delete_widget(widget_data)
-            find("#delete_#{widget_data[:id]}").click_button('Delete')
+            find("#delete_#{widget_data['id']}").click_button('Delete')
           end
 
           private
 
           def extract_widget_data(element)
             {
-              :id => element.find('.id').text,
-              :name => element.find('.name').text
+              'id' => element.find('.id').text,
+              'name' => element.find('.name').text
             }
           end
         end
@@ -92,7 +92,7 @@ describe 'Kookaburra Integration' do
           end
 
           def submit(widget_data)
-            fill_in 'Name:', :with => widget_data[:name]
+            fill_in 'Name:', :with => widget_data['name']
             click_on 'Save'
           end
         end
@@ -110,7 +110,7 @@ describe 'Kookaburra Integration' do
           def create_new_widget(name, attributes = {})
             widget_list.show
             widget_list.choose_to_create_new_widget
-            widget_form.submit(:name => 'My Widget')
+            widget_form.submit('name' => 'My Widget')
             test_data.widgets[name] = widget_list.last_widget_created
           end
 

metadata

@@ -1,22 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: kookaburra
 version: !ruby/object:Gem::Version 
-  hash: 93
+  hash: 91
   prerelease: 
   segments: 
   - 0
-  - 16
-  - 1
-  version: 0.16.1
+  - 17
+  - 0
+  version: 0.17.0
 platform: ruby
 authors: 
 - John Wilger
 - Sam Livingston-Gray
+- Ravi Gadad
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-03-15 00:00:00 Z
+date: 2012-03-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement