kookaburra 0.17.1 → 0.18.0

data/Gemfile

@@ -1,5 +1,8 @@
 source 'http://rubygems.org'
 
+# Only need this gem for Ruby < 1.9.2
+gem 'basic_object' unless defined?(BasicObject)
+
 gem 'i18n'
 gem 'activesupport', '>= 3.0'
 gem 'rack-test'

data/Gemfile.lock

@@ -4,6 +4,7 @@ GEM
     activesupport (3.2.2)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    basic_object (0.0.1)
     capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -74,6 +75,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (>= 3.0)
+  basic_object
   capybara
   i18n
   jeweler

data/VERSION

@@ -1 +1 @@
-0.17.1
+0.18.0

data/kookaburra.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "kookaburra"
-  s.version = "0.17.1"
+  s.version = "0.18.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Wilger", "Sam Livingston-Gray", "Ravi Gadad"]
-  s.date = "2012-03-17"
+  s.date = "2012-03-18"
   s.description = "Cucumber + Capybara = Kookaburra? It made sense at the time."
   s.email = "johnwilger@gmail.com"
   s.extra_rdoc_files = [
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "lib/kookaburra/exceptions.rb",
     "lib/kookaburra/given_driver.rb",
     "lib/kookaburra/json_api_driver.rb",
+    "lib/kookaburra/null_browser.rb",
     "lib/kookaburra/rack_driver.rb",
     "lib/kookaburra/test_data.rb",
     "lib/kookaburra/test_helpers.rb",
@@ -41,6 +42,7 @@ Gem::Specification.new do |s|
     "lib/kookaburra/ui_driver/ui_component.rb",
     "lib/kookaburra/utils/active_record_shared_connection.rb",
     "spec/kookaburra/json_api_driver_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",
@@ -60,6 +62,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<basic_object>, [">= 0"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0"])
       s.add_runtime_dependency(%q<rack-test>, [">= 0"])
@@ -72,6 +75,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<reek>, [">= 0"])
       s.add_development_dependency(%q<sinatra>, [">= 0"])
     else
+      s.add_dependency(%q<basic_object>, [">= 0"])
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 3.0"])
       s.add_dependency(%q<rack-test>, [">= 0"])
@@ -85,6 +89,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sinatra>, [">= 0"])
     end
   else
+    s.add_dependency(%q<basic_object>, [">= 0"])
     s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 3.0"])
     s.add_dependency(%q<rack-test>, [">= 0"])

data/lib/kookaburra/exceptions.rb

@@ -9,4 +9,6 @@ class Kookaburra
   class AssertionFailed < RuntimeError; end
   # @private
   class ComponentNotFound < RuntimeError; end
+  # @private
+  class NullBrowserError < ConfigurationError; end
 end

data/lib/kookaburra/null_browser.rb

@@ -0,0 +1,10 @@
+require 'basic_object'
+
+class Kookaburra
+  class NullBrowser < BasicObject
+    def method_missing(*args)
+      raise NullBrowserError, 
+        "You did not provide a :browser to the Kookaburra configuration, but you tried to use one anyway."
+    end
+  end
+end

data/lib/kookaburra/test_data.rb

@@ -1,3 +1,5 @@
+require 'delegate'
+
 class Kookaburra
   # Each instance of {Kookaburra} has its own instance of TestData. This object
   # is used to maintain a shared understanding of the application state between
@@ -38,14 +40,15 @@ class Kookaburra
     #
     #   # Raises an UnknownKeyError
     #   test_data.widgets[:bar]
-    class Collection
+    class Collection < SimpleDelegator
       # @param [String] name The name of the collection. Used to provide
       #   helpful error messages when unknown keys are accessed.
       def initialize(name)
         @name = name
-        @data = Hash.new do |hash, key|
+        data = Hash.new do |hash, key|
           raise UnknownKeyError, "Can't find test_data.#{@name}[#{key.inspect}]. Did you forget to set it?"
         end
+        super(data)
       end
 
       # Unlike a Hash, this object is only identical to another if the actual
@@ -69,21 +72,9 @@ class Kookaburra
       #   not been set
       def slice(*keys)
         results = keys.map do |key|
-          @data[key]
+          self[key]
         end
       end
-
-      # Any unknown messages are passed to the underlying data collection, which
-      # is a Hash.
-      def method_missing(name, *args, &block)
-        return super unless respond_to?(name)
-        @data.send(name, *args, &block)
-      end
-
-      # @private
-      def respond_to?(name)
-        super || @data.respond_to?(name)
-      end
     end
   end
 end

data/lib/kookaburra/ui_driver/ui_component.rb

@@ -1,5 +1,4 @@
 require 'kookaburra/exceptions'
-require 'kookaburra/dependency_accessor'
 
 class Kookaburra
   class UIDriver
@@ -66,8 +65,6 @@ class Kookaburra
     #   you override the default implementation of {#show}, you must also
     #   override the {#component_path} method.
     class UIComponent
-      extend DependencyAccessor
-
       # New UIComponent instances are typically created for you by your
       # {Kookaburra::UIDriver} instance.
       #
@@ -82,7 +79,8 @@ class Kookaburra
       end
 
       # If the UIComponent is sent a message it does not understand, it will
-      # forward that message on to its {#browser}. This provides convenient
+      # forward that message on to its {#browser} but wrap the call in a block
+      # provided to the the browser's `#within` method. This provides convenient
       # access to the browser driver's DSL, automatically scoped to this
       # component.
       def method_missing(name, *args, &block)
@@ -135,11 +133,12 @@ class Kookaburra
       protected
 
       # This is the browser driver with which the UIComponent was initialized.
-      #
-      # @attribute [r] browser
-      #
-      # @raise [RuntimeError] if no browser was specified in call to {#initialize}
-      dependency_accessor :browser
+      # 
+      # If no :browser option was specified in {#initialize}, it returns a
+      # default {Kookaburra::NullBrowser} instance.
+      def browser
+        @browser ||= NullBrowser.new
+      end
 
       # Provides a mechanism to make assertions about the state of your
       # UIComponent without relying on a specific testing framework. A good

data/lib/kookaburra/ui_driver.rb

@@ -48,7 +48,7 @@ class Kookaburra
       #   this component.
       def ui_component(component_name, component_class)
         define_method(component_name) do
-          component_class.new(:browser => browser, :server_error_detection => @server_error_detection)
+          component_class.new(:browser => @browser, :server_error_detection => @server_error_detection)
         end
       end
     end
@@ -70,9 +70,6 @@ class Kookaburra
 
     protected
 
-    # @attribute [r] browser
-    dependency_accessor :browser
-
     # @attribute [r] test_data
     dependency_accessor :test_data
   end

data/lib/kookaburra.rb

@@ -42,10 +42,11 @@ class Kookaburra
   #   Kookaburra is intended to work with `Capybara::Session` as a browser
   #   driver, but you could use something else that exposed the same basic API.
   def initialize(options = {})
-    @api_driver_class   = options[:api_driver_class]
-    @given_driver_class = options[:given_driver_class]
-    @ui_driver_class    = options[:ui_driver_class]
-    @browser            = options[:browser]
+    @api_driver_class       = options[:api_driver_class]
+    @given_driver_class     = options[:given_driver_class]
+    @ui_driver_class        = options[:ui_driver_class]
+    @browser                = options[:browser]
+    @rack_app               = options[:rack_app]
     @server_error_detection = options[:server_error_detection]
   end
 
@@ -91,14 +92,21 @@ class Kookaburra
   private
 
   extend DependencyAccessor
-  dependency_accessor :given_driver_class, :api_driver_class, :ui_driver_class, :browser
+  dependency_accessor :given_driver_class, :api_driver_class, :ui_driver_class
 
   def api
-    api_driver_class.new(RackDriver.new(browser.app))
+    api_driver_class.new(application_driver)
+  end
+
+  def application_driver
+    RackDriver.new(@rack_app)
   end
 
   def test_data
     @test_data ||= TestData.new
   end
 
+  def browser
+    @browser ||= NullBrowser.new
+  end
 end

data/spec/kookaburra/null_browser_spec.rb

@@ -0,0 +1,15 @@
+require 'kookaburra/null_browser'
+
+describe Kookaburra::NullBrowser do
+  it 'is a BasicObject' do
+    pending "Not sure how to test this, since a BasicObject doesn't implement #kind_of?, etc." do
+      subject.kind_of?(BasicObject).should == true
+    end
+  end
+
+  it 'raises a NullBrowserError when any methods are called on it' do
+    lambda { subject.app }.should raise_error(
+      Kookaburra::NullBrowserError,
+      "You did not provide a :browser to the Kookaburra configuration, but you tried to use one anyway.")
+  end
+end

data/spec/kookaburra/ui_driver/ui_component_spec.rb

@@ -1,5 +1,4 @@
 require 'kookaburra/ui_driver/ui_component'
-require 'support/shared_examples/it_has_a_dependency_accessor'
 
 describe Kookaburra::UIDriver::UIComponent do
   describe '#show' do
@@ -154,9 +153,5 @@ describe Kookaburra::UIDriver::UIComponent do
           .should raise_error(Kookaburra::AssertionFailed, "False isn't true, dummy.")
       end
     end
-
-    it_behaves_like :it_has_a_dependency_accessor, :browser do
-      let(:subject_class) { Kookaburra::UIDriver::UIComponent }
-    end
   end
 end

data/spec/kookaburra/ui_driver_spec.rb

@@ -22,6 +22,5 @@ describe Kookaburra::UIDriver do
     let(:subject_class) { Kookaburra::UIDriver }
 
     it_behaves_like :it_has_a_dependency_accessor, :test_data
-    it_behaves_like :it_has_a_dependency_accessor, :browser
   end
 end

data/spec/kookaburra_integration_spec.rb

@@ -285,10 +285,11 @@ describe 'Kookaburra Integration' do
           }
 
           k = Kookaburra.new({
-            :ui_driver_class    => MyUIDriver,
-            :given_driver_class => MyGivenDriver,
-            :api_driver_class   => MyAPIDriver,
-            :browser            => Capybara::Session.new(:rack_test, my_app),
+            :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
           })
 
@@ -309,4 +310,39 @@ describe 'Kookaburra Integration' do
       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

data/spec/kookaburra_spec.rb

@@ -3,8 +3,6 @@ require 'kookaburra'
 describe Kookaburra do
   describe '#given' do
     it 'returns an instance of the configured GivenDriver' do
-      browser_instance = stub('Browser', :app => :a_rack_app)
-
       Kookaburra::RackDriver.should_receive(:new) \
         .with(:a_rack_app) \
         .and_return(:a_rack_driver)
@@ -22,7 +20,7 @@ describe Kookaburra do
 
       k = Kookaburra.new(:given_driver_class => my_given_driver_class,
                          :api_driver_class => my_api_driver_class,
-                         :browser => browser_instance)
+                         :rack_app => :a_rack_app)
       k.given.should == :a_given_driver
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kookaburra
 version: !ruby/object:Gem::Version 
-  hash: 89
+  hash: 87
   prerelease: 
   segments: 
   - 0
-  - 17
-  - 1
-  version: 0.17.1
+  - 18
+  - 0
+  version: 0.18.0
 platform: ruby
 authors: 
 - John Wilger
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-17 00:00:00 Z
+date: 2012-03-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -29,12 +29,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: i18n
+  name: basic_object
   prerelease: false
   type: :runtime
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: i18n
+  prerelease: false
+  type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,9 +61,9 @@ dependencies:
   name: activesupport
   prerelease: false
   type: :runtime
-  requirement: *id002
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,9 +75,9 @@ dependencies:
   name: rack-test
   prerelease: false
   type: :runtime
-  requirement: *id003
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -75,9 +89,9 @@ dependencies:
   name: rspec
   prerelease: false
   type: :development
-  requirement: *id004
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,9 +103,9 @@ dependencies:
   name: capybara
   prerelease: false
   type: :development
-  requirement: *id005
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -103,9 +117,9 @@ dependencies:
   name: yard
   prerelease: false
   type: :development
-  requirement: *id006
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -118,9 +132,9 @@ dependencies:
   name: redcarpet
   prerelease: false
   type: :development
-  requirement: *id007
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -132,9 +146,9 @@ dependencies:
   name: jeweler
   prerelease: false
   type: :development
-  requirement: *id008
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -146,9 +160,9 @@ dependencies:
   name: rcov
   prerelease: false
   type: :development
-  requirement: *id009
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -160,9 +174,9 @@ dependencies:
   name: reek
   prerelease: false
   type: :development
-  requirement: *id010
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -174,7 +188,7 @@ dependencies:
   name: sinatra
   prerelease: false
   type: :development
-  requirement: *id011
+  requirement: *id012
 description: Cucumber + Capybara = Kookaburra? It made sense at the time.
 email: johnwilger@gmail.com
 executables: []
@@ -202,6 +216,7 @@ files:
 - lib/kookaburra/exceptions.rb
 - lib/kookaburra/given_driver.rb
 - lib/kookaburra/json_api_driver.rb
+- lib/kookaburra/null_browser.rb
 - lib/kookaburra/rack_driver.rb
 - lib/kookaburra/test_data.rb
 - lib/kookaburra/test_helpers.rb
@@ -209,6 +224,7 @@ files:
 - lib/kookaburra/ui_driver/ui_component.rb
 - lib/kookaburra/utils/active_record_shared_connection.rb
 - spec/kookaburra/json_api_driver_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