druid-ts 1.1.2 → 1.1.3

data/lib/druid/elements.rb

@@ -15,7 +15,7 @@ module Druid
       # method to return the element for a tag_name
       #
       def element_class_for(tag_name, type=nil)
-        return type_to_class[type] if type
+        return type_to_class[type.to_sym] if type
         tag_to_class[tag_name.to_sym] || Druid::Elements::Element
       end
     end
@@ -45,3 +45,4 @@ require 'druid/elements/option.rb'
 require 'druid/elements/heading.rb'
 require 'druid/elements/paragraph.rb'
 require 'druid/elements/file_field.rb'
+require 'druid/elements/label.rb'

data/lib/druid/elements/button.rb

@@ -3,7 +3,7 @@ module Druid
     class Button < Element
 
       def self.finders
-        super + [:value, :text, :src, :alt]
+        super + [:value, :text, :src, :alt, :css]
       end
 
     end

data/lib/druid/elements/element.rb

@@ -35,7 +35,7 @@ module Druid
       end
 
       def self.have_to_build_xpath(identifier)
-        ['table', 'span', 'div', 'td', 'li', 'ol', 'ul', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p'].include? identifier[:tag_name] and identifier[:name]
+        ['table', 'span', 'div', 'td', 'li', 'ol', 'ul', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'label'].include? identifier[:tag_name] and identifier[:name]
       end
 
       def self.build_xpath_for identifier

data/lib/druid/elements/label.rb

@@ -0,0 +1,11 @@
+module Druid
+  module Elements
+    class Label < Element
+      def self.finders
+        super + [:text]
+      end
+
+      Druid::Elements.tag_to_class[:label] = Druid::Elements::Label
+    end
+  end
+end

data/lib/druid/elements/link.rb

@@ -5,7 +5,7 @@ module Druid
       protected
 
       def self.finders
-         super + [:href, :text]
+         super + [:href, :text, :css]
       end
 
       def self.mapping

data/lib/druid/nested_elements.rb

@@ -192,8 +192,16 @@ module Druid
       paragraphs_for(identifier)
     end
 
-    def file_field_element(identifier={:index =>0})
+    def file_field_element(identifier={:index => 0})
       file_field_for(identifier)
     end
+
+    def label_element(identifier={:index => 0})
+      label_for(identifier)
+    end
+
+    def label_elements(identifier={:index => 0})
+      labels_for(identifier)
+    end
   end
 end

data/lib/druid/page_factory.rb

@@ -41,6 +41,9 @@ module Druid
     def visit_page(page_class, &block)
       on_page page_class, true, &block
     end
+
+    # Support 'visit' for readability of usage
+    alias_method :visit, :visit_page
     #
     # Create a page object.
     #
@@ -55,6 +58,9 @@ module Druid
       @current_page
     end
 
+    # Support 'on' for readability of usage
+    alias_method :on, :on_page
+
     #
     # Navigate to a specific page following a predefined path.
     #

data/lib/druid/version.rb

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

data/spec/druid/accessors_spec.rb

@@ -4,6 +4,8 @@ class AccessorsTestDruid
   include Druid
 
   page_url "http://apple.com"
+  expected_title "Expected Title"
+  expected_element :google_search
   link(:google_search, :link => 'Google Search')
   text_field(:first_name, :id => 'first_name')
   select_list(:state, :id => 'state')
@@ -124,17 +126,57 @@ describe Druid::Accessors do
   describe "goto a page" do
     it "should navigate to a page when requested" do
       expect(driver).to receive(:goto)
-      page = AccessorsTestDruid.new(driver, true)
+      AccessorsTestDruid.new(driver, true)
+    end
+
+    it "should call a method when page_url called with a symbol" do
+      class SymbolPageUrl
+        include Druid
+        page_url :custom_url
+        def custom_url
+          'custom'
+        end
+      end
+      expect(driver).to receive(:goto).with("custom")
+      SymbolPageUrl.new(driver, true)
     end
 
     it "should not navigate to a page when not requested" do
       expect(driver).not_to receive(:goto)
-      page = AccessorsTestDruid.new(driver)
+      AccessorsTestDruid.new(driver)
     end
 
     it "should not navigate to a page when 'page_url' not specified" do
       expect(driver).not_to receive(:goto)
-      page = TestDruidBackUp.new(driver,true)
+      TestDruidBackUp.new(driver,true)
+    end
+  end
+
+  describe "validating the page title" do
+    it "should validate the title" do
+      expect(driver).to receive(:title).and_return("Expected Title")
+      expect(druid).to have_expected_title
+    end
+
+    it "should raise error when it does not have expected title" do
+      expect(driver).to receive(:title).twice.and_return("Not Expected")
+      expect {druid.has_expected_title? }.to raise_error
+    end
+  end
+
+  describe "validating the existence of an element" do
+    it "should validate an element exists" do
+      allow(druid).to receive(:google_search_element).and_return(driver)
+      allow(driver).to receive(:when_present).and_return(true)
+      druid.has_expected_element?
+    end
+
+    it "should handle non-existent elements gracefully" do
+      class FakePage
+        include Druid
+        expected_element :foo
+      end
+      expect(FakePage.new(driver)).not_to have_expected_element
     end
   end
 
@@ -217,7 +259,9 @@ describe Druid::Accessors do
 
     context "implementation" do
       it "should get the current item from a select list" do
-        expect(driver).to receive_message_chain(:select_list, :value).and_return('OH')
+        allow(driver).to receive(:selected?).and_return(driver)
+        allow(driver).to receive(:text).and_return('OH')
+        expect(driver).to receive_message_chain(:select_list, :options).and_return([driver])
         expect(druid.state).to eql 'OH'
       end
 

data/spec/druid/druid_spec.rb

@@ -170,6 +170,17 @@ describe Druid do
         Druid.add_framework(:foo, :bar)
       end
 
+      it "should execute javascript on the browser" do
+        expect(driver).to receive(:execute_script).and_return("abc")
+        expect(druid.execute_script("333")).to eql "abc"
+      end
+
+      it "should know which element has focus" do
+        expect(driver).to receive(:execute_script).and_return(driver)
+        expect(driver).to receive(:tag_name).twice.and_return(:input)
+        expect(driver).to receive(:type).and_return(:submit)
+        expect(druid.element_with_focus.class).to eql Druid::Elements::Button
+      end
     end
   end
 

data/spec/druid/element_locators_spec.rb

@@ -304,4 +304,16 @@ describe Druid::ElementLocators do
     element = page.file_field_element(:id => 'blah')
     expect(element).to be_instance_of Druid::Elements::FileField
   end
+
+  it "should find a label" do
+    expect(driver).to receive(:label).with(:id => 'blah').and_return(driver)
+    element = page.label_element(:id => 'blah')
+    expect(element).to be_instance_of Druid::Elements::Label
+  end
+
+  it "should find all label elements" do
+    expect(driver).to receive(:labels).with(:id => 'blah').and_return([driver])
+    elements = page.label_elements(:id => 'blah')
+    expect(elements[0]).to be_instance_of Druid::Elements::Label
+  end
 end

data/spec/druid/elements/button_spec.rb

@@ -4,7 +4,7 @@ require 'druid/elements'
 describe Druid::Elements::Button do
   describe "when mapping how to find an element" do
     it "should map watir types to same" do
-      [:class, :id, :index, :name, :value, :xpath, :src, :alt].each do |t|
+      [:class, :id, :index, :name, :value, :xpath, :src, :alt, :css].each do |t|
         identifier = Druid::Elements::Button.identifier_for t => 'value'
         expect(identifier.keys.first).to eql t
       end

data/spec/druid/elements/label_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+require 'druid/elements'
+
+describe Druid::Elements::Label do
+  describe "when mapping how to find an element" do
+    it "should map watir types to same" do
+      [:class, :id, :text, :index, :xpath].each do |t|
+        identifier = Druid::Elements::Label.identifier_for t => 'value'
+        expect(identifier.keys.first).to eql t
+      end
+    end
+  end
+
+  describe "interface" do
+    it "should register with tag :label" do
+      expect(Druid::Elements.element_class_for(:label)).to be Druid::Elements::Label
+    end
+  end
+end

data/spec/druid/elements/link_spec.rb

@@ -4,7 +4,7 @@ require 'druid/elements'
 describe Druid::Elements::Link do
   describe "when mapping how to find an element" do
     it "should map watir types to same" do
-      [:class, :href, :id, :name, :text, :xpath].each do |t|
+      [:class, :href, :id, :name, :text, :xpath, :css].each do |t|
         identifier = Druid::Elements::Link.identifier_for t => 'value'
         expect(identifier.keys.first).to eql t
       end

data/spec/druid/page_factory_spec.rb

@@ -6,6 +6,11 @@ class FactoryTestDruid
   page_url "http://google.com"
 end
 
+class TestPageWithDirectUrl
+  include Druid
+  direct_url "http://google.com"
+end
+
 class AnotherPage
   include Druid
 end
@@ -37,6 +42,13 @@ describe Druid::PageFactory do
     end
   end
 
+  it "should create a new page object and execute a block using 'on'" do
+    expect(driver).not_to receive(:goto)
+    world.on FactoryTestDruid do |page|
+      expect(page).to be_instance_of FactoryTestDruid
+    end
+  end
+
   it "should create and visit a new page" do
     expect(driver).to receive(:goto)
     world.visit_page FactoryTestDruid do |page|
@@ -44,6 +56,20 @@ describe Druid::PageFactory do
     end
   end
 
+  it "should create and visit a new page using 'visit'" do
+    expect(driver).to receive(:goto)
+    world.visit FactoryTestDruid do |page|
+      expect(page).to be_instance_of FactoryTestDruid
+    end
+  end
+
+  it "should create and visit a new page when url is defined as 'direct_url'" do
+    expect(driver).to receive(:goto)
+    world.visit TestPageWithDirectUrl do |page|
+      expect(page).to be_instance_of TestPageWithDirectUrl
+    end
+  end
+
   it "should set an instance variable that can be used outside of the block" do
     expect(driver).not_to receive(:goto)
     page = world.on_page FactoryTestDruid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: druid-ts
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Tim Sheng
@@ -91,6 +91,7 @@ files:
 - features/file_field.feature
 - features/form.feature
 - features/frames.feature
+- features/generic_elements.feature
 - features/heading.feature
 - features/hidden_field.feature
 - features/html/async.html
@@ -113,6 +114,7 @@ files:
 - features/html/success.html
 - features/image.feature
 - features/javascript.feature
+- features/label.feature
 - features/link.feature
 - features/list_item.feature
 - features/modal_dialog.feature
@@ -137,10 +139,12 @@ files:
 - features/step_definations/file_field_steps.rb
 - features/step_definations/form_steps.rb
 - features/step_definations/frame_steps.rb
+- features/step_definations/generic_element_steps.rb
 - features/step_definations/heading_steps.rb
 - features/step_definations/hidden_field_steps.rb
 - features/step_definations/image_steps.rb
 - features/step_definations/javasript_steps.rb
+- features/step_definations/label_steps.rb
 - features/step_definations/link_steps.rb
 - features/step_definations/list_item_steps.rb
 - features/step_definations/modal_dialog_steps.rb
@@ -184,6 +188,7 @@ files:
 - lib/druid/elements/heading.rb
 - lib/druid/elements/hidden_field.rb
 - lib/druid/elements/image.rb
+- lib/druid/elements/label.rb
 - lib/druid/elements/link.rb
 - lib/druid/elements/list_item.rb
 - lib/druid/elements/option.rb
@@ -217,6 +222,7 @@ files:
 - spec/druid/elements/heading_spec.rb
 - spec/druid/elements/hidden_field_spec.rb
 - spec/druid/elements/image_spec.rb
+- spec/druid/elements/label_spec.rb
 - spec/druid/elements/link_spec.rb
 - spec/druid/elements/list_item_spec.rb
 - spec/druid/elements/option_spec.rb
@@ -270,6 +276,7 @@ test_files:
 - features/file_field.feature
 - features/form.feature
 - features/frames.feature
+- features/generic_elements.feature
 - features/heading.feature
 - features/hidden_field.feature
 - features/html/async.html
@@ -292,6 +299,7 @@ test_files:
 - features/html/success.html
 - features/image.feature
 - features/javascript.feature
+- features/label.feature
 - features/link.feature
 - features/list_item.feature
 - features/modal_dialog.feature
@@ -316,10 +324,12 @@ test_files:
 - features/step_definations/file_field_steps.rb
 - features/step_definations/form_steps.rb
 - features/step_definations/frame_steps.rb
+- features/step_definations/generic_element_steps.rb
 - features/step_definations/heading_steps.rb
 - features/step_definations/hidden_field_steps.rb
 - features/step_definations/image_steps.rb
 - features/step_definations/javasript_steps.rb
+- features/step_definations/label_steps.rb
 - features/step_definations/link_steps.rb
 - features/step_definations/list_item_steps.rb
 - features/step_definations/modal_dialog_steps.rb
@@ -360,6 +370,7 @@ test_files:
 - spec/druid/elements/heading_spec.rb
 - spec/druid/elements/hidden_field_spec.rb
 - spec/druid/elements/image_spec.rb
+- spec/druid/elements/label_spec.rb
 - spec/druid/elements/link_spec.rb
 - spec/druid/elements/list_item_spec.rb
 - spec/druid/elements/option_spec.rb