druid-ts 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a37878faec17d55dc5e46271488aa642a92a3f00
-  data.tar.gz: cf7cfade0356638ddd7e22c310789f33c4cd60a8
+SHA256:
+  metadata.gz: 0bc85b82790651f4995b6bfff19d44d5b1817d7663d325dfff35bfe371b7a910
+  data.tar.gz: 1e6a812da3665d7dc1478f26308279e91c8722e36077226887197688597a1029
 SHA512:
-  metadata.gz: 351a66a011905ed2722a268153d9d9dbfbca1a276a51cbb2681a831823fa4c93785e193983aa8aa7831d9912883c2f160d8eeb55e15840206345b93064c635e9
-  data.tar.gz: 56f28412001a34ad9c26dd3d43fff4141bad3774b567203b03dfdc22d48f5c715137b9cee773d303bf34914f7c360edf92c1d881ffb7b9b5c113cb11f198918a
+  metadata.gz: 80a5a12a176279950b9ff8fcea84d0d238fd19173b15432c8a18ea6d6e26c0b696f2a1de56a6eb6f831f1695a3903baead8556431820a3249622c2c086d2e66c
+  data.tar.gz: 341a7d92c16fec02628d56ff8158732507028e4691b8cdcb3eb7f09f8b50a8e8f574407c40503ccc372bd60035a090e62d6f64ad2da98cd1059c40c0497067af

data/.travis.yml

@@ -2,7 +2,10 @@ sudo: required
 dist: trusty
 rvm:
   - 2.2.5
+  - 2.2.7
+  - 2.3.4
   - 2.3.1
+  - 2.4.1
 cache: bundler
 before_script:
   - export CHROME_BIN=/usr/bin/google-chrome
@@ -19,4 +22,5 @@ before_script:
   - sudo mv chromedriver /usr/local/bin
 script: bundle exec rake $RAKE_TASK
 env:
+  - RAKE_TASK=spec
   - RAKE_TASK=features:watir

data/ChangeLog

@@ -1,3 +1,9 @@
+=== Version 1.2.6/ 2019-04-09
+* Enhancements
+  * populate_page_with will work with anything that can be converted to a Hash
+* Fixes
+  * Fixed present? when using with ActiveSupport
+  * Fixed issues with when_visible and when_not_visible
 === Version 1.2.5/ 2017-10-16
 * Enhancements
   * Added the ability to get the values of a table column

data/features/element.feature

@@ -35,7 +35,6 @@ Feature: Elements
     And I should know its' tag name is "a"
     And I should know the attribute "readonly" is false
     And I should know the attribute "href" includes "success.html"
-    And I should know its' value is ""
     And I should be able to click it
 
   Scenario: Button element methods
@@ -65,7 +64,6 @@ Feature: Elements
     Then I should know it exists
     And I should know it is visible
     And I should know its' text is "page-object rocks!"
-    And I should know its' value is ""
     And I should know it is equal to itself
     And I should know its' tag name is "div"
     And I should know the attribute "readonly" is false
@@ -97,7 +95,6 @@ Feature: Elements
     When I retrieve a table element
     Then I should know it is visible
     Then I should know it exists
-    And I should know its' value is ""
     And I should know its' text includes "Data1"
     And I should know it is equal to itself
     And I should know its' tag name is "table"
@@ -108,7 +105,6 @@ Feature: Elements
     When I retrieve table cell
     Then I should know it exists
     And I should know it is visible
-    Then I should know its' value is ""
     And I should know its' text includes "Data4"
     And I should know it is equal to itself
     And I should know its' tag name is "td"
@@ -129,7 +125,6 @@ Feature: Elements
   Scenario: Image element methods
     When I get the image element
     Then I should know it exists
-    Then I should know its' value is ""
     And I should know it is visible
     And I should know its' text includes ""
     And I should know it is equal to itself
@@ -155,7 +150,6 @@ Feature: Elements
     And I should know it is equal to itself
     And I should know its' tag name is "form"
     And I should know the attribute "readonly" is false
-    And I should know its' value is ""
 
   Scenario: Text Area element methods
     When I retrieve the text area

data/features/step_definations/async_steps.rb

@@ -26,7 +26,7 @@ end
 
 Then(/^I should be able to wait until a block returns true$/) do
   @element.wait_until do
-    @element.visible?
+    @element.present?
   end
 end
 

data/features/step_definations/element_steps.rb

@@ -29,7 +29,7 @@ Then(/^I should know its' text includes "(.*?)"$/) do |text|
 end
 
 Then(/^I should know it is not visible$/) do
-  expect(@element.visible?).to be false
+  expect(@element.present?).to be false
 end
 
 When(/^I clear the text field$/) do
@@ -136,7 +136,7 @@ Then(/^I should know the html is "(.*)"$/) do |html|
 end
 
 Then(/^the heading element should be visible$/) do
-  expect(@element.visible?).to be true
+  expect(@element.present?).to be true
 end
 
 When(/^I retrieve a div using data\-entity$/) do

data/features/step_definations/frame_steps.rb

@@ -84,9 +84,9 @@ Given(/^I am on the frame section page$/) do
 end
 
 Then(/^I should be able to access an element in the frame in the section repeatedly$/) do
-  expect(@page.p_on_page_element).to be_visible
-  expect(@page.frame_section.p_in_section_element).to be_visible
-  expect(@page.frame_section.success_element).to be_visible
+  expect(@page.p_on_page_element).to be_present
+  expect(@page.frame_section.p_in_section_element).to be_present
+  expect(@page.frame_section.success_element).to be_present
   expect(@page.frame_section.success_element.text).to eq "this link should open the page success page"
   @page.frame_section.success
   expect(@page.text.strip).to eq 'Success'

data/features/step_definations/link_steps.rb

@@ -21,7 +21,7 @@ Then(/^I should know it exists$/) do
 end
 
 Then(/^I should know it is visible$/) do
-  expect(@element.visible?).to be true
+  expect(@element.present?).to be true
 end
 
 When(/^I select a link labeled "(.*?)" and index "(.*?)"$/) do |label, index|

data/features/step_definations/section_steps.rb

@@ -266,6 +266,6 @@ When(/^I have a page section$/) do
 end
 
 Then(/^methods called on the section are passed to the root if missing$/) do
-  expect { @section.visible? }.not_to raise_error
-  expect(@section.visible?).to be true
+  expect { @section.present? }.not_to raise_error
+  expect(@section.present?).to be true
 end

data/lib/druid/elements/element.rb

@@ -23,6 +23,13 @@ module Druid
         not enabled?
       end
 
+      # 
+      # return true if the element exists and is visible
+      #
+      def present?
+        element.present?
+      end
+
       #
       # compare this element to another to determine if they are equal
       # @return [Boolean]
@@ -33,7 +40,7 @@ module Druid
 
       def check_visible(timeout=Druid.default_element_wait)
         timed_loop(timeout) do |element|
-          element.visible?
+          element.present?
         end
         # wait_until(timeout: timeout, message: "Element not visible in #{timeout} seconds", &:present?)
       end
@@ -116,6 +123,7 @@ module Druid
         element.wait_until(timeout: timeout, message: "Element not present in #{timeout} seconds", &:present?)
         self
       end
+      alias_method :when_visible, :when_present
 
       #
       # Waits until the element is not present
@@ -126,27 +134,7 @@ module Druid
       def when_not_present(timeout=Druid.default_element_wait)
         element.wait_while(timeout: timeout, message: "Element still present in #{timeout} seconds", &:present?)
       end
-
-      #
-      # Wait until the element is visible
-      #
-      # @param [Integer] (defaults to: 5) seconds to wait before timing out
-      #
-      def when_visible(timeout=Druid.default_element_wait)
-        when_present(timeout)
-        element.wait_until(timeout: timeout, message: "Element not visible in #{timeout} seconds", &:visible?)
-        self
-      end
-
-      #
-      # Waits until the element is not visible
-      #
-      # @param [Integer] (default to: 5) seconds to wait before timing out
-      #
-      def when_not_visible(timeout=Druid.default_element_wait)
-        when_present(timeout)
-        element.wait_while(timeout: timeout, message: "Element still visible after #{timeout} seconds", &:visible?)
-      end
+      alias_method :when_not_visible, :when_not_present
 
       #
       # Waits until the block returns true

data/lib/druid/page_populator.rb

@@ -29,8 +29,8 @@ module Druid
     # false for a Checkbox or RadioButton.
     #
     def populate_page_with(data)
-      data.each do |key, value|
-        populate_section(key, value) if value.is_a?(Hash)
+      data.to_h.each do |key, value|
+        populate_section(key, value) if value.respond_to?(:to_h)
         populate_value(self, key, value)
       end
     end
@@ -39,7 +39,7 @@ module Druid
 
     def populate_section(section, data)
       return unless self.respond_to? section
-      data.each do |key, value|
+      data.to_h.each do |key, value|
         populate_value(self.send(section), key, value)
       end
     end
@@ -98,7 +98,7 @@ module Druid
       return false if is_radiobuttongroup?(receiver, key)
       return true if (receiver.send "#{key}_element").tag_name == "textarea"
       element = receiver.send("#{key}_element")
-      element.enabled? and element.visible?
+      element.enabled? and element.present?
     end
   end
 end

data/lib/druid/version.rb

@@ -1,3 +1,3 @@
 module Druid
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

data/spec/druid/elements/element_spec.rb

@@ -13,13 +13,13 @@ describe Druid::Elements::Element do
 
   context "on a druid" do
     it "should know when it is visible" do
-      expect(we).to receive(:visible?).and_return(true)
-      expect(element.visible?).to be true
+      expect(we).to receive(:present?).and_return(true)
+      expect(element.present?).to be true
     end
 
     it "should know when it is not visible" do
-      expect(we).to receive(:visible?).and_return(false)
-      expect(element.visible?).to be false
+      expect(we).to receive(:present?).and_return(false)
+      expect(element.present?).to be false
     end
 
     it "should know when it exists" do
@@ -62,11 +62,19 @@ describe Druid::Elements::Element do
     end
 
     it "should check if the element is visible" do
-      expect(we).to receive(:visible?).and_return(false)
-      expect(we).to receive(:visible?).and_return(true)
+      expect(we).to receive(:present?).and_return(false)
+      expect(we).to receive(:present?).and_return(true)
       expect(element.check_visible).to be true
     end
 
+    it "should check if the element is present" do
+      # simulate Active Support's Object#present? being included
+      allow_any_instance_of(Object).to receive(:present?)
+
+      expect(we).to receive(:present?)
+      element.present?
+    end
+
     it "should check if the element exists" do
       expect(we).to receive(:exists?).and_return(false)
       expect(we).to receive(:exists?).and_return(true)
@@ -92,15 +100,13 @@ describe Druid::Elements::Element do
 
     it "should be able to block until it is visible" do
       allow(we).to receive(:wait_until).with(timeout: 10, message: "Element not present in 10 seconds")
-      allow(we).to receive(:wait_until).with(timeout: 10, message: "Element not visible in 10 seconds")
       allow(we).to receive(:displayed?).and_return(true)
       new_element = element.when_visible(10)
       expect(new_element).to eql element
     end
 
     it "should be able to block until it is not visible" do
-      allow(we).to receive(:wait_until).with(timeout: 10, message: "Element not present in 10 seconds")
-      allow(we).to receive(:wait_while).with(timeout: 10, message: "Element still visible after 10 seconds")
+      allow(we).to receive(:wait_while).with(timeout: 10, message: "Element still present in 10 seconds")
       allow(we).to receive(:displayed?).and_return(false)
       element.when_not_visible(10)
     end

data/spec/druid/page_populator_spec.rb

@@ -23,6 +23,15 @@ describe Druid::PagePopulator do
   let(:driver) { mock_driver }
   let(:druid) { DruidPagePopulator.new(driver) }
 
+  it "should accept any object that can be converted to a Hash" do
+    os = OpenStruct.new('tf' => 'value', 'sl' => 'value')
+    expect(druid).to receive(:tf=).with('value')
+    expect(druid).to receive(:sl=).with('value')
+
+    allow(druid).to receive(:is_enabled?).and_return(true)
+    druid.populate_page_with(os)
+  end
+
   it "should set a value in a text field" do
     expect(druid).to receive(:tf=).with('value')
     expect(druid).to receive(:is_enabled?).and_return(true)
@@ -38,7 +47,7 @@ describe Druid::PagePopulator do
     expect(druid).not_to receive(:tf=)
     expect(druid).to receive(:tf_element).twice.and_return(driver)
     expect(driver).to receive(:enabled?).and_return(true)
-    expect(driver).to receive(:visible?).and_return(false)
+    expect(driver).to receive(:present?).and_return(false)
     expect(driver).to receive(:tag_name).and_return('input')
     druid.populate_page_with('tf' => true)
   end
@@ -96,7 +105,7 @@ describe Druid::PagePopulator do
     expect(druid).not_to receive(:check_cb)
     expect(druid).to receive(:cb_element).twice.and_return(driver)
     expect(driver).to receive(:enabled?).and_return(true)
-    expect(driver).to receive(:visible?).and_return(false)
+    expect(driver).to receive(:present?).and_return(false)
     expect(driver).to receive(:tag_name).and_return('input')
     druid.populate_page_with('cb' => true)
   end
@@ -121,7 +130,7 @@ describe Druid::PagePopulator do
     expect(druid).not_to receive(:select_rb)
     expect(druid).to receive(:rb_element).twice.and_return(driver)
     expect(driver).to receive(:enabled?).and_return(true)
-    expect(driver).to receive(:visible?).and_return(false)
+    expect(driver).to receive(:present?).and_return(false)
     expect(driver).to receive(:tag_name).and_return('input')
     druid.populate_page_with('rb' => true)
   end
@@ -139,6 +148,15 @@ describe Druid::PagePopulator do
       druid.populate_page_with('section' => {'stf' => 'value'})
     end
 
+    it "populate a page section when the value repsonds to #to_h and it exists" do
+      os = OpenStruct.new('tf' => 'value', 'sl' => 'value')
+      expect(section).to receive(:tf=).with('value')
+      expect(section).to receive(:sl=).with('value')
+
+      allow(druid).to receive(:is_enabled?).twice.and_return(true)
+      druid.populate_page_with('section' => os)
+    end
+
     it "should not set a value in a text field if it is not found on the page" do
       expect(section).not_to receive(:text_field)
       druid.populate_page_with('section' => {'coffee' => 'value'})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: druid-ts
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Tim Sheng
@@ -338,7 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Druid DSL for browser testing