druid-ts 1.1.8 → 1.2.0

data/spec/druid/druid_spec.rb

@@ -80,7 +80,7 @@ describe Druid do
     it "should throw an error" do
       expect {
         TestDruid.new("blah")
-      }.to raise_error 'expect Watir::Browser'
+      }.to raise_error 'expect Watir::Browser or Watir::HTMLElement'
     end
   end
 
@@ -88,6 +88,7 @@ describe Druid do
     context "when using PageObject" do
 
       it "should display the page text" do
+        # expect(driver).to receive(:element).and_return(driver)
         expect(driver).to receive(:text).and_return("driver text")
         expect(druid.text).to eql "driver text"
       end

data/spec/druid/element_locators_spec.rb

@@ -10,8 +10,8 @@ describe Druid::ElementLocators do
 
   it "should find a button element" do
     expect(driver).to receive(:button).with(:id => 'blah').and_return(driver)
-    button = page.button_element(:id => 'blah')
-    expect(button).to be_instance_of Druid::Elements::Button
+    element = page.button_element(:id => 'blah')
+    expect(element).to be_instance_of Druid::Elements::Button
   end
 
   it "should find a button element using a default identifier" do
@@ -32,8 +32,8 @@ describe Druid::ElementLocators do
 
   it "should find a text field element" do
     expect(driver).to receive(:text_field).with(:id => 'blah').and_return(driver)
-    text_field = page.text_field_element(:id => 'blah')
-    expect(text_field).to be_instance_of Druid::Elements::TextField
+    element = page.text_field_element(:id => 'blah')
+    expect(element).to be_instance_of Druid::Elements::TextField
   end
 
   it "should find a text field element using a default identifier" do
@@ -681,4 +681,26 @@ describe Druid::ElementLocators do
     page.video_elements
   end
 
+  it "should find a b element" do
+    expect(driver).to receive(:b).with(:id => 'blah').and_return(driver)
+    element = page.b_element(:id => 'blah')
+    expect(element).to be_instance_of Druid::Elements::Bold
+  end
+
+  it "should find a b element using a default identifier" do
+    expect(driver).to receive(:b).with(:index => 0).and_return(driver)
+    page.b_element
+  end
+
+  it "should find all b elements" do
+    expect(driver).to receive(:bs).with(:id => 'blah').and_return([driver])
+    elements = page.b_elements(:id => 'blah')
+    expect(elements[0]).to be_instance_of Druid::Elements::Bold
+  end
+
+  it "should find all b elements using no parameters" do
+    expect(driver).to receive(:bs).with({}).and_return([driver])
+    page.b_elements
+  end
+
 end

data/spec/druid/elements/bold_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+require 'druid/elements'
+
+describe Druid::Elements::Bold do
+  let(:bold) { Druid::Elements::Bold}
+
+  describe "when mapping how to find an element" do
+    it "should map watir types to same" do
+      [:class, :id, :idenx, :name, :xpath, :css].each do |t|
+        identifier = bold.identifier_for t => 'value'
+        expect(identifier.keys.first).to eql t
+      end
+    end
+  end
+
+  describe "interface" do
+    it "should register with tag :b" do
+      expect(Druid::Elements.element_class_for(:b)).to eql Druid::Elements::Bold
+    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, :css, :title].each do |t|
+      [:class, :href, :id, :index, :name, :text, :xpath, :css, :title].each do |t|
         identifier = Druid::Elements::Link.identifier_for t => 'value'
         expect(identifier.keys.first).to eql t
       end

data/spec/druid/elements/page_factory_spec.rb

@@ -6,7 +6,7 @@ class FactoryTestDruid
   page_url "http://www.baidu.com"
 end
 
-class TestWorld
+class TestWorldOne
   include Druid::PageFactory
 
   attr_accessor :driver
@@ -14,7 +14,7 @@ end
 
 describe Druid::PageFactory do
   before(:each) do
-    @world = TestWorld.new
+    @world = TestWorldOne.new
     @world.driver = mock_driver
   end
 

data/spec/druid/elements/radio_button_spec.rb

@@ -21,11 +21,6 @@ describe Druid::Elements::RadioButton do
       radio.select
     end
 
-    it "should clear" do
-      expect(element).to receive(:clear)
-      radio.clear
-    end
-
     it "should know if it is selected" do
       expect(element).to receive(:set?)
       radio.selected?

data/spec/druid/elements/select_list_spec.rb

@@ -17,13 +17,13 @@ describe Druid::Elements::SelectList do
     let(:select_list) { Druid::Elements::SelectList.new(element) }
 
     it "should return an option when indexed" do
-      expect(element).to receive_message_chain(:options, :[]).with(1)
+      expect(element).to receive(:options).with(no_args).and_return(opts)
       expect(select_list[1]).to be_instance_of Druid::Elements::Option
     end
 
     it "should retrieve all values of select_list" do
-      expect(element).to receive(:options).and_return(['val1','val2'])
-      expect(select_list.options).to eql ['val1','val2']
+      expect(element).to receive(:options).with(no_args).and_return(opts)
+      expect(select_list.options.size).to eql 2
     end
 
     it "should select an element" do

data/spec/druid/page_factory_spec.rb

@@ -26,9 +26,15 @@ module ContainingModule
   end
 end
 
-class TestWorld
-  include Druid::PageFactory
+class WorldSuper
+  attr_reader :super_called
+  def on_page(cls, params={}, visit=false, &block)
+    @super_called = true
+  end
+end
 
+class TestWorld < WorldSuper
+  include Druid::PageFactory
   attr_accessor :driver
   attr_accessor :current_page
 end
@@ -41,6 +47,13 @@ describe Druid::PageFactory do
     driver = world.driver
   end
 
+  it "should call super when non druid class passed" do
+    class NoDruid
+    end
+    world.on(NoDruid)
+    expect(world.super_called).to be true
+  end
+
   it "should create a new page object and execute a block" do
     expect(driver).not_to receive(:goto)
     world.on_page FactoryTestDruid do |page|
@@ -219,17 +232,4 @@ describe Druid::PageFactory do
     expect{world.navigate_to(AnotherPage)}.to raise_error
   end
 
-  it "should know how to continue routing from a location" do
-    Druid::PageFactory.routes = {:default => [[FactoryTestDruid, :a_method], [AnotherPage, :b_method], [YetAnotherPage, :c_method]]}
-    world.current_page = FactoryTestDruid.new(driver)
-    f_page = FactoryTestDruid.new(driver)
-    allow(FactoryTestDruid).to receive(:new).with(driver,false).and_return(f_page)
-    allow(f_page).to receive(:respond_to?).with(:a_method).and_return(true)
-    allow(f_page).to receive(:a_method)
-    a_page = AnotherPage.new(driver)
-    allow(AnotherPage).to receive(:new).with(driver,false).and_return(a_page)
-    allow(a_page).to receive(:respond_to?).with(:b_method).and_return(true)
-    allow(a_page).to receive(:b_method)
-    expect(world.continue_navigation_to(YetAnotherPage).class).to eql YetAnotherPage
-  end
 end

data/spec/druid/page_populator_spec.rb

@@ -9,6 +9,7 @@ class DruidPagePopulator
   checkbox(:cb, :id => 'id')
   radio_button(:rb, :id => 'id')
   file_field(:ff, :id => 'id')
+  radio_button_group(:rbg, :id => 'id')
 end
 
 describe Druid::PagePopulator do
@@ -72,10 +73,9 @@ describe Druid::PagePopulator do
     druid.populate_page_with('rb' => true)
   end
 
-  it "should clear a radio button when false is specified" do
-    expect(druid).to receive(:clear_rb)
-    expect(druid).to receive(:is_enabled?).and_return(true)
-    druid.populate_page_with('rb' => false)
+  it "should select the correct element from a radio button group" do
+    expect(druid).to receive(:select_rbg).with('blah')
+    druid.populate_page_with('rbg' => 'blah')
   end
 
   it "should not populate a checkbox if it is disabled" do

data/spec/druid/page_section_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+class Container
+  include Druid
+end
+
+class SectionsPage
+  include Druid
+
+  page_section(:container, Container, :id => 'blah')
+  page_sections(:containers, Container, :class => 'foo')
+end
+
+describe Druid::Accessors do
+  context "when using watir" do
+    let(:driver) { mock_driver }
+    let(:druid) { SectionsPage.new(driver) }
+
+    it "it should find a page section" do
+      expect(driver).to receive(:element).with(:id => 'blah').and_return(driver)
+      section = druid.container
+      expect(section).to be_instance_of Container
+    end
+
+    it "it should find page sections" do
+      expect(driver).to receive(:elements).with(:class => 'foo').and_return([driver, driver])
+      sections = druid.containers
+      expect(sections).to be_instance_of Druid::SectionCollection
+      sections.each do |section|
+        expect(section).to be_instance_of Container
+      end
+    end
+  end
+
+  describe Druid::SectionCollection do
+    ContainedItem = Struct.new(:type, :name)
+    let(:section_collection) do
+      contained_items = [ContainedItem.new(:sandwich, :reuben), ContainedItem.new(:soup, :lobstar_bisque), ContainedItem.new(:sandwich, :dagwood)]
+      Druid::SectionCollection.new(contained_items)
+    end
+
+    it "should be indexed to the sections" do
+      expect(section_collection[0]).to be_an_instance_of ContainedItem
+      expect(section_collection[-1]).to be_an_instance_of ContainedItem
+    end
+
+    it "should be able to iterate over the sections" do
+      section_collection.each do |section|
+        expect(section).to be_an_instance_of ContainedItem
+      end
+    end
+
+    it "should find a section by one of its values" do
+      expect(section_collection.find_by(name: :dagwood).name).to eq :dagwood
+    end
+
+    it "should find all sections matching a value" do
+      expect(section_collection.select_by(type: :sandwich).map(&:type)).to eq [:sandwich, :sandwich]
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ require "watir-webdriver"
 
 def mock_driver
   driver = double('watir')
+  allow(driver).to receive(:is_a?).with(anything()).and_return(false)
   allow(driver).to receive(:is_a?).with(Watir::Browser).and_return(true)
   driver
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: druid-ts
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.0
 platform: ruby
 authors:
 - Tim Sheng
@@ -100,6 +100,7 @@ files:
 - features/area.feature
 - features/async.feature
 - features/audio.feature
+- features/bold.feature
 - features/button.feature
 - features/canvas.feature
 - features/checkbox.feature
@@ -148,6 +149,7 @@ files:
 - features/page_level_actions.feature
 - features/paragraph.feature
 - features/radio_button.feature
+- features/radio_button_group.feature
 - features/sample-app/public/jquery-1.3.2.js
 - features/sample-app/public/jquery.html
 - features/sample-app/public/movie.mp4
@@ -155,11 +157,13 @@ files:
 - features/sample-app/public/prototype-1.6.0.3.js
 - features/sample-app/public/prototype.html
 - features/sample-app/sample_app.rb
+- features/section.feature
 - features/select_list.feature
 - features/span.feature
 - features/step_definations/area_steps.rb
 - features/step_definations/async_steps.rb
 - features/step_definations/audio_steps.rb
+- features/step_definations/bold_steps.rb
 - features/step_definations/button_steps.rb
 - features/step_definations/canvas_steps.rb
 - features/step_definations/checkbox_steps.rb
@@ -183,7 +187,9 @@ files:
 - features/step_definations/page_level_actions_steps.rb
 - features/step_definations/page_traversal_steps.rb
 - features/step_definations/paragraph_steps.rb
+- features/step_definations/radio_button_group_steps.rb
 - features/step_definations/radio_button_steps.rb
+- features/step_definations/section_steps.rb
 - features/step_definations/select_list_steps.rb
 - features/step_definations/span_steps.rb
 - features/step_definations/table_cell_steps.rb
@@ -214,6 +220,7 @@ files:
 - lib/druid/elements.rb
 - lib/druid/elements/area.rb
 - lib/druid/elements/audio.rb
+- lib/druid/elements/bold.rb
 - lib/druid/elements/button.rb
 - lib/druid/elements/canvas.rb
 - lib/druid/elements/check_box.rb
@@ -241,6 +248,7 @@ files:
 - lib/druid/elements/text_field.rb
 - lib/druid/elements/unordered_list.rb
 - lib/druid/elements/video.rb
+- lib/druid/javascript/angularjs.rb
 - lib/druid/javascript/jquery.rb
 - lib/druid/javascript/prototype.rb
 - lib/druid/javascript/yui.rb
@@ -249,11 +257,13 @@ files:
 - lib/druid/nested_elements.rb
 - lib/druid/page_factory.rb
 - lib/druid/page_populator.rb
+- lib/druid/sections.rb
 - lib/druid/version.rb
 - spec/druid/accessors_spec.rb
 - spec/druid/druid_spec.rb
 - spec/druid/element_locators_spec.rb
 - spec/druid/elements/area_spec.rb
+- spec/druid/elements/bold_spec.rb
 - spec/druid/elements/button_spec.rb
 - spec/druid/elements/canvas_spec.rb
 - spec/druid/elements/check_box_spec.rb
@@ -284,6 +294,7 @@ files:
 - spec/druid/nested_element_spec.rb
 - spec/druid/page_factory_spec.rb
 - spec/druid/page_populator_spec.rb
+- spec/druid/page_section_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/timsheng/druid
 licenses:
@@ -313,6 +324,7 @@ test_files:
 - features/area.feature
 - features/async.feature
 - features/audio.feature
+- features/bold.feature
 - features/button.feature
 - features/canvas.feature
 - features/checkbox.feature
@@ -361,6 +373,7 @@ test_files:
 - features/page_level_actions.feature
 - features/paragraph.feature
 - features/radio_button.feature
+- features/radio_button_group.feature
 - features/sample-app/public/jquery-1.3.2.js
 - features/sample-app/public/jquery.html
 - features/sample-app/public/movie.mp4
@@ -368,11 +381,13 @@ test_files:
 - features/sample-app/public/prototype-1.6.0.3.js
 - features/sample-app/public/prototype.html
 - features/sample-app/sample_app.rb
+- features/section.feature
 - features/select_list.feature
 - features/span.feature
 - features/step_definations/area_steps.rb
 - features/step_definations/async_steps.rb
 - features/step_definations/audio_steps.rb
+- features/step_definations/bold_steps.rb
 - features/step_definations/button_steps.rb
 - features/step_definations/canvas_steps.rb
 - features/step_definations/checkbox_steps.rb
@@ -396,7 +411,9 @@ test_files:
 - features/step_definations/page_level_actions_steps.rb
 - features/step_definations/page_traversal_steps.rb
 - features/step_definations/paragraph_steps.rb
+- features/step_definations/radio_button_group_steps.rb
 - features/step_definations/radio_button_steps.rb
+- features/step_definations/section_steps.rb
 - features/step_definations/select_list_steps.rb
 - features/step_definations/span_steps.rb
 - features/step_definations/table_cell_steps.rb
@@ -423,6 +440,7 @@ test_files:
 - spec/druid/druid_spec.rb
 - spec/druid/element_locators_spec.rb
 - spec/druid/elements/area_spec.rb
+- spec/druid/elements/bold_spec.rb
 - spec/druid/elements/button_spec.rb
 - spec/druid/elements/canvas_spec.rb
 - spec/druid/elements/check_box_spec.rb
@@ -453,4 +471,5 @@ test_files:
 - spec/druid/nested_element_spec.rb
 - spec/druid/page_factory_spec.rb
 - spec/druid/page_populator_spec.rb
+- spec/druid/page_section_spec.rb
 - spec/spec_helper.rb