druid-ts 1.1.1 → 1.1.2

data/lib/druid/elements/element.rb

@@ -119,6 +119,12 @@ module Druid
         element.enabled?
       end
 
+      #
+      # return true if the element is not enabled
+      def disabled?
+        not enabled?
+      end
+
       def visible?
         element.visible?
       end
@@ -279,7 +285,7 @@ module Druid
       # delegate calls to driver element
       def method_missing(m, *args, &block)
         puts "*** DEPRECATION WARNING"
-        puts "*** You are calling a method named #{m}."
+        puts "*** You are calling a method named #{m} at #{caller[0]}."
         puts "*** This method does not exist in druid so it is being passed to the driver."
         puts "*** This feature will be removed in the near future."
         puts "*** Please change your code to call the correct druid method."

data/lib/druid/elements/ordered_list.rb

@@ -8,12 +8,11 @@ module Druid
       end
 
       def [](idx)
-        li = element.li(:xpath, ".//li[#{idx+1}]")
-        Druid::Elements::ListItem.new(li)
+        Druid::Elements::ListItem.new(children[idx])
       end
 
       def items
-        element.lis.size
+        children.size
       end
 
       def each
@@ -22,6 +21,22 @@ module Druid
         end
       end
 
+      protected
+
+      def child_xpath
+        ".//child::li"
+      end
+
+      private
+
+      def children
+        list_items.find_all { |item| item.parent == element }
+      end
+
+      def list_items
+        element.ols(:xpath => child_xpath)
+      end
+
     end
 
     Druid::Elements.tag_to_class[:ol] = Druid::Elements::OrderedList

data/lib/druid/elements/select_list.rb

@@ -20,6 +20,30 @@ module Druid
       def select(value)
         element.select(value)
       end
+
+      #
+      # @return [Array<sTRING>] An array of strings representing the text value of the currently selected options.
+      #
+      def selected_options
+        element.selected_options.map { |e| e.text }.compact
+      end
+
+      #
+      # Returns true if the select list has one or more options where text or label matches the given value.
+      #
+      # @param [String, Regexp] value A value
+      # @return [Boolean]
+      def include? value
+        element.include? value
+      end
+
+      #
+      # Returns true if any of the selected options' text or label match the given value.
+      # @param [String, Regexp] value A value
+      # @return [Boolean]
+      def selected? value
+        element.selected? value
+      end
     end
 
     Druid::Elements.tag_to_class[:select] = Druid::Elements::SelectList

data/lib/druid/elements/text_area.rb

@@ -14,7 +14,7 @@ module Druid
       # Set the value of the TextArea
       #
       def value=(new_value)
-        element.send_keys(new_value)
+        element.set(new_value)
       end
 
     end

data/lib/druid/elements/text_field.rb

@@ -12,6 +12,10 @@ module Druid
       def value=(new_value)
         element.set(new_value)
       end
+
+      def append text
+        element.send_keys text
+      end
     end
 
     Druid::Elements.type_to_class[:text] = Druid::Elements::TextField

data/lib/druid/elements/unordered_list.rb

@@ -7,12 +7,11 @@ module Druid
       end
 
       def [](idx)
-        li = element.li(:xpath,".//li[#{idx+1}]")
-        Druid::Elements::ListItem.new(li)
+        Druid::Elements::ListItem.new(children[idx])
       end
 
       def items
-        element.lis.size
+        children.size
       end
 
       def each
@@ -20,6 +19,22 @@ module Druid
           yield self[index-1]
         end
       end
+
+      protected
+
+      def child_xpath
+        ".//child::li"
+      end
+
+      private
+
+      def children
+        list_items.find_all { |item| item.parent == element}
+      end
+
+      def list_items
+        element.uls(:xpath => child_xpath)
+      end
     end
 
     Druid::Elements.tag_to_class[:ul] = Druid::Elements::UnOrderedList

data/lib/druid/javascript/jquery.rb

@@ -0,0 +1,12 @@
+module Druid
+  module Javascript
+    module JQuery
+      #
+      # return the number of pending ajax requests
+      #
+      def self.pending_requests
+        'return jQuery.active'
+      end
+    end
+  end
+end

data/lib/druid/javascript/prototype.rb

@@ -0,0 +1,12 @@
+module Druid
+  module Javascript
+    module Prototype
+      #
+      # return the number of pending ajax requests
+      #
+      def self.pending_requests
+        'return Ajax.activeRequestCount'
+      end
+    end
+  end
+end

data/lib/druid/javascript_framework_facade.rb

@@ -0,0 +1,72 @@
+require 'druid/javascript/jquery'
+require 'druid/javascript/prototype'
+
+module Druid
+  #
+  # Provide hooks into different common Javascript Frameworks.
+  # Currently this module only supports jQuery and Prototype but it
+  # has ability for you to plug your own framework into it and
+  # therefore have it work with this gem. You do this by calling the
+  # #add_framework method. The module you provide must implement the
+  # necessary methods. Please look at the jQuery or Prototype
+  # implementations to determine the necessary methods
+  #
+  module JavascriptFrameworkFacade
+
+    class << self
+      #
+      # Set the framework to use
+      #
+      # @param [Symbol] the framework to use. :jquery and :prototype
+      # are supported
+      #
+      def framework=(framework)
+        initialize_script_builder unless @builder
+        raise unknown_framework(framework) unless @builder[framework]
+        @framework = framework
+      end
+
+      def add_framework(key, value)
+        raise invalid_framework unless value.respond_to? :pending_requests
+        initialize_script_builder unless @builder
+        @builder[key] = value
+      end
+
+      #
+      # Get the framework that will be used
+      #
+      def framework
+        @framework
+      end
+
+      def script_builder
+        initialize_script_builder unless @builder
+        @builder[@framework]
+      end
+
+      #
+      # get the javascript to determine number of pending requests
+      #
+      def pending_requests
+        script_builder.pending_requests
+      end
+
+      private
+
+      def initialize_script_builder
+        @builder = {
+          :jquery => Druid::Javascript::JQuery,
+          :prototype => Druid::Javascript::Prototype
+        }
+      end
+
+      def unknown_framework(framework)
+        "You specified the Javascript framework #{framework} and it is unknow to the system"
+      end
+
+      def invalid_framework
+        "The Javascript framework you provided does not implement the necessary methods"
+      end
+    end
+  end
+end

data/lib/druid/version.rb

@@ -1,3 +1,3 @@
 module Druid
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/spec/druid/druid_spec.rb

@@ -144,7 +144,8 @@ describe Druid do
       end
 
       it "should know how to clear all of the cookies from the browser" do
-        expect(driver).to receive(:clear_cookies)
+        expect(driver).to receive(:cookies).and_return(driver)
+        expect(driver).to receive(:clear)
         druid.clear_cookies
       end
 
@@ -153,9 +154,23 @@ describe Druid do
         druid.save_screenshot('tim.png')
       end
 
-    end
-  end
+      it "should wait until there are no pending ajax requests" do
+        expect(Druid::JavascriptFrameworkFacade).to receive(:pending_requests).and_return('pending requests')
+        expect(driver).to receive(:execute_script).with('pending requests').and_return(0)
+        druid.wait_for_ajax
+      end
+
+      it "should set the javascript framework" do
+        expect(Druid::JavascriptFrameworkFacade).to receive(:framework=)
+        Druid.javascript_framework = :foo
+      end
 
+      it "should add the javascript framework" do
+        expect(Druid::JavascriptFrameworkFacade).to receive(:add_framework)
+        Druid.add_framework(:foo, :bar)
+      end
 
+    end
+  end
 
 end

data/spec/druid/elements/element_spec.rb

@@ -146,5 +146,10 @@ describe Druid::Elements::Element do
       expect(we).to receive(:focus)
       element.focus
     end
+
+    it "should know if the element is disabled" do
+      expect(we).to receive(:enabled?).and_return(false)
+      expect(element).to be_disabled
+    end
   end
 end

data/spec/druid/elements/ordered_list_spec.rb

@@ -16,13 +16,21 @@ describe Druid::Elements::OrderedList do
     let(:ol) { Druid::Elements::OrderedList.new(element) }
 
     it "should return a list item when indexed" do
-      expect(element).to receive(:li)
-      expect(ol[1]).to be_instance_of Druid::Elements::ListItem
+      allow(element).to receive(:ols).and_return(element)
+      allow(element).to receive(:find_all).and_return([element])
+      allow(element).to receive(:parent).and_return(element)
+      allow(element).to receive(:element).and_return(element)
+      allow(element).to receive(:==).and_return(true)
+      ol[1]
     end
 
     it "should know how many list items it contains" do
-      expect(element).to receive_message_chain(:lis, :size).and_return(2)
-      expect(ol.items).to eql 2
+      allow(element).to receive(:ols).and_return(element)
+      allow(element).to receive(:find_all).and_return([element])
+      allow(element).to receive(:parent).and_return(element)
+      allow(element).to receive(:element).and_return(element)
+      allow(element).to receive(:==).and_return(true)
+      expect(ol.items).to eql 1
     end
 
     it "should iterate over the list items" do

data/spec/druid/elements/select_list_spec.rb

@@ -13,6 +13,7 @@ describe Druid::Elements::SelectList do
 
   describe "interface" do
     let(:element) { double 'element' }
+    let(:opts) { [element, element] }
     let(:select_list) { Druid::Elements::SelectList.new(element) }
 
     it "should return an option when indexed" do
@@ -33,5 +34,21 @@ describe Druid::Elements::SelectList do
     it "should register with tag_name :select" do
       expect(Druid::Elements.element_class_for(:select)).to be Druid::Elements::SelectList
     end
+
+    it "should return an array of selected options" do
+      allow(element).to receive(:selected_options).and_return(opts)
+      allow(element).to receive(:text).and_return(element)
+      expect(select_list.selected_options).to eql opts
+    end
+
+    it "should know if it includes some value" do
+      expect(element).to receive(:include?).with('blah').and_return(true)
+      select_list.include?('blah')
+    end
+
+    it "should know if an option is selected" do
+      expect(element).to receive(:selected?).with("blah").and_return(true)
+      select_list.selected?('blah')
+    end
   end
 end

data/spec/druid/elements/text_area_spec.rb

@@ -20,7 +20,7 @@ describe Druid::Elements::TextArea do
     let(:element) { double "element" }
     let(:text_area) { Druid::Elements::TextArea.new(element) }
     it "should set its' value" do
-      expect(element).to receive(:send_keys).with('test')
+      expect(element).to receive(:set).with('test')
       text_area.value = 'test'
     end
 

data/spec/druid/elements/text_field_spec.rb

@@ -27,5 +27,10 @@ describe Druid::Elements::TextField do
     it "should register with type :password" do
       expect(Druid::Elements.element_class_for(:input, :password)).to be Druid::Elements::TextField
     end
+
+    it "should append text" do
+      expect(element).to receive(:send_keys).with('abc')
+      text_field.append('abc')
+    end
   end
 end

data/spec/druid/elements/unordered_list_spec.rb

@@ -16,13 +16,21 @@ describe Druid::Elements::UnOrderedList do
     let(:ul) { Druid::Elements::UnOrderedList.new(element) }
 
     it "should return a list item when indexed" do
-      expect(element).to receive(:li)
-      expect(ul[1]).to be_instance_of Druid::Elements::ListItem
+      allow(element).to receive(:uls).and_return(element)
+      allow(element).to receive(:find_all).and_return([element])
+      allow(element).to receive(:parent).and_return(element)
+      allow(element).to receive(:element).and_return(element)
+      allow(element).to receive(:==).and_return(true)
+      ul[1]
     end
 
     it "should know how many items it contains" do
-      expect(element).to receive_message_chain(:lis, :size).and_return(3)
-      expect(ul.items).to eql 3
+      allow(element).to receive(:uls).and_return(element)
+      allow(element).to receive(:find_all).and_return([element])
+      allow(element).to receive(:parent).and_return(element)
+      allow(element).to receive(:element).and_return(element)
+      allow(element).to receive(:==).and_return(true)
+      expect(ul.items).to eql 1
     end
 
     it "should know how to iterate over the items" do

data/spec/druid/javascript_framework_facade_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+require 'druid/javascript/jquery'
+
+class TestClass
+  include Druid::JavascriptFrameworkFacade
+end
+
+describe Druid::JavascriptFrameworkFacade do
+  let(:facade) { Druid::JavascriptFrameworkFacade }
+
+  it "should allow the selection of a javascript framework" do
+    facade.framework = :jquery
+    expect(facade.framework).to eql :jquery
+  end
+
+  it "should register the jQuery script builder" do
+    facade.framework = :jquery
+    expect(facade.script_builder).to eql Druid::Javascript::JQuery
+  end
+
+  it "should return script for pending requests in jQuery" do
+    facade.framework = :jquery
+    expect(facade.pending_requests).to eql 'return jQuery.active'
+  end
+
+  it "should register the Prototype script builder" do
+    facade.framework = :prototype
+    expect(facade.script_builder).to eql Druid::Javascript::Prototype
+  end
+
+  it "should return script for pending requests in Prototype" do
+    facade.framework = :prototype
+    expect(facade.pending_requests).to eql "return Ajax.activeRequestCount"
+  end
+
+  it "should not allow you to set the framework to one it does not know about" do
+    expect{ facade.framework = :blah }.to raise_error
+  end
+
+  it "should allow you to add a new javascript framework" do
+    module GoodFake
+      def self.pending_requests
+        "fake"
+      end
+    end
+
+    facade.add_framework(:blah, GoodFake)
+    facade.framework = :blah
+    expect(facade.pending_requests).to eql "fake"
+  end
+
+  it "should not allow you to add a new javascript framework that is invalid" do
+    module BadFake
+      def self.blah
+      end
+    end
+    expect{ facade.add_framework(:blah, BadFake) }.to raise_error
+  end
+end