kookaburra 0.18.2 → 0.18.3

data/VERSION

@@ -1 +1 @@
-0.18.2
+0.18.3

data/kookaburra.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "kookaburra"
-  s.version = "0.18.2"
+  s.version = "0.18.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Wilger", "Sam Livingston-Gray", "Ravi Gadad"]
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
     "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/json_api_driver_spec.rb",
     "spec/kookaburra/null_browser_spec.rb",
     "spec/kookaburra/rack_driver_spec.rb",
@@ -48,7 +49,6 @@ Gem::Specification.new do |s|
     "spec/kookaburra/test_helpers_spec.rb",
     "spec/kookaburra/ui_driver/ui_component_spec.rb",
     "spec/kookaburra/ui_driver_spec.rb",
-    "spec/kookaburra_integration_spec.rb",
     "spec/kookaburra_spec.rb",
     "spec/support/shared_examples/it_has_a_dependency_accessor.rb"
   ]

data/lib/kookaburra/api_driver.rb

@@ -7,5 +7,10 @@ class Kookaburra
   #
   # @abstract Subclass and provide an API client implementation
   class APIDriver
+    # Returns a new APIDriver.
+    #
+    # @param args Not actually used, but takes any arguments
+    def initialize(*args)
+    end
   end
 end

data/spec/integration/test_a_rack_application_spec.rb

@@ -0,0 +1,311 @@
+require 'kookaburra'
+require 'capybara'
+require 'sinatra/base'
+require 'active_support/hash_with_indifferent_access'
+
+describe "testing a Rack application with Kookaburra" do
+  describe "with an HTML interface" do
+    describe "with a JSON API" do
+      require 'kookaburra/json_api_driver'
+      class MyAPIDriver < Kookaburra::JsonApiDriver
+        def create_user(user_data)
+          post '/users', user_data
+        end
+
+        def create_widget(widget_data)
+          post '/widgets', widget_data
+        end
+      end
+
+      class MyGivenDriver < Kookaburra::GivenDriver
+        def a_user(name)
+          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)
+          result = api.create_widget(widget)
+          test_data.widgets[name] = result
+        end
+      end
+
+      class SignInScreen < Kookaburra::UIDriver::UIComponent
+        def component_path
+          '/session/new'
+        end
+
+        def component_locator
+          '#sign_in_screen'
+        end
+
+        def sign_in(user_data)
+          fill_in 'Email:', :with => user_data['email']
+          fill_in 'Password:', :with => user_data['password']
+          click_button 'Sign In'
+        end
+      end
+
+      class WidgetList < Kookaburra::UIDriver::UIComponent
+        def component_path
+          '/widgets'
+        end
+
+        def component_locator
+          '#widget_list'
+        end
+
+        def widgets
+          all('.widget_summary').map do |el|
+            extract_widget_data(el)
+          end
+        end
+
+        def last_widget_created
+          element = find('.last_widget.created')
+          extract_widget_data(element)
+        end
+
+        def choose_to_create_new_widget
+          click_on 'New Widget'
+        end
+
+        def choose_to_delete_widget(widget_data)
+          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
+          }
+        end
+      end
+
+      class WidgetForm < Kookaburra::UIDriver::UIComponent
+        def component_locator
+          '#widget_form'
+        end
+
+        def submit(widget_data)
+          fill_in 'Name:', :with => widget_data['name']
+          click_on 'Save'
+        end
+      end
+
+      class MyUIDriver < Kookaburra::UIDriver
+        ui_component :sign_in_screen, SignInScreen
+        ui_component :widget_list, WidgetList
+        ui_component :widget_form, WidgetForm
+
+        def sign_in(name)
+          sign_in_screen.show
+          sign_in_screen.sign_in(test_data.users[name])
+        end
+
+        def create_new_widget(name, attributes = {})
+          widget_list.show
+          widget_list.choose_to_create_new_widget
+          widget_form.submit('name' => 'My Widget')
+          test_data.widgets[name] = widget_list.last_widget_created
+        end
+
+        def delete_widget(name)
+          widget_list.show
+          widget_list.choose_to_delete_widget(test_data.widgets[name])
+        end
+      end
+
+      # This is the fixture Rack application against which the integration
+      # test will run. It uses class variables to persist data, because
+      # Sinatra will instantiate a new instance of TestRackApp for each
+      # request.
+      class TestRackApp < Sinatra::Base
+        enable :sessions
+
+        # we want error handling to behave as it would for a production
+        # deployment rather than development
+        set :raise_errors, false
+        set :show_exceptions, false
+
+        def parse_json_req_body
+          request.body.rewind
+          ActiveSupport::JSON.decode(request.body.read).symbolize_keys
+        end
+
+        post '/users' do
+          user_data = parse_json_req_body
+          @@users ||= {}
+          @@users[user_data[:email]] = user_data
+          status 201
+          headers 'Content-Type' => 'application/json'
+          body user_data.to_json
+        end
+
+        post '/session' do
+          user = @@users[params[:email]]
+          if user && user[:password] == params[:password]
+            session[:logged_in] = true
+            status 200
+            body 'You are logged in!'
+          else
+            session[:logged_in] = false
+            status 403
+            body 'Log in failed!'
+          end
+        end
+
+        get '/session/new' do
+          body <<-EOF
+            <html>
+              <head>
+                <title>Sign In</title>
+              </head>
+              <body>
+                <div id="sign_in_screen">
+                  <form action="/session" method="POST">
+                    <label for="email">Email:</label>
+                    <input id="email" name="email" type="text" />
+
+                    <label for="password">Password:</label>
+                    <input id="password" name="password" type="password" />
+
+                    <input type="submit" value="Sign In" />
+                  </form>
+                </div>
+              </body>
+            </html>
+          EOF
+        end
+
+        post '/widgets/:widget_id' do
+          @@widgets.delete_if do |w|
+            w[:id] == params['widget_id']
+          end
+          redirect to('/widgets')
+        end
+
+        get '/widgets/new' do
+          body <<-EOF
+            <html>
+              <head>
+                <title>New Widget</title>
+              </head>
+              <body>
+                <div id="widget_form">
+                  <form action="/widgets" method="POST">
+                    <label for="name">Name:</label>
+                    <input id="name" name="name" type="text" />
+
+                    <input type="submit" value="Save" />
+                  </form>
+                </div>
+              </body>
+            </html>
+          EOF
+        end
+
+        post '/widgets' do
+          @@widgets ||= []
+          widget_data = if request.media_type == 'application/json'
+                          parse_json_req_body
+                        else
+                          params.symbolize_keys.slice(:name)
+                        end
+          widget_data[:id] = `uuidgen`.strip
+          @@widgets << widget_data
+          @@last_widget_created = widget_data
+          if request.accept? 'text/html'
+            redirect to('/widgets')
+          elsif request.accept? 'application/json'
+            status 201
+            headers 'Content-Type' => 'application/json'
+            body widget_data.to_json
+          else
+            redirect to('/widgets')
+          end
+        end
+
+        get '/widgets' do
+          raise "Not logged in!" unless session[:logged_in]
+          @@widgets ||= []
+          last_widget_created, @@last_widget_created = @@last_widget_created, nil
+          content = ''
+          content << <<-EOF
+          <html>
+            <head>
+              <title>Widgets</title>
+            </head>
+            <body>
+              <div id="widget_list">
+                EOF
+                if last_widget_created
+                  content << <<-EOF
+                  <div class="last_widget created">
+                    <span class="id">#{last_widget_created[:id]}</span>
+                    <span class="name">#{last_widget_created[:name]}</span>
+                  </div>
+                  EOF
+                end
+                content << <<-EOF
+                <ul>
+                EOF
+                @@widgets.each do |w|
+                  content << <<-EOF
+                  <li class="widget_summary">
+                    <span class="id">#{w[:id]}</span>
+                    <span class="name">#{w[:name]}</span>
+                    <form id="delete_#{w[:id]}" action="/widgets/#{w[:id]}" method="POST">
+                      <button type="submit" value="Delete" />
+                    </form>
+                  </li>
+                  EOF
+                end
+                content << <<-EOF
+                </ul>
+                <a href="/widgets/new">New Widget</a>
+              </div>
+            </body>
+          </html>
+          EOF
+          body content
+        end
+      end
+
+
+      it "runs the tests against the app" do
+        my_app = TestRackApp.new
+
+        server_error_detection = lambda { |browser|
+          browser.has_css?('h1', :text => 'Internal Server Error')
+        }
+
+        k = Kookaburra.new({
+          :ui_driver_class        => MyUIDriver,
+          :given_driver_class     => MyGivenDriver,
+          :api_driver_class       => MyAPIDriver,
+          :browser                => Capybara::Session.new(:rack_test, my_app),
+          :rack_app               => my_app,
+          :server_error_detection => server_error_detection
+        })
+
+        k.given.a_user(:bob)
+        k.given.a_widget(:widget_a)
+        k.given.a_widget(:widget_b, :name => 'Foo')
+
+        k.ui.sign_in(:bob)
+        k.ui.widget_list.show
+        k.ui.widget_list.widgets.should == k.get_data(:widgets).slice(:widget_a, :widget_b)
+
+        k.ui.create_new_widget(:widget_c, :name => 'Bar')
+        k.ui.widget_list.widgets.should == k.get_data(:widgets).slice(:widget_a, :widget_b, :widget_c)
+
+        k.ui.delete_widget(:widget_b)
+        k.ui.widget_list.widgets.should == k.get_data(:widgets).slice(:widget_a, :widget_c)
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kookaburra
 version: !ruby/object:Gem::Version 
-  hash: 83
+  hash: 81
   prerelease: 
   segments: 
   - 0
   - 18
-  - 2
-  version: 0.18.2
+  - 3
+  version: 0.18.3
 platform: ruby
 authors: 
 - John Wilger
@@ -223,6 +223,7 @@ files:
 - 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/json_api_driver_spec.rb
 - spec/kookaburra/null_browser_spec.rb
 - spec/kookaburra/rack_driver_spec.rb
@@ -230,7 +231,6 @@ files:
 - spec/kookaburra/test_helpers_spec.rb
 - spec/kookaburra/ui_driver/ui_component_spec.rb
 - spec/kookaburra/ui_driver_spec.rb
-- spec/kookaburra_integration_spec.rb
 - spec/kookaburra_spec.rb
 - spec/support/shared_examples/it_has_a_dependency_accessor.rb
 homepage: http://github.com/projectdx/kookaburra

data/spec/kookaburra_integration_spec.rb

@@ -1,348 +0,0 @@
-require 'kookaburra'
-require 'capybara'
-require 'sinatra/base'
-require 'active_support/hash_with_indifferent_access'
-
-describe 'Kookaburra Integration' do
-  describe "testing a Rack application" do
-    describe "with an HTML interface" do
-      describe "with a JSON API" do
-        require 'kookaburra/json_api_driver'
-        class MyAPIDriver < Kookaburra::JsonApiDriver
-          def create_user(user_data)
-            post '/users', user_data
-          end
-
-          def create_widget(widget_data)
-            post '/widgets', widget_data
-          end
-        end
-
-        class MyGivenDriver < Kookaburra::GivenDriver
-          def a_user(name)
-            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)
-            result = api.create_widget(widget)
-            test_data.widgets[name] = result
-          end
-        end
-
-        class SignInScreen < Kookaburra::UIDriver::UIComponent
-          def component_path
-            '/session/new'
-          end
-
-          def component_locator
-            '#sign_in_screen'
-          end
-
-          def sign_in(user_data)
-            fill_in 'Email:', :with => user_data['email']
-            fill_in 'Password:', :with => user_data['password']
-            click_button 'Sign In'
-          end
-        end
-
-        class WidgetList < Kookaburra::UIDriver::UIComponent
-          def component_path
-            '/widgets'
-          end
-
-          def component_locator
-            '#widget_list'
-          end
-
-          def widgets
-            all('.widget_summary').map do |el|
-              extract_widget_data(el)
-            end
-          end
-
-          def last_widget_created
-            element = find('.last_widget.created')
-            extract_widget_data(element)
-          end
-
-          def choose_to_create_new_widget
-            click_on 'New Widget'
-          end
-
-          def choose_to_delete_widget(widget_data)
-            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
-            }
-          end
-        end
-
-        class WidgetForm < Kookaburra::UIDriver::UIComponent
-          def component_locator
-            '#widget_form'
-          end
-
-          def submit(widget_data)
-            fill_in 'Name:', :with => widget_data['name']
-            click_on 'Save'
-          end
-        end
-
-        class MyUIDriver < Kookaburra::UIDriver
-          ui_component :sign_in_screen, SignInScreen
-          ui_component :widget_list, WidgetList
-          ui_component :widget_form, WidgetForm
-
-          def sign_in(name)
-            sign_in_screen.show
-            sign_in_screen.sign_in(test_data.users[name])
-          end
-
-          def create_new_widget(name, attributes = {})
-            widget_list.show
-            widget_list.choose_to_create_new_widget
-            widget_form.submit('name' => 'My Widget')
-            test_data.widgets[name] = widget_list.last_widget_created
-          end
-
-          def delete_widget(name)
-            widget_list.show
-            widget_list.choose_to_delete_widget(test_data.widgets[name])
-          end
-        end
-
-        # This is the fixture Rack application against which the integration
-        # test will run. It uses class variables to persist data, because
-        # Sinatra will instantiate a new instance of TestRackApp for each
-        # request.
-        class TestRackApp < Sinatra::Base
-          enable :sessions
-
-          # we want error handling to behave as it would for a production
-          # deployment rather than development
-          set :raise_errors, false
-          set :show_exceptions, false
-
-          def parse_json_req_body
-            request.body.rewind
-            ActiveSupport::JSON.decode(request.body.read).symbolize_keys
-          end
-
-          post '/users' do
-            user_data = parse_json_req_body
-            @@users ||= {}
-            @@users[user_data[:email]] = user_data
-            status 201
-            headers 'Content-Type' => 'application/json'
-            body user_data.to_json
-          end
-
-          post '/session' do
-            user = @@users[params[:email]]
-            if user && user[:password] == params[:password]
-              session[:logged_in] = true
-              status 200
-              body 'You are logged in!'
-            else
-              session[:logged_in] = false
-              status 403
-              body 'Log in failed!'
-            end
-          end
-
-          get '/session/new' do
-            body <<-EOF
-              <html>
-                <head>
-                  <title>Sign In</title>
-                </head>
-                <body>
-                  <div id="sign_in_screen">
-                    <form action="/session" method="POST">
-                      <label for="email">Email:</label>
-                      <input id="email" name="email" type="text" />
-
-                      <label for="password">Password:</label>
-                      <input id="password" name="password" type="password" />
-
-                      <input type="submit" value="Sign In" />
-                    </form>
-                  </div>
-                </body>
-              </html>
-            EOF
-          end
-
-          post '/widgets/:widget_id' do
-            @@widgets.delete_if do |w|
-              w[:id] == params['widget_id']
-            end
-            redirect to('/widgets')
-          end
-
-          get '/widgets/new' do
-            body <<-EOF
-              <html>
-                <head>
-                  <title>New Widget</title>
-                </head>
-                <body>
-                  <div id="widget_form">
-                    <form action="/widgets" method="POST">
-                      <label for="name">Name:</label>
-                      <input id="name" name="name" type="text" />
-
-                      <input type="submit" value="Save" />
-                    </form>
-                  </div>
-                </body>
-              </html>
-            EOF
-          end
-
-          post '/widgets' do
-            @@widgets ||= []
-            widget_data = if request.media_type == 'application/json'
-                            parse_json_req_body
-                          else
-                            params.symbolize_keys.slice(:name)
-                          end
-            widget_data[:id] = `uuidgen`.strip
-            @@widgets << widget_data
-            @@last_widget_created = widget_data
-            if request.accept? 'text/html'
-              redirect to('/widgets')
-            elsif request.accept? 'application/json'
-              status 201
-              headers 'Content-Type' => 'application/json'
-              body widget_data.to_json
-            else
-              redirect to('/widgets')
-            end
-          end
-
-          get '/widgets' do
-            raise "Not logged in!" unless session[:logged_in]
-            @@widgets ||= []
-            last_widget_created, @@last_widget_created = @@last_widget_created, nil
-            content = ''
-            content << <<-EOF
-            <html>
-              <head>
-                <title>Widgets</title>
-              </head>
-              <body>
-                <div id="widget_list">
-                  EOF
-                  if last_widget_created
-                    content << <<-EOF
-                    <div class="last_widget created">
-                      <span class="id">#{last_widget_created[:id]}</span>
-                      <span class="name">#{last_widget_created[:name]}</span>
-                    </div>
-                    EOF
-                  end
-                  content << <<-EOF
-                  <ul>
-                  EOF
-                  @@widgets.each do |w|
-                    content << <<-EOF
-                    <li class="widget_summary">
-                      <span class="id">#{w[:id]}</span>
-                      <span class="name">#{w[:name]}</span>
-                      <form id="delete_#{w[:id]}" action="/widgets/#{w[:id]}" method="POST">
-                        <button type="submit" value="Delete" />
-                      </form>
-                    </li>
-                    EOF
-                  end
-                  content << <<-EOF
-                  </ul>
-                  <a href="/widgets/new">New Widget</a>
-                </div>
-              </body>
-            </html>
-            EOF
-            body content
-          end
-        end
-
-
-        it "runs the tests against the app" do
-          my_app = TestRackApp.new
-
-          server_error_detection = lambda { |browser|
-            browser.has_css?('h1', :text => 'Internal Server Error')
-          }
-
-          k = Kookaburra.new({
-            :ui_driver_class        => MyUIDriver,
-            :given_driver_class     => MyGivenDriver,
-            :api_driver_class       => MyAPIDriver,
-            :browser                => Capybara::Session.new(:rack_test, my_app),
-            :rack_app               => my_app,
-            :server_error_detection => server_error_detection
-          })
-
-          k.given.a_user(:bob)
-          k.given.a_widget(:widget_a)
-          k.given.a_widget(:widget_b, :name => 'Foo')
-
-          k.ui.sign_in(:bob)
-          k.ui.widget_list.show
-          k.ui.widget_list.widgets.should == k.get_data(:widgets).slice(:widget_a, :widget_b)
-
-          k.ui.create_new_widget(:widget_c, :name => 'Bar')
-          k.ui.widget_list.widgets.should == k.get_data(:widgets).slice(:widget_a, :widget_b, :widget_c)
-
-          k.ui.delete_widget(:widget_b)
-          k.ui.widget_list.widgets.should == k.get_data(:widgets).slice(:widget_a, :widget_c)
-        end
-      end
-    end
-  end
-
-  describe "testing a Ruby API" do
-    class MyUIDriver < Kookaburra::UIDriver
-    end
-
-    class MyGivenDriver < Kookaburra::GivenDriver
-    end
-
-    class APIDriver < Kookaburra::APIDriver
-    end
-
-    it "runs the tests" do
-      k = Kookaburra.new({
-        :api_driver_class => MyAPIDriver,
-        :given_driver_class => MyGivenDriver,
-        :ui_driver_class    => MyUIDriver,
-      })
-
-      pending 'WIP' do
-        k.given.a_user(:bob)
-        k.given.a_widget(:widget_a)
-        k.given.a_widget(:widget_b, :name => 'Foo')
-
-        k.ui.sign_in(:bob)
-        k.ui.widget_list.show
-        k.ui.widget_list.widgets.should == k.get_data(:widgets).slice(:widget_a, :widget_b)
-
-        k.ui.create_new_widget(:widget_c, :name => 'Bar')
-        k.ui.widget_list.widgets.should == k.get_data(:widgets).slice(:widget_a, :widget_b, :widget_c)
-
-        k.ui.delete_widget(:widget_b)
-        k.ui.widget_list.widgets.should == k.get_data(:widgets).slice(:widget_a, :widget_c)
-      end
-    end
-  end
-end