kookaburra 0.15.1 → 0.16.0

data/VERSION

@@ -1 +1 @@
-0.15.1
+0.16.0

data/kookaburra.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "kookaburra"
-  s.version = "0.15.1"
+  s.version = "0.16.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Wilger", "Sam Livingston-Gray"]

data/lib/kookaburra/ui_driver/ui_component.rb

@@ -58,12 +58,9 @@ class Kookaburra
     #   end
     #
     # Note that the "browser operation" methods such as `#fill_in` and
-    # `#click_button` are forwarded to the {#element} object (see
-    # {#method_missing}) and are therefore automatically scoped to the
-    # component's DOM element. Although it is possible to reach outside this
-    # scope by calling methods on {#browser} (e.g. `browser.click_on "Foo"`),
-    # this should be avoided, because you'll end up with a tangled mess of
-    # UIComponents without clear responsibilities. 
+    # `#click_button` are forwarded to the {#browser} object (see
+    # {#method_missing}) and are automatically scoped to the component's DOM
+    # element.    
     #
     # @abstract Subclass and implement (at least) {#component_locator}. Unless
     #   you override the default implementation of {#show}, you must also
@@ -85,14 +82,14 @@ class Kookaburra
       end
 
       # If the UIComponent is sent a message it does not understand, it will
-      # forward that message on to its {#element}. This provides convenient
+      # forward that message on to its {#browser}. This provides convenient
       # access to the browser driver's DSL, automatically scoped to this
       # component.
-      #
-      # @raise [Kookaburra::ComponentNotFound] raised from {#element}
       def method_missing(name, *args, &block)
-        if element.respond_to?(name)
-          element.send(name, *args, &block)
+        if respond_to?(name)
+          browser.within(component_locator) do
+            browser.send(name, *args, &block)
+          end
         else
           super
         end
@@ -101,7 +98,7 @@ class Kookaburra
       # @private
       # Behaves as you might expect given #method_missing
       def respond_to?(name)
-        super || element.respond_to?(name)
+        super || browser.respond_to?(name)
       end
 
       # Causes the UIComponent to be visible.
@@ -128,18 +125,17 @@ class Kookaburra
       # Is the component's element found on the page and is it considered
       # "visible" by the browser driver.
       def visible?
-        element.visible?
-      rescue ComponentNotFound
-        false
+        visible = browser.has_css?(component_locator, :visible)
+        unless visible
+          detect_server_error!
+        end
+        visible
       end
 
       protected
 
       # This is the browser driver with which the UIComponent was initialized.
       #
-      # You almost certainly want to reference {#element} instead, as it is
-      # scoped to this component's DOM element, whereas #browser is not scoped.
-      #
       # @attribute [r] browser
       #
       # @raise [RuntimeError] if no browser was specified in call to {#initialize}
@@ -183,22 +179,6 @@ class Kookaburra
           raise UnexpectedResponse, "Your server error detection function detected a server error. Looks like your applications is busted. :-("
         end
       end
-
-      # Provides access to the element found by the browser driver at
-      # {#component_locator}. If your browser driver is a `Capybara::Session`,
-      # then this will be a `Capybara::Node::Element`.
-      #
-      # @raise [UnexpectedResponse] from {#detect_server_error!}
-      # @raise [ComponentNotFound] if the {#component_locator} is not found in
-      #   the DOM
-      def element
-        detect_server_error!
-        begin
-          browser.find(component_locator)
-        rescue StandardError => e
-          raise ComponentNotFound, e.message
-        end
-      end
     end
   end
 end

data/spec/kookaburra/ui_driver/ui_component_spec.rb

@@ -46,36 +46,82 @@ describe Kookaburra::UIDriver::UIComponent do
       component.respond_to?(:foo).should == true
     end
 
-    it 'returns true if the #element defines the specified method' do
-      element = stub('An Element', :respond_to? => true)
+    it 'returns true if the #browser defines the specified method' do
+      browser = stub('Browser Driver', :respond_to? => true)
       component = component_class.new
-      component.stub!(:element => element)
+      component.stub!(:browser => browser)
       component.respond_to?(:a_very_unlikely_method_name).should == true
     end
 
-    it 'returns false if neither the UIComponent nor the #element define the specified method' do
-      element = stub('An Element', :respond_to? => false)
+    it 'returns false if neither the UIComponent nor the #browser define the specified method' do
+      browser = stub('Browser Driver', :respond_to? => false)
       component = component_class.new
-      component.stub!(:element => element)
+      component.stub!(:browser => browser)
       component.respond_to?(:a_very_unlikely_method_name).should == false
     end
   end
 
   describe '#method_missing' do
-    it 'forwards method calls to #element' do
-      element = mock('An Element')
-      element.should_receive(:some_method) do |arg1, arg2, &block|
-        arg1.should == :a
-        arg2.should == :b
-        block.call.should == :c
-        :d
+    context 'the component says it responds to the method' do
+      it 'scopes the method call within the component_locator and forwards to #browser' do
+        browser = mock('Browser Driver')
+        browser.should_receive(:some_browser_method) \
+          .with(:arguments) \
+          .and_return(:answer_from_browser)
+        browser.should_receive(:within) do |scope, &block|
+          scope.should == '#my_component'
+          block.call(browser)
+        end
+        component = Kookaburra::UIDriver::UIComponent.new(:browser => browser)
+        component.stub!(:component_locator => '#my_component')
+        component.some_browser_method(:arguments).should == :answer_from_browser
       end
-      component = Kookaburra::UIDriver::UIComponent.new
-      component.stub!(:element => element)
-      result = component.some_method(:a, :b) do
-        :c
+    end
+
+    context 'the component says it does not respond to the method' do
+      it 'raises a NoMethodError' do
+        component = Kookaburra::UIDriver::UIComponent.new
+        component.stub!(:respond_to? => false)
+        lambda { component.no_such_method } \
+          .should raise_error(NoMethodError)
       end
-      result.should == :d
+    end
+  end
+
+  describe '#visible?' do
+    it 'returns true if the component_locator is found in the DOM and is visible' do
+      browser = mock('Browser Driver')
+      browser.should_receive(:has_css?) \
+        .with('#my_component', :visible) \
+        .and_return(true)
+      component = Kookaburra::UIDriver::UIComponent.new(:browser => browser)
+      component.stub!(:component_locator => '#my_component')
+      component.visible?.should == true
+    end
+
+    it 'returns false if the component_locator id not found in the DOM' do
+      browser = stub('Browser Driver', :has_css? => false)
+      component = Kookaburra::UIDriver::UIComponent.new(
+        :browser => browser,
+        :server_error_detection => lambda { |browser|
+          false
+        }
+      )
+      component.stub!(:component_locator => '#my_component')
+      component.visible?.should == false
+    end
+
+    it 'raises UnexpectedResponse if the component_locator is not found and a server error is detected' do
+      browser = stub('Browser Driver', :has_css? => false)
+      component = Kookaburra::UIDriver::UIComponent.new(
+        :browser => browser,
+        :server_error_detection => lambda { |browser|
+          true
+        }
+      )
+      component.stub!(:component_locator => '#my_component')
+      lambda { component.visible? } \
+        .should raise_error(Kookaburra::UnexpectedResponse)
     end
   end
 
@@ -112,67 +158,5 @@ describe Kookaburra::UIDriver::UIComponent do
     it_behaves_like :it_has_a_dependency_accessor, :browser do
       let(:subject_class) { Kookaburra::UIDriver::UIComponent }
     end
-
-    describe '#element' do
-      it 'passes the browser object to the server error detection function' do
-        browser = stub('Browser', :find => :an_element)
-        server_error_detection = lambda { |b|
-          b.should === browser
-          false
-        }
-        component = Kookaburra::UIDriver::UIComponent.new(:browser => browser,
-                                                          :server_error_detection => server_error_detection)
-        component.stub!(:component_locator => '#my_component')
-        component.send(:element)
-      end
-
-      shared_examples_for :server_error_detection_passed do
-        it 'returns the element node if the component_locator is found on the page' do
-          browser = mock('Browser')
-          browser.should_receive(:find).with('#my_component').and_return(:the_element_node)
-          component = Kookaburra::UIDriver::UIComponent.new(
-            :browser => browser,
-            :server_error_detection => server_error_detection)
-          component.stub!(:component_locator => '#my_component')
-          component.send(:element).should == :the_element_node
-        end
-
-        it 'raises Kookaburra::ComponentNotFound if the component_locator is not found on the page' do
-          browser = mock('Browser')
-          browser.should_receive(:find).with('#my_component').and_raise(StandardError)
-          component = Kookaburra::UIDriver::UIComponent.new(
-            :browser => browser,
-            :server_error_detection => server_error_detection)
-          component.stub!(:component_locator => '#my_component')
-          lambda { component.send(:element) } \
-            .should raise_error(Kookaburra::ComponentNotFound)
-        end
-      end
-
-      context 'no server error detection function is specified' do
-        let(:server_error_detection) { nil }
-        it_behaves_like :server_error_detection_passed
-      end
-
-      context 'no server error is detected' do
-        let(:server_error_detection) do
-          lambda { |b| false }
-        end
-
-        it_behaves_like :server_error_detection_passed
-      end
-
-      context 'a server error is detected' do
-        it 'raises a Kookaburra::UnexpectedResponse exception' do
-          server_error_detection = lambda { |b| true }
-          browser = stub('Browser')
-          component = Kookaburra::UIDriver::UIComponent.new(
-            :browser => browser,
-            :server_error_detection => server_error_detection)
-          lambda { component.send(:element) } \
-            .should raise_error(Kookaburra::UnexpectedResponse, "Your server error detection function detected a server error. Looks like your applications is busted. :-(")
-        end
-      end
-    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kookaburra
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 95
   prerelease: 
   segments: 
   - 0
-  - 15
-  - 1
-  version: 0.15.1
+  - 16
+  - 0
+  version: 0.16.0
 platform: ruby
 authors: 
 - John Wilger