watir-webdriver 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97a842500bc21408f519b175ca58df6c8533491a
-  data.tar.gz: 65dd8b201a511705730c8e21c6e691e615b984c6
+  metadata.gz: 69667d301519d6ffd4340fe0187d9989d72cd0b5
+  data.tar.gz: 27ec93300295d47e1334fe0a92be7d40fceb9811
 SHA512:
-  metadata.gz: 06f2ac29fc1ba7ade5cc45b5291757fe1d6c4f907a205ddb9aaf21a78208dc603afcb3aea128ff83ac4e677378cef87f8135724559b59f9c6a699b85c8f8ff27
-  data.tar.gz: 01b2df0459f6fba07f5e4739e1bbd5ae3b7654c0eaf4d316725f1aa0a91c1e0e38508393d901f91f070c1994879b4cb58e555dbad9448907af08bd92fc997fdf
+  metadata.gz: 103bf16805460dd31e2e2c2151701c1eaaac607544868879a3e77ed83c85aa96b143d46d398355cca5eb024a5d16173bd7d05c7ac2a41bdb609de140c8ab6d1d
+  data.tar.gz: fac256f75d40768e6df698add77dbc0032cad9a48b3ef4f2878824e9c807c6c92b12ce137be68ec4a4aeddd6adb15a3ab85d0f8e81e651afc6f8de3eb6b05998

data/.travis.yml

@@ -18,13 +18,13 @@ notifications:
 before_script: support/travis.sh
 script: bundle exec rake $RAKE_TASK
 env:
-  - RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=firefox
-  - RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=firefox ALWAYS_LOCATE=false
-  - RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=firefox PREFER_CSS=1 SELECTOR_STATS=1
-  - RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=chrome
-  - RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=chrome ALWAYS_LOCATE=false
-  - RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=chrome PREFER_CSS=1 SELECTOR_STATS=1
-  - RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=phantomjs
-  - RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=phantomjs ALWAYS_LOCATE=false
-  - RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=phantomjs PREFER_CSS=1 SELECTOR_STATS=1
+  - RAKE_TASK=spec:firefox
+  - RAKE_TASK=spec:firefox ALWAYS_LOCATE=false
+  - RAKE_TASK=spec:firefox PREFER_CSS=1 SELECTOR_STATS=1
+  - RAKE_TASK=spec:chrome
+  - RAKE_TASK=spec:chrome ALWAYS_LOCATE=false
+  - RAKE_TASK=spec:chrome PREFER_CSS=1 SELECTOR_STATS=1
+  - RAKE_TASK=spec:phantomjs
+  - RAKE_TASK=spec:phantomjs ALWAYS_LOCATE=false
+  - RAKE_TASK=spec:phantomjs PREFER_CSS=1 SELECTOR_STATS=1
   - RAKE_TASK=yard:doctest

data/CHANGES.md

@@ -1,3 +1,9 @@
+### 0.9.1 (2015-10-14)
+
+* Fix permissions issue with element_locator file(#381)
+* Trying to select a disabled option now raises `ObjectDisabledException` (#378)
+* `Element#enabled?` raises `UnknownObjectException` if element is not present (#379)
+
 ### 0.9.0 (2015-10-08)
 
 * Improve performance for Select#include? (#375, thanks @Conky5)

data/lib/watir-webdriver/elements/button.rb

@@ -34,16 +34,6 @@ module Watir
       end
     end
 
-    #
-    # Returns true if this element is enabled.
-    #
-    # @return [Boolean]
-    #
-
-    def enabled?
-      !disabled?
-    end
-
     private
 
     def locator_class

data/lib/watir-webdriver/elements/element.rb

@@ -410,7 +410,8 @@ module Watir
     #
 
     def enabled?
-      present? && element_call { @element.enabled? }
+      assert_exists
+      element_call { @element.enabled? }
     end
 
     #

data/lib/watir-webdriver/elements/input.rb

@@ -3,15 +3,5 @@ module Watir
 
     alias_method :readonly?, :read_only?
 
-    #
-    # Returns true if input is enabled.
-    #
-    # @return [Boolean]
-    #
-
-    def enabled?
-      !disabled?
-    end
-
   end # Input
 end # Watir

data/lib/watir-webdriver/elements/select.rb

@@ -2,16 +2,6 @@ module Watir
   class Select < HTMLElement
     include Watir::Exception
 
-    #
-    # Returns true if this element is enabled
-    #
-    # @return [Boolean]
-    #
-
-    def enabled?
-      !disabled?
-    end
-
     #
     # Clears all selected options.
     #
@@ -22,7 +12,7 @@ module Watir
       raise Error, "you can only clear multi-selects" unless multiple?
 
       options.each do |o|
-        o.click if o.selected?
+        click_option(o) if o.selected?
       end
     end
 
@@ -156,7 +146,7 @@ module Watir
         end
         no_value_found(string) if elements.empty?
 
-        elements.each { |e| e.click unless e.selected? }
+        elements.each { |e| click_option(e) unless e.selected? }
         elements.first.text
       else
         begin
@@ -167,8 +157,7 @@ module Watir
           no_value_found(string)
         end
 
-        e.click unless e.selected?
-
+        click_option(e) unless e.selected?
         safe_text(e)
       end
     end
@@ -182,7 +171,7 @@ module Watir
       if multiple?
         found = elements.select do |e|
           next unless matches_regexp?(how, e, exp)
-          e.click unless e.selected?
+          click_option(e) unless e.selected?
           true
         end
 
@@ -193,8 +182,7 @@ module Watir
         element = elements.find { |e| matches_regexp?(how, e, exp) }
         no_value_found(exp) unless element
 
-        element.click unless element.selected?
-
+        click_option(element) unless element.selected?
         safe_text(element)
       end
     end
@@ -223,6 +211,11 @@ module Watir
       end
     end
 
+    def click_option(element)
+      element = Option.new(self, element: element) unless element.is_a?(Option)
+      element.click
+    end
+
     def safe_text(element)
       element.text
     rescue Selenium::WebDriver::Error::StaleElementReferenceError, Selenium::WebDriver::Error::UnhandledAlertError

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/spec/always_locate_spec.rb

@@ -4,7 +4,7 @@ describe 'Watir' do
   describe '#always_locate?' do
 
     before do
-      browser.goto WatirSpec.url_for('removed_element.html', needs_server: true)
+      browser.goto WatirSpec.url_for('removed_element.html')
     end
 
     it 'determines whether #exist? returns false for stale element' do

data/spec/click_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path('../watirspec/spec_helper', __FILE__)
 describe Watir::Element do
   describe "#click" do
     before {
-      browser.goto WatirSpec.url_for('clicks.html', needs_server: true)
+      browser.goto WatirSpec.url_for('clicks.html')
     }
 
     let(:clicker) { browser.element(id: "click-logger") }

data/spec/element_spec.rb

@@ -4,7 +4,7 @@ describe Watir::Element do
 
   describe '#present?' do
     before do
-      browser.goto(WatirSpec.url_for("wait.html", needs_server: true))
+      browser.goto(WatirSpec.url_for("wait.html"))
     end
 
     it 'returns true if the element exists and is visible' do
@@ -31,9 +31,27 @@ describe Watir::Element do
 
   end
 
+  describe "#enabled?" do
+    before do
+      browser.goto(WatirSpec.url_for("forms_with_input_elements.html"))
+    end
+
+    it "returns true if the element is enabled" do
+      expect(browser.element(name: 'new_user_submit')).to be_enabled
+    end
+
+    it "returns false if the element is disabled" do
+      expect(browser.element(name: 'new_user_submit_disabled')).to_not be_enabled
+    end
+
+    it "raises UnknownObjectException if the element doesn't exist" do
+      expect { browser.element(name: "no_such_name").enabled? }.to raise_error(Watir::Exception::UnknownObjectException)
+    end
+  end
+
   describe "#reset!" do
     it "successfully relocates collection elements after a reset!" do
-      browser.goto(WatirSpec.url_for("wait.html", needs_server: true))
+      browser.goto(WatirSpec.url_for("wait.html"))
       element = browser.div(:id, 'foo')
       expect(element).to exist
       browser.refresh
@@ -45,7 +63,7 @@ describe Watir::Element do
 
   describe "#exists?" do
     before do
-      browser.goto WatirSpec.url_for('removed_element.html', needs_server: true)
+      browser.goto WatirSpec.url_for('removed_element.html')
     end
 
     it "does not propagate StaleElementReferenceErrors" do
@@ -93,7 +111,7 @@ describe Watir::Element do
   describe "#element_call" do
 
     it 'handles exceptions when taking an action on an element that goes stale during execution' do
-      browser.goto WatirSpec.url_for('removed_element.html', needs_server: true)
+      browser.goto WatirSpec.url_for('removed_element.html')
 
       watir_element = browser.div(id: "text")
 
@@ -119,7 +137,7 @@ describe Watir::Element do
                      %i(webdriver iphone),
                      %i(webdriver safari) do
       it "should hover over the element" do
-        browser.goto WatirSpec.url_for('hover.html', needs_server: true)
+        browser.goto WatirSpec.url_for('hover.html')
         link = browser.a
 
         expect(link.style("font-size")).to eq "10px"

data/spec/special_chars_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path('watirspec/spec_helper', File.dirname(__FILE__))
 describe Watir::Browser do
 
   before do
-    browser.goto WatirSpec.url_for("special_chars.html", needs_server: true)
+    browser.goto WatirSpec.url_for("special_chars.html")
   end
 
   it "finds elements with single quotes" do

data/support/travis.sh

@@ -9,7 +9,7 @@ git submodule update --init
 mkdir ~/.yard
 bundle exec yard config -a autoload_plugins yard-doctest
 
-if [[ "$WATIR_WEBDRIVER_BROWSER" = "chrome" ]]; then
+if [[ "$RAKE_TASK" = "spec:chrome" ]]; then
   export CHROME_REVISION=`curl -s http://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/LAST_CHANGE`
   export CHROMEDRIVER_VERSION=`curl -s http://chromedriver.storage.googleapis.com/LATEST_RELEASE`
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir-webdriver
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -276,10 +276,6 @@ files:
 - spec/container_spec.rb
 - spec/element_locator_spec.rb
 - spec/element_spec.rb
-- spec/html/clicks.html
-- spec/html/hover.html
-- spec/html/removed_element.html
-- spec/html/special_chars.html
 - spec/implementation.rb
 - spec/input_spec.rb
 - spec/locator_spec_helper.rb
@@ -309,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: watir-webdriver
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Watir on WebDriver
@@ -320,10 +316,6 @@ test_files:
 - spec/container_spec.rb
 - spec/element_locator_spec.rb
 - spec/element_spec.rb
-- spec/html/clicks.html
-- spec/html/hover.html
-- spec/html/removed_element.html
-- spec/html/special_chars.html
 - spec/implementation.rb
 - spec/input_spec.rb
 - spec/locator_spec_helper.rb

data/spec/html/clicks.html

@@ -1,19 +0,0 @@
-<html>
-  <head>
-    <script src="../watirspec/html/javascript/jquery-1.7.1.min.js" type="text/javascript" charset="utf-8"></script>
-  </head>
-  <script>
-  $(document).ready(function() {
-    $("#click-logger").click(function(evt) {
-      $("#log").append("<p>shift=" + evt.shiftKey + " alt=" + evt.altKey + "</p>");
-    });
-  });
-  </script>
-  <body>
-    <div id="click-logger">click me</div>
-    <div id="log"></div>
-    <div>
-      <div onclick="this.innerHTML = 'You Clicked It!'" style="color: red; text-decoration: underline; cursor: pointer;">Can You Click This?</div>
-    </div>
-  </body>
-</html>

data/spec/html/hover.html

@@ -1,12 +0,0 @@
-<html>
-  <head>
-  <style type="text/css" media="screen">
-    a { font-size: 10px; }
-    a:hover { font-size: 20px; }
-  </style>
-  </head>
-
-  <body>
-    <a href="#">hello</a>
-  </body>
-</html>

data/spec/html/removed_element.html

@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-  <head>
-    <title>obsolete element</title>
-    <script type="text/javascript" charset="utf-8">
-      function removeText() {
-        var e = document.getElementById("text");
-        e.parentNode.removeChild(e);
-      }
-    </script>
-  </head>
-
-  <body>
-    <button id='remove-button' onclick="removeText()">Remove text</button>
-    <div id="text">Text</div>
-
-    <div id='top'>Top Element>
-      <div id='middle'>Middle Element>
-        <div id='bottom'>Bottom Element</div>
-      </div>
-    </div>
-
-  </body>
-</html>

data/spec/html/special_chars.html

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>Special Chars</title>
-  </head>
-
-  <body>
-      <div id='single-quote'>single 'quotes'</div>
-      <div id='double-quote'>double "quotes"</div>
-  </body>
-</html>