druid-ts 1.1.8 → 1.2.0

data/lib/druid/assist.rb

@@ -81,10 +81,6 @@ module Druid
       process_call("radio(identifier).set", Elements::RadioButton, identifier)
     end
 
-    def clear_radio identifier
-      process_call("radio(identifier).clear", Elements::RadioButton, identifier)
-    end
-
     def radio_selected? identifier
       process_call("radio(identifier).set?", Elements::RadioButton, identifier)
     end
@@ -508,6 +504,38 @@ module Druid
       find_elements("element(identifier)", Elements::Element, identifier)
     end
 
+    #
+    # method to retrieve the text for a b
+    #
+    def b_text_for(identifier)
+      process_call("b(identifier).text", Elements::Bold, identifier, nil, 'b')
+    end
+
+    def b_for(identifier)
+      find_element("b(identifier)", Elements::Bold, identifier, 'b')
+    end
+
+    #
+    # method to retrieve all b elements
+    #
+    def bs_for(identifier)
+      find_elements("bs(identifier)", Elements::Bold, identifier, 'b')
+    end
+
+    #
+    # method to return a Druid rooted at an element
+    #
+    def page_for(identifier, section_class)
+      find_page(identifier, section_class)
+    end
+
+    #
+    # method to return a collection of Druids rooted at elements
+    #
+    def pages_for(identifier, section_class)
+      SectionCollection.new(find_pages(identifier, section_class))
+    end
+
     private
 
     def find_elements(the_call, type, identifier, tag_name=nil)
@@ -524,6 +552,20 @@ module Druid
       type.new(element)
     end
 
+    def find_pages(identifier, section_class)
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::Element, 'element')
+      elements = driver.instance_eval "#{nested_frames(frame_identifiers)}elements(identifier)"
+      switch_to_default_content(frame_identifiers)
+      elements.map { |element| section_class.new(element) }
+    end
+
+    def find_page(identifier, section_class)
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::Element, 'element')
+      element = driver.instance_eval "#{nested_frames(frame_identifiers)}element(identifier)"
+      switch_to_default_content(frame_identifiers)
+      section_class.new(element)
+    end
+
     def process_call(the_call, type, identifier, value=nil, tag_name=nil)
       identifier, frame_identifiers = parse_identifiers(identifier, type, tag_name)
       value = driver.instance_eval "#{nested_frames(frame_identifiers)}#{the_call}"

data/lib/druid/elements.rb

@@ -51,3 +51,4 @@ require 'druid/elements/canvas'
 require 'druid/elements/media'
 require 'druid/elements/audio'
 require 'druid/elements/video'
+require 'druid/elements/bold'

data/lib/druid/elements/bold.rb

@@ -0,0 +1,8 @@
+module Druid
+  module Elements
+    class Bold < Element
+
+    end
+    Druid::Elements.tag_to_class[:b] = Druid::Elements::Bold
+  end
+end

data/lib/druid/elements/element.rb

@@ -1,3 +1,5 @@
+require 'watir-webdriver'
+require 'watir-webdriver/extensions/select_text'
 require 'druid/nested_elements'
 require 'druid/assist'
 module Druid
@@ -88,6 +90,13 @@ module Druid
         element.attribute_value attribute_name
       end
 
+      #
+      # retrieve the class name for an element
+      #
+      def class_name
+        element.class_name
+      end
+
       #
       # Click this element
       #
@@ -153,6 +162,10 @@ module Druid
         element.focus
       end
 
+      def select_text text
+        element.select_text text
+      end
+
       #
       # get the id of element
       #
@@ -280,7 +293,7 @@ module Druid
       protected
 
       def self.have_to_build_xpath(identifier)
-        ['table', 'span', 'div', 'td', 'li', 'ol', 'ul', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'label', 'area', 'canvas', 'audio', 'video'].include? identifier[:tag_name] and identifier[:name]
+        ['table', 'span', 'div', 'td', 'li', 'ol', 'ul', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'label', 'area', 'canvas', 'audio', 'video','b'].include? identifier[:tag_name] and identifier[:name]
       end
 
       def self.build_xpath_for identifier
@@ -295,14 +308,14 @@ module Druid
           end
           xpath = ".//button"
           xpath << "[#{attribute_expression(btn_ident)}]" unless btn_ident.empty?
-          xpath << "[#{idx+1}]" if idx
+          xpath = "(#{xpath})[#{idx+1}]" if idx
           identifier[:type] = %w[button reset submit image]
           xpath << " | .//input"
         else
           xpath = ".//#{tag_locator}"
         end
         xpath << "[#{attribute_expression(identifier)}]" unless identifier.empty?
-        xpath << "[#{idx+1}]" if idx
+        xpath = "(#{xpath})[#{idx+1}]" if idx
         xpath
       end
 

data/lib/druid/elements/link.rb

@@ -2,6 +2,13 @@ module Druid
   module Elements
     class Link < Element
 
+      #
+      # return the href fot the link
+      #
+      def href
+        element.href
+      end
+
       protected
 
       def self.finders

data/lib/druid/elements/radio_button.rb

@@ -12,13 +12,6 @@ module Druid
         element.set
       end
 
-      #
-      # Clear the RadioButton
-      #
-      def clear
-        element.clear
-      end
-
       #
       # Return if it is selected
       #

data/lib/druid/elements/select_list.rb

@@ -7,11 +7,11 @@ module Druid
       end
 
       def [](idx)
-        Druid::Elements::Option.new(options[idx])
+        options[idx]
       end
 
       def options
-        element.options
+        element.options.map { |e| Druid::Elements::Option.new(e)}
       end
 
       #

data/lib/druid/elements/table.rb

@@ -45,6 +45,13 @@ module Druid
         self[-1]
       end
 
+      #
+      # return the table as hashes
+      #
+      def hashes
+        element.hashes
+      end
+
       private
 
       def find_index_by_title(row_title)

data/lib/druid/javascript/angularjs.rb

@@ -0,0 +1,12 @@
+module Druid
+  module Javascript
+    module AngularJS
+      #
+      # return the number of pending ajax requests
+      #
+      def self.pending_requests
+        'return angular.element(document.body).injector().get(\'$http\').pendingRequests.length;'
+      end
+    end
+  end
+end

data/lib/druid/javascript_framework_facade.rb

@@ -1,6 +1,7 @@
 require 'druid/javascript/jquery'
 require 'druid/javascript/prototype'
 require 'druid/javascript/yui'
+require 'druid/javascript/angularjs'
 
 module Druid
   #
@@ -18,8 +19,8 @@ module Druid
       #
       # Set the framework to use
       #
-      # @param [Symbol] the framework to use. :jquery and :prototype
-      # are supported
+      # @param [Symbol] the framework to use. :jquery and :prototype, :yui,
+      # and :angularjs are supported
       #
       def framework=(framework)
         initialize_script_builder unless @builder
@@ -58,7 +59,8 @@ module Druid
         @builder = {
           :jquery => Druid::Javascript::JQuery,
           :prototype => Druid::Javascript::Prototype,
-          :yui => Druid::Javascript::YUI
+          :yui => Druid::Javascript::YUI,
+          :angularjs => Druid::Javascript::AngularJS
         }
       end
 

data/lib/druid/locator_generator.rb

@@ -100,6 +100,7 @@ module Druid
                          :canvas,
                          :audio,
                          :video,
+                         :b,
                          :svg]
 
     def self.generate_locators(target)

data/lib/druid/page_factory.rb

@@ -64,6 +64,7 @@ module Druid
     #
     def on_page(page_class, params={:using_params => {}}, visit=false, &block)
       page_class = class_from_string(page_class) if page_class.is_a? String
+      return super(page_class, params, visit, &block) unless page_class.ancestors.include? Druid
       merged = page_class.params.merge(params[:using_params])
       page_class.instance_variable_set("@merged_params", merged) unless merged.empty?
       @current_page = page_class.new(@driver, visit)

data/lib/druid/page_populator.rb

@@ -31,6 +31,7 @@ module Druid
     def populate_page_with(data)
       data.each do |key, value|
         populate_checkbox(key, value) if is_checkbox?(key) and is_enabled?(key)
+        populate_radiobuttongroup(key, value) if is_radiobuttongroup?(key)
         populate_radiobutton(key, value) if is_radiobutton?(key) and is_enabled?(key)
         populate_text(key, value) if is_text?(key) and is_enabled?(key)
       end
@@ -49,7 +50,10 @@ module Druid
 
     def populate_radiobutton(key, value)
       return self.send "select_#{key}" if value
-      return self.send "clear_#{key}"
+    end
+
+    def populate_radiobuttongroup(key, value)
+      return self.send "select_#{key}", value
     end
 
     def is_text?(key)
@@ -64,7 +68,12 @@ module Druid
       respond_to?("select_#{key}".to_sym)
     end
 
+    def is_radiobuttongroup?(key)
+      respond_to?("select_#{key}".to_sym) and respond_to?("#{key}_values")
+    end
+
     def is_enabled?(key)
+      return false if is_radiobuttongroup?(key)
       return true if (self.send "#{key}_element").tag_name == "textarea"
       element = self.send("#{key}_element")
       element.enabled? and element.visible?

data/lib/druid/sections.rb

@@ -0,0 +1,29 @@
+module Druid
+  class SectionCollection
+    include Enumerable
+
+    def initialize sections
+      @sections = sections
+    end
+
+    def each &block
+      @sections.each &block
+    end
+
+    def [] index
+      @sections[index]
+    end
+
+    def find_by values_hash
+      @sections.find { |section|
+        values_hash.all? { |key, value| value === section.public_send(key) }
+      }
+    end
+
+    def select_by values_hash
+      SectionCollection.new @sections.select { |section|
+        values_hash.all? { |key, value| value === section.public_send(key) }
+      }
+    end
+  end
+end

data/lib/druid/version.rb

@@ -1,3 +1,3 @@
 module Druid
-  VERSION = "1.1.8"
+  VERSION = "1.2.0"
 end

data/spec/druid/accessors_spec.rb

@@ -1,5 +1,11 @@
 require 'spec_helper'
 
+class GenericPage
+  include Druid
+
+  wait_for_expected_title 'expected title'
+end
+
 class AccessorsTestDruid
   include Druid
 
@@ -15,7 +21,7 @@ class AccessorsTestDruid
   div(:message, :id => 'message_id')
   table(:cart, :id => 'cart_id')
   cell(:total, :id => 'total')
-  span(:alert, :id => 'alert_id')
+  span(:alert_span, :id => 'alert_id')
   image(:logo, :id => 'logo')
   hidden_field(:social_security_number, :id => 'ssn')
   form(:login, :id => 'login')
@@ -35,6 +41,7 @@ class AccessorsTestDruid
   canvas(:my_canvas, :id => 'canvas_id')
   audio(:acdc, :id => 'audio_id')
   video(:movie, :id => 'video_id')
+  b(:bold, :id => 'bold')
 end
 
 class BlockDruid
@@ -67,7 +74,7 @@ class BlockDruid
   div :footer do |element|
     "div"
   end
-  span :alert do |element|
+  span :alert_span do |element|
     "span"
   end
   table :cart do |element|
@@ -127,6 +134,9 @@ class BlockDruid
   video :movie do |element|
     "video"
   end
+  b :bold do |element|
+    "b"
+  end
 end
 
 class TestDruidBackUp
@@ -172,6 +182,10 @@ describe Druid::Accessors do
       expect(driver).not_to receive(:goto)
       TestDruidBackUp.new(driver,true)
     end
+
+    it "should provide the page url" do
+      expect(druid.page_url_value).to eql "http://apple.com"
+    end
   end
 
   describe "validating the page title" do
@@ -562,7 +576,6 @@ describe Druid::Accessors do
         expect(druid).to respond_to :first_element
         expect(druid).to respond_to :select_first
         expect(druid).to respond_to :first_selected?
-        expect(druid).to respond_to :clear_first
       end
 
       it "should call a block on the element method when present" do
@@ -576,11 +589,6 @@ describe Druid::Accessors do
         druid.select_first
       end
 
-      it "should clear a radio button" do
-        expect(driver).to receive_message_chain(:radio, :clear)
-        druid.clear_first
-      end
-
       it "should determine if a radio is selected" do
         expect(driver).to receive_message_chain(:radio, :set?).and_return(true)
         expect(druid.first_selected?).to be true
@@ -665,24 +673,24 @@ describe Druid::Accessors do
   describe "span accessors" do
     context "when called on a page object" do
       it "should generate accessor methods" do
-        expect(druid).to respond_to :alert
-        expect(druid).to respond_to :alert_element
+        expect(druid).to respond_to :alert_span
+        expect(druid).to respond_to :alert_span_element
       end
 
       it "should call a block on the element method when present" do
-        expect(block_druid.alert_element).to eql "span"
+        expect(block_druid.alert_span_element).to eql "span"
       end
     end
 
     context "implementation" do
       it "should retrieve the text from a span" do
         expect(driver).to receive_message_chain(:span, :text).and_return('Alert')
-        expect(druid.alert).to eql 'Alert'
+        expect(druid.alert_span).to eql 'Alert'
       end
 
       it "should retrieve the span element from the page" do
         expect(driver).to receive(:span)
-        expect(druid.alert_element).to be_instance_of Druid::Elements::Span
+        expect(druid.alert_span_element).to be_instance_of Druid::Elements::Span
       end
     end
   end
@@ -1112,4 +1120,62 @@ describe Druid::Accessors do
       end
     end
   end
+
+  describe "b accessors" do
+    context "when called on a page object" do
+      it "should generate accessor methods" do
+        expect(druid).to respond_to(:bold)
+        expect(druid).to respond_to(:bold_element)
+        expect(druid).to respond_to(:bold?)
+      end
+
+      it "should call a block on the element method when present" do
+        expect(block_druid.bold_element).to eql "b"
+      end
+    end
+
+    it "should retrieve the text from the b" do
+      expect(driver).to receive(:b).and_return(driver)
+      expect(driver).to receive(:text).and_return("value")
+      expect(druid.bold).to eql "value"
+    end
+
+    it "should retrieve the element from the page" do
+      expect(driver).to receive(:b).and_return(driver)
+      element = druid.bold_element
+      expect(element).to be_instance_of Druid::Elements::Bold
+    end
+  end
+end
+
+describe "accessors" do
+  let(:driver) { mock_driver }
+  let(:page) { GenericPage.new driver}
+
+  context '#wait_for_expected_title' do
+    before(:each) do
+      allow(driver).to receive(:wait_until).and_yield
+    end
+
+    it "true if already there" do
+      allow(driver).to receive(:title).and_return 'expected title'
+      expect(page.wait_for_expected_title?).to be_truthy
+    end
+
+    it "does not wait if it already is there" do
+      allow(driver).to receive(:title).and_return 'expected title'
+      expect(driver).to_not receive(:wait_until)
+      expect(page.wait_for_expected_title?).to be_truthy
+    end
+
+    it "errors when it does not match" do
+      allow(driver).to receive(:title).and_return 'wrong title'
+      expect { page.wait_for_expected_title? }.to raise_error "Expected title 'expected title' instead of 'wrong title'"
+    end
+
+    it 'pick up when the title changes' do
+      allow(driver).to receive(:title).and_return 'wrong title', 'expected title'
+      expect(page.wait_for_expected_title?).to be_truthy
+    end
+  end
 end