watir 6.2.1 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfb993f1f8e46cb5a58c37e008c476050814ac65
-  data.tar.gz: db6967abba308be2cdd3fcd140e6063222a7db07
+  metadata.gz: 6d3a0cb0525118548da109542afb75980a1d42cf
+  data.tar.gz: 0bc02ea05b55da8b92650cecfd3a3a3fe98ab39b
 SHA512:
-  metadata.gz: baa72d6022e1af45db9183ce4582913264ecfa6b9519db23f7bebc418404312b1581d695064b119abc6ec9d58791bb607072e0591a8fe883d9afd79754286d94
-  data.tar.gz: 8676c1791eac366796f1c471171b97cb7b6bc62607bc34cfb4daa08e6b4ccd2aa0cbeaf959b297ca10ba7983844cbacf44c38a00f142165a303c6c22e0c58362
+  metadata.gz: 03f724ca3a53ec63b963d76bc6f36f727003d52b484032ac3790f1962ad2b5a8f5e90e9864a18cd644fd51451030715a13d0d3805077749e79fce4f00d48b6cc
+  data.tar.gz: 66cf35ca15c505bc84dec52bc9b42303c7ba6c3473703a8edc91ea80882f1e48d6ff8d17de888ee5dcab3633dd0e7573de46d81bdafd7bba923fa851fc44a045

data/.travis.yml

@@ -1,9 +1,9 @@
 dist: trusty
 sudo: require
 rvm:
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 addons:
   firefox: latest
   apt:
@@ -20,8 +20,6 @@ notifications:
   slack:
     secure: BLsBCm33R32VNRccrLx9F0P24X6BVpVHj1OWaN4Kyn6g9qXteIwC2VKVMnKNbifpojfMkrn0OeFQFK1O1DSOsC3mgzn/udoB+DnUGcSemFUn04xhbYF5SI+3zGPKPo0JLvjjdEKSSma84YwKdrj88pGUK34p01gL8hiaqjFzWdk=
 before_script:
-  - mkdir travis-drivers
-  - export PATH=$PWD/travis-drivers:$PATH
   - support/travis.sh
 script: bundle exec rake $RAKE_TASK
 env:
@@ -29,6 +27,4 @@ env:
   - RAKE_TASK=spec:firefox RELAXED_LOCATE=false
   - RAKE_TASK=spec:chrome
   - RAKE_TASK=spec:chrome RELAXED_LOCATE=false
-  - RAKE_TASK=spec:phantomjs
-  - RAKE_TASK=spec:phantomjs RELAXED_LOCATE=false
   - RAKE_TASK=yard:doctest

data/CHANGES.md

@@ -1,3 +1,11 @@
+### 6.3.0 (2017-06-20)
+
+* Allow locating elements by attribute presence/absence (#345)
+* Element#flash configurable by color, number, and delay (thanks Paul3816547290)
+* Implement Select#text like Select#value (thanks Arik Jones)
+* Optimize Select#selected_options, Select#value, and Select#text with javascript (thanks Andrei Botalov)
+* Support locating elements by #execute_script from inside frame context
+
 ### 6.2.1 (2017-03-22)
 
 * Allow sending text to FileField without checking element is #visible?

data/Rakefile

@@ -126,7 +126,6 @@ namespace :spec do
   task browsers: [:chrome,
                   :firefox,
                   :ff_legacy,
-                  :phantomjs,
                   (:safari if Selenium::WebDriver::Platform.mac?),
                   (:ie if Selenium::WebDriver::Platform.windows?),
                   (:edge if Selenium::WebDriver::Platform.windows?)].compact
@@ -135,12 +134,11 @@ namespace :spec do
   task remote_browsers: [:remote_chrome,
                          :remote_firefox,
                          :remote_ff_legacy,
-                         :remote_phantomjs,
                          (:remote_safari if Selenium::WebDriver::Platform.mac?),
                          (:remote_ie if Selenium::WebDriver::Platform.windows?),
                          (:remote_edge if Selenium::WebDriver::Platform.windows?)].compact
 
-  %w(firefox ff_legacy chrome safari phantomjs ie edge).each do |browser|
+  %w(firefox ff_legacy chrome safari ie edge).each do |browser|
     desc "Run specs in #{browser}"
     task browser do
       ENV['WATIR_BROWSER'] = browser

data/lib/watir/browser.rb

@@ -258,7 +258,7 @@ module Watir
       args.map! { |e| e.kind_of?(Watir::Element) ? e.wd : e }
       returned = @driver.execute_script(script, *args)
 
-      wrap_elements_in(returned)
+      wrap_elements_in(self, returned)
     end
 
     #
@@ -324,14 +324,14 @@ module Watir
 
     private
 
-    def wrap_elements_in(obj)
+    def wrap_elements_in(scope, obj)
       case obj
       when Selenium::WebDriver::Element
-        wrap_element(obj)
+        wrap_element(scope, obj)
       when Array
-        obj.map { |e| wrap_elements_in(e) }
+        obj.map { |e| wrap_elements_in(scope, e) }
       when Hash
-        obj.each { |k,v| obj[k] = wrap_elements_in(v) }
+        obj.each { |k,v| obj[k] = wrap_elements_in(scope, v) }
 
         obj
       else
@@ -339,8 +339,8 @@ module Watir
       end
     end
 
-    def wrap_element(element)
-      Watir.element_class_for(element.tag_name.downcase).new(self, element: element)
+    def wrap_element(scope, element)
+      Watir.element_class_for(element.tag_name.downcase).new(scope, element: element)
     end
 
   end # Browser

data/lib/watir/elements/element.rb

@@ -213,19 +213,28 @@ module Watir
     end
 
     #
-    # Flashes (change background color far a moment) element.
+    # Flashes (change background color to a new color and back a few times) element.
     #
     # @example
     #   browser.text_field(name: "new_user_first_name").flash
+    #   browser.text_field(name: "new_user_first_name").flash(color: "green", flashes: 3, delay: 0.05)
+    #   browser.text_field(name: "new_user_first_name").flash(color: "yellow")
+    #   browser.text_field(name: "new_user_first_name").flash(flashes: 4)
+    #   browser.text_field(name: "new_user_first_name").flash(delay: 0.1)
+    #
+    # @param [String] color what color to flash with
+    # @param [Integer] flashes number of times element should be flashed
+    # @param [Integer, Float] delay how long to wait between flashes
     #
 
-    def flash
+    def flash(color: 'red', flashes: 10, delay: 0)
       background_color = style("backgroundColor")
       element_color = driver.execute_script("arguments[0].style.backgroundColor", @element)
 
-      10.times do |n|
-        color = (n % 2 == 0) ? "red" : background_color
-        driver.execute_script("arguments[0].style.backgroundColor = '#{color}'", @element)
+      flashes.times do |n|
+        nextcolor = n.even? ? color : background_color
+        driver.execute_script("arguments[0].style.backgroundColor = '#{nextcolor}'", @element)
+        sleep(delay)
       end
 
       driver.execute_script("arguments[0].style.backgroundColor = arguments[1]", @element, element_color)
@@ -458,6 +467,13 @@ module Watir
       @query_scope.browser
     end
 
+    #
+    # Delegates script execution to Browser or IFrame.
+    #
+    def execute_script(script, *args)
+      @query_scope.execute_script(script, *args)
+    end
+
     #
     # Returns true if a previously located element is no longer attached to DOM.
     #

data/lib/watir/elements/iframe.rb

@@ -54,8 +54,17 @@ module Watir
       wd.page_source
     end
 
-    def execute_script(*args)
-      browser.execute_script(*args)
+    #
+    # Executes JavaScript snippet in context of frame.
+    #
+    # @see Watir::Browser#execute_script
+    #
+
+    def execute_script(script, *args)
+      args.map! { |e| e.kind_of?(Watir::Element) ? e.wd : e }
+      returned = driver.execute_script(script, *args)
+
+      browser.send :wrap_elements_in, self, returned
     end
 
     private

data/lib/watir/elements/image.rb

@@ -23,8 +23,9 @@ module Watir
     #
 
     def width
-      wait_for_exists
-      driver.execute_script "return arguments[0].width", @element
+      element_call do
+        driver.execute_script "return arguments[0].width", @element
+      end
     end
 
   end # Image

data/lib/watir/elements/select.rb

@@ -100,19 +100,40 @@ module Watir
     #
 
     def value
-      o = options.find { |e| e.selected? } || return
-      o.value
+      option = selected_options.first
+      option && option.value
     end
 
-
     #
+    # Returns the text of the first selected option in the select list.
+    # Returns nil if no option is selected.
+    #
+    # @return [String, nil]
+    #
+
+    def text
+      option = selected_options.first
+      option && option.text
+    end
+    
     # Returns an array of currently selected options.
     #
     # @return [Array<Watir::Option>]
     #
 
     def selected_options
-      options.select { |e| e.selected? }
+      element_call do
+        script = <<-SCRIPT
+          var result = [];
+          var options = arguments[0].options;
+          for (var i = 0; i < options.length; i++) {
+            var option = options[i];
+            if (option.selected) { result.push(option) }
+          }
+          return result;
+        SCRIPT
+        @query_scope.execute_script(script, self)
+      end
     end
 
     private

data/lib/watir/extensions/select_text.rb

@@ -3,8 +3,9 @@ Watir::Atoms.load :selectText
 module Watir
   class Element
     def select_text(str)
-      wait_for_exists
-      execute_atom :selectText, @element, str
+      element_call do
+        execute_atom :selectText, @element, str
+      end
     end
   end # Element
 end # Watir

data/lib/watir/locators/element/selector_builder.rb

@@ -2,7 +2,7 @@ module Watir
   module Locators
     class Element
       class SelectorBuilder
-        VALID_WHATS = [String, Regexp]
+        VALID_WHATS = [String, Regexp, TrueClass, FalseClass].freeze
         WILDCARD_ATTRIBUTE = /^(aria|data)_(.+)$/
 
         def initialize(query_scope, selector, valid_attributes)

data/lib/watir/locators/element/selector_builder/xpath.rb

@@ -28,6 +28,10 @@ module Watir
             f = selectors.map do |key, val|
               if val.is_a?(Array)
                 "(" + val.map { |v| equal_pair(building, key, v) }.join(" or ") + ")"
+              elsif val == true
+                attribute_presence(key)
+              elsif val == false
+                attribute_absence(key)
               else
                 equal_pair(building, key, val)
               end
@@ -65,6 +69,16 @@ module Watir
               "@#{key.to_s.tr("_", "-")}"
             end
           end
+
+          private
+
+          def attribute_presence(attribute)
+            lhs_for(nil, attribute)
+          end
+
+          def attribute_absence(attribute)
+            "not(#{lhs_for(nil, attribute)})"
+          end
         end
       end
     end

data/lib/watirspec/rake_tasks.rb

@@ -83,9 +83,9 @@ WatirSpec.implementation do |watirspec|
   #
   # watirspec.name = :watizzle
   # watirspec.browser_class = Watir::Browser
-  # watirspec.browser_args = [:phantomjs, {}]
+  # watirspec.browser_args = [:firefox, {}]
   # watirspec.guard_proc = lambda do |args|
-  #   args.include?(:phantomjs)
+  #   args.include?(:firefox)
   # end
 end
 

data/spec/element_locator_spec.rb

@@ -47,6 +47,18 @@ describe Watir::Locators::Element::Locator do
         locate_one [:dir,   "foo",
                     :title, "bar"]
       end
+
+      it "handles selector with attribute presence" do
+        expect_one :xpath, ".//*[@data-view]"
+
+        locate_one [:data_view, true]
+      end
+
+      it "handles selector with attribute absence" do
+        expect_one :xpath, ".//*[not(@data-view)]"
+
+        locate_one [:data_view, false]
+      end
     end
 
     describe "with special cased selectors" do
@@ -288,10 +300,10 @@ describe Watir::Locators::Element::Locator do
         raise_error(TypeError, %[expected Integer, got "bar":String])
       end
 
-      it "raises a TypeError if selector value is not a String or Regexp" do
+      it "raises a TypeError if selector value is not a String, Regexp or Boolean" do
         num_type = RUBY_VERSION[/^\d+\.(\d+)/, 1].to_i >= 4 ? 'Integer' : 'Fixnum'
         expect { locate_one(tag_name: 123) }.to \
-        raise_error(TypeError, %[expected one of [String, Regexp], got 123:#{num_type}])
+        raise_error(TypeError, %[expected one of [String, Regexp, TrueClass, FalseClass], got 123:#{num_type}])
       end
 
       it "raises a MissingWayOfFindingObjectException if the attribute is not valid" do

data/spec/watirspec/after_hooks_spec.rb

@@ -104,61 +104,59 @@ describe "Browser::AfterHooks" do
       end
     end
 
-    bug "https://github.com/detro/ghostdriver/issues/20", :phantomjs do
-      not_compliant_on :safari do
-        it "runs after_hooks after Alert#ok" do
+    not_compliant_on :safari do
+      it "runs after_hooks after Alert#ok" do
+        browser.goto(WatirSpec.url_for("alerts.html"))
+        @page_after_hook = Proc.new { @yield = browser.title == "Alerts" }
+        browser.after_hooks.add @page_after_hook
+        browser.after_hooks.without { browser.button(id: 'alert').click }
+        browser.alert.ok
+        expect(@yield).to be true
+      end
+
+      bug "https://code.google.com/p/chromedriver/issues/detail?id=26", [:chrome, :macosx] do
+        it "runs after_hooks after Alert#close" do
           browser.goto(WatirSpec.url_for("alerts.html"))
           @page_after_hook = Proc.new { @yield = browser.title == "Alerts" }
           browser.after_hooks.add @page_after_hook
           browser.after_hooks.without { browser.button(id: 'alert').click }
-          browser.alert.ok
+          browser.alert.close
           expect(@yield).to be true
         end
+      end
 
-        bug "https://code.google.com/p/chromedriver/issues/detail?id=26", [:chrome, :macosx] do
-          it "runs after_hooks after Alert#close" do
-            browser.goto(WatirSpec.url_for("alerts.html"))
-            @page_after_hook = Proc.new { @yield = browser.title == "Alerts" }
-            browser.after_hooks.add @page_after_hook
-            browser.after_hooks.without { browser.button(id: 'alert').click }
-            browser.alert.close
-            expect(@yield).to be true
-          end
-        end
-
-        bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1279211", :firefox do
-          it "raises UnhandledAlertError error when running error checks with alert present" do
-            url = WatirSpec.url_for("alerts.html")
-            @page_after_hook = Proc.new { browser.url }
-            browser.after_hooks.add @page_after_hook
-            browser.goto url
-            expect { browser.button(id: "alert").click }.to raise_error(Selenium::WebDriver::Error::UnhandledAlertError)
-
-            not_compliant_on :ff_legacy do
-              browser.alert.ok
-            end
-          end
-        end
-
-        it "does not raise error when running error checks using #after_hooks#without with alert present" do
+      bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1279211", :firefox do
+        it "raises UnhandledAlertError error when running error checks with alert present" do
           url = WatirSpec.url_for("alerts.html")
           @page_after_hook = Proc.new { browser.url }
           browser.after_hooks.add @page_after_hook
           browser.goto url
-          expect { browser.after_hooks.without {browser.button(id: "alert").click} }.to_not raise_error
-          browser.alert.ok
-        end
+          expect { browser.button(id: "alert").click }.to raise_error(Selenium::WebDriver::Error::UnhandledAlertError)
 
-        it "does not raise error if no error checks are defined with alert present" do
-          url = WatirSpec.url_for("alerts.html")
-          @page_after_hook = Proc.new { browser.url }
-          browser.after_hooks.add @page_after_hook
-          browser.goto url
-          browser.after_hooks.delete @page_after_hook
-          expect { browser.button(id: "alert").click }.to_not raise_error
-          browser.alert.ok
+          not_compliant_on :ff_legacy do
+            browser.alert.ok
+          end
         end
       end
+
+      it "does not raise error when running error checks using #after_hooks#without with alert present" do
+        url = WatirSpec.url_for("alerts.html")
+        @page_after_hook = Proc.new { browser.url }
+        browser.after_hooks.add @page_after_hook
+        browser.goto url
+        expect { browser.after_hooks.without { browser.button(id: "alert").click } }.to_not raise_error
+        browser.alert.ok
+      end
+
+      it "does not raise error if no error checks are defined with alert present" do
+        url = WatirSpec.url_for("alerts.html")
+        @page_after_hook = Proc.new { browser.url }
+        browser.after_hooks.add @page_after_hook
+        browser.goto url
+        browser.after_hooks.delete @page_after_hook
+        expect { browser.button(id: "alert").click }.to_not raise_error
+        browser.alert.ok
+      end
     end
 
     bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1223277", :firefox do

data/spec/watirspec/alert_spec.rb

@@ -1,98 +1,96 @@
 require "watirspec_helper"
 
 describe 'Alert API' do
-  bug "https://github.com/detro/ghostdriver/issues/20", :phantomjs do
-    not_compliant_on :safari do
-      before do
-        browser.goto WatirSpec.url_for("alerts.html")
-      end
+  not_compliant_on :safari do
+    before do
+      browser.goto WatirSpec.url_for("alerts.html")
+    end
+
+    after do
+      browser.alert.ok if browser.alert.exists?
+    end
 
-      after do
-        browser.alert.ok if browser.alert.exists?
+    context 'alert' do
+      describe '#text' do
+        it 'returns text of alert' do
+          browser.button(id: 'alert').click
+          expect(browser.alert.text).to include('ok')
+        end
       end
 
-      context 'alert' do
-        describe '#text' do
-          it 'returns text of alert' do
-            browser.button(id: 'alert').click
-            expect(browser.alert.text).to include('ok')
-          end
+      describe '#exists?' do
+        it 'returns false if alert is not present' do
+          expect(browser.alert).to_not exist
         end
 
-        describe '#exists?' do
-          it 'returns false if alert is not present' do
-            expect(browser.alert).to_not exist
-          end
+        it 'returns true if alert is present' do
+          browser.button(id: 'alert').click
+          browser.wait_until(timeout: 10) { browser.alert.exists? }
+        end
+      end
 
-          it 'returns true if alert is present' do
-            browser.button(id: 'alert').click
-            browser.wait_until(timeout: 10) { browser.alert.exists? }
-          end
+      describe '#ok' do
+        it 'closes alert' do
+          browser.button(id: 'alert').click
+          browser.alert.ok
+          expect(browser.alert).to_not exist
         end
+      end
 
-        describe '#ok' do
+      bug "https://code.google.com/p/chromedriver/issues/detail?id=26", [:chrome, :macosx] do
+        describe '#close' do
           it 'closes alert' do
             browser.button(id: 'alert').click
-            browser.alert.ok
+            browser.alert.close
             expect(browser.alert).to_not exist
           end
         end
+      end
 
-        bug "https://code.google.com/p/chromedriver/issues/detail?id=26", [:chrome, :macosx] do
-          describe '#close' do
-            it 'closes alert' do
-              browser.button(id: 'alert').click
-              browser.alert.close
-              expect(browser.alert).to_not exist
-            end
+      not_compliant_on :relaxed_locate do
+        describe 'wait_until_present' do
+          it 'waits until alert is present and goes on' do
+            browser.button(id: 'timeout-alert').click
+            browser.alert.wait_until_present.ok
+
+            expect(browser.alert).to_not exist
           end
-        end
 
-        not_compliant_on :relaxed_locate do
-          describe 'wait_until_present' do
-            it 'waits until alert is present and goes on' do
-              browser.button(id: 'timeout-alert').click
+          it 'raises error if alert is not present after timeout' do
+            expect {
               browser.alert.wait_until_present.ok
-
-              expect(browser.alert).to_not exist
-            end
-
-            it 'raises error if alert is not present after timeout' do
-              expect {
-                browser.alert.wait_until_present.ok
-              }.to raise_error(Watir::Wait::TimeoutError)
-            end
+            }.to raise_error(Watir::Wait::TimeoutError)
           end
         end
       end
+    end
 
-      context 'confirm' do
-        describe '#ok' do
-          it 'accepts confirm' do
-            browser.button(id: 'confirm').click
-            browser.alert.ok
-            expect(browser.button(id: 'confirm').value).to eq "true"
-          end
+    context 'confirm' do
+      describe '#ok' do
+        it 'accepts confirm' do
+          browser.button(id: 'confirm').click
+          browser.alert.ok
+          expect(browser.button(id: 'confirm').value).to eq "true"
         end
+      end
 
-        describe '#close' do
-          it 'cancels confirm' do
-            browser.button(id: 'confirm').click
-            browser.alert.close
-            expect(browser.button(id: 'confirm').value).to eq "false"
-          end
+      describe '#close' do
+        it 'cancels confirm' do
+          browser.button(id: 'confirm').click
+          browser.alert.close
+          expect(browser.button(id: 'confirm').value).to eq "false"
         end
       end
+    end
 
-      context 'prompt' do
-        describe '#set' do
-          bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1255906", :firefox do
-            it 'enters text to prompt' do
-              browser.button(id: 'prompt').click
-              browser.alert.set 'My Name'
-              browser.alert.ok
-              expect(browser.button(id: 'prompt').value).to eq 'My Name'
-            end
+    context 'prompt' do
+      describe '#set' do
+        bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1255906", :firefox do
+          it 'enters text to prompt' do
+            browser.button(id: 'prompt').click
+            browser.alert.set 'My Name'
+            browser.alert.ok
+            expect(browser.button(id: 'prompt').value).to eq 'My Name'
           end
         end
       end