kookaburra 0.12.0 → 0.13.0

data/README.markdown

@@ -177,15 +177,15 @@ might look:
     end
 
     Then "I see my order summary" do
-      ui.order_summary.should be_visible
+      ui.should be_displaying_order_summary
     end
 
     Then "I see that my default payment options will be used" do
-      ui.order_summary.payment_options.should be_account_default_options
+      ui.should be_displaying_account_default_payment_options_in_order_summary
     end
 
     Then "I see that my default shipping options will be used" do
-      ui.order_summary.shipping_options.should be_account_default_options
+      ui.should be_displaying_account_default_shipping_options_in_order_summary
     end
 
 The step definitions contain neither explicitly shared state (instance
@@ -199,11 +199,11 @@ scenario, it's not a big deal to have the following in your step definitions (as
 long as the author of the spec confirms that they really mean the same thing):
 
     Then "I see my order summary" do
-      ui.order_summary.should be_visible
+      ui.should be_displaying_order_summary
     end
 
     Then "I see a summary of my order" do
-      ui.order_summary.should be_visible
+      ui.should be_displaying_order_summary
     end
 
 The step definitions are nothing more than a natural language reference to an
@@ -234,8 +234,8 @@ Using RSpec, the test implementation would be as follows:
         ui.choose_to_check_out
 
         ui.order_summary.should be_visible
-        ui.order_summary.payment_options.should be_account_default_options
-        ui.order_summary.shipping_options.should be_account_default_options
+        ui.should be_displaying_account_default_payment_options_in_order_summary
+        ui.should be_displaying_account_default_shipping_options_in_order_summary
       end
     end
 
@@ -371,7 +371,7 @@ within your subclass:
 
     class MyApplication::Kookaburra::UIDriver < Kookaburra::UIDriver
       # makes an instance of MyApplication::Kookaburra::UIDriver::SignInScreen
-      # available via the instance method #sign_in_screen
+      # available via the private instance method #sign_in_screen
       ui_component :sign_in_screen
 
       def sign_in(account_nickname)
@@ -381,6 +381,12 @@ within your subclass:
       end
     end
 
+The call to `Kookaburra::UIDriver.ui_component` defines the UIComponent accessor
+as a private method in order to discourage accessing your UIComponent objects
+directly in the test implementation layer. Instead, you should build out your
+testing DSL in the `UIDriver` subclass as was done with the `#sign_in` method
+above.
+
 ### The Window Driver Layer ###
 
 While your `GivenDriver` and `UIDriver` provide a DSL that represents actions
@@ -430,6 +436,43 @@ You describe the various user interface components by sub-classing
       end
     end
 
+A `UIComponent` subclass can also contain nested components of its own. For
+instance:
+
+    class MyApplication::Kookaburra::UIDriver::UserList::NewUserForm < Kookaburra::UIDriver::UIComponent
+      component_locator '#new_user_form'
+    end
+
+    class MyApplication::Kookaburra::UIDriver::UserList < Kookaburra::UIDriver::UIComponent
+      component_locator '#user_list'
+
+      ui_component :new_user_form
+    end
+
+In this case, `UserList#new_user_form` is still defined as a private method. In
+order to manipulate it from your domain driver, you can define either explicit
+methods or delegators on `UserList`:
+
+    class MyApplication::Kookaburra::UIDriver::UserList < Kookaburra::UIDriver::UIComponent
+      def fill_in_new_user_form(username, password, full_name)
+        new_user_form.username = username
+        new_user_form.password = password
+        new_user_form.full_name = full_name
+      end
+
+      delegate :submit!, :to => :new_user_form, :prefix => true
+    end
+
+    class MyApplication::Kookaburra::UIDriver < Kookaburra::UIDriver
+      ui_component :user_list
+
+      def create_new_user_with_valid_data
+        user = default_user_data # factory method defined elsewhere
+        user_list.fill_in_new_user_form(user[:username], user[:password], user[:full_name])
+        user_list.new_user_form_submit!
+      end
+    end
+
 ### The Application Driver Layer ###
 
 `Kookaburra::APIDriver`, `Kookaburra::UIDriver` and

data/VERSION

@@ -1 +1 @@
-0.12.0
+0.13.0

data/kookaburra.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "kookaburra"
-  s.version = "0.12.0"
+  s.version = "0.13.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Renewable Funding, LLC"]
-  s.date = "2012-01-28"
+  s.date = "2012-01-29"
   s.description = "Cucumber + Capybara = Kookaburra? It made sense at the time."
   s.email = "devteam@renewfund.com"
   s.extra_rdoc_files = [
@@ -35,7 +35,6 @@ Gem::Specification.new do |s|
     "lib/kookaburra/ui_driver.rb",
     "lib/kookaburra/ui_driver/mixins/has_browser.rb",
     "lib/kookaburra/ui_driver/mixins/has_strategies.rb",
-    "lib/kookaburra/ui_driver/mixins/has_subcomponents.rb",
     "lib/kookaburra/ui_driver/mixins/has_ui_component.rb",
     "lib/kookaburra/ui_driver/ui_component.rb",
     "test/helper.rb",

data/lib/kookaburra/ui_driver/mixins/has_ui_component.rb

@@ -15,6 +15,7 @@ module Kookaburra
             # TODO: memoize the following line?
             component_class(component_name).new(options)
           end
+          private component_name
 
           define_method("has_#{component_name}?") do
             send(component_name).visible?

data/lib/kookaburra/ui_driver/ui_component.rb

@@ -1,6 +1,5 @@
 require 'kookaburra/ui_driver/mixins/has_browser'
 require 'kookaburra/ui_driver/mixins/has_strategies'
-require 'kookaburra/ui_driver/mixins/has_subcomponents'
 require 'kookaburra/ui_driver/mixins/has_ui_component'
 
 module Kookaburra
@@ -10,7 +9,6 @@ module Kookaburra
       include HasBrowser
       include HasStrategies
       include HasUIComponent
-      extend HasSubcomponents
 
       ##### Class macros #####
       def self.component_locator(locator)

data/test/kookaburra/ui_driver/ui_component_test.rb

@@ -3,12 +3,26 @@ require 'minitest/mock'
 
 describe Kookaburra::UIDriver::UIComponent do
   it 'can have nested UIComponents' do
-    InnerComponent = Class.new(Kookaburra::UIDriver::UIComponent)
+    InnerComponentA = Class.new(Kookaburra::UIDriver::UIComponent) do
+      def visible?
+        true
+      end
+    end
+
+    InnerComponentB = Class.new(Kookaburra::UIDriver::UIComponent) do
+      def visible?
+        false
+      end
+    end
+
     OuterComponent = Class.new(Kookaburra::UIDriver::UIComponent) do
-      ui_component :inner_component
+      ui_component :inner_component_a
+      ui_component :inner_component_b
     end
+
     component = OuterComponent.new(:browser => Object.new)
-    assert_kind_of InnerComponent, component.inner_component
+    assert_equal true, component.has_inner_component_a?
+    assert_equal false, component.has_inner_component_b?
   end
 
   let(:component_class) do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kookaburra
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 43
   prerelease: 
   segments: 
   - 0
-  - 12
+  - 13
   - 0
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors: 
 - Renewable Funding, LLC
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-28 00:00:00 Z
+date: 2012-01-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -187,7 +187,6 @@ files:
 - lib/kookaburra/ui_driver.rb
 - lib/kookaburra/ui_driver/mixins/has_browser.rb
 - lib/kookaburra/ui_driver/mixins/has_strategies.rb
-- lib/kookaburra/ui_driver/mixins/has_subcomponents.rb
 - lib/kookaburra/ui_driver/mixins/has_ui_component.rb
 - lib/kookaburra/ui_driver/ui_component.rb
 - test/helper.rb

data/lib/kookaburra/ui_driver/mixins/has_subcomponents.rb

@@ -1,10 +0,0 @@
-module Kookaburra
-  class UIDriver
-    module HasSubcomponents
-      # Nothing to see here, really -- this just gives us a way to logically group subsections in a file
-      def subcomponent(name, &proc)
-        class_eval &proc
-      end
-    end
-  end
-end