watir-webdriver 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c27ed00d9c0f60b3ba74da91a1a0543975f6e40
-  data.tar.gz: 9613de99f0a45fdbf00bb61edbfd64ba494b8ef1
+  metadata.gz: 239861d8df43ef5ad7b5fd332dd83e51124a35af
+  data.tar.gz: e9b067ca9f07b67cff031d3f393ae1080c733b66
 SHA512:
-  metadata.gz: 5cb22dd0fe4715b647e43c91d637ea32fcb35747bcca0e0187995eca1ab9fa6ce1ddf3c355c8ce0dbac264f0530bd7ab5f423e8b8bfda6c74102d53170d00430
-  data.tar.gz: 4b0d5ea3f95dc25cb36eec24fc1ee5db4787250aae66eecd65e41ce18644aeef62ac8dcab32eb13a7d6612a0763ff3cf68e19b648ce2cd1ef2072303fe12695e
+  metadata.gz: 3f753181085ffba7dd0b179aee3b2c7db92901cfab1186fb046f99723f7370deface705ee48a8f2ba73cbafb0e1a52c64bc67f781ffc7442d698f18103436ad9
+  data.tar.gz: 52e8ee4f4912a1e3dcca4136a54dea80f4c5d14d4b5d96981d3980c2c149513ee9454cbc042a0d4e52114eb45a0bc155597e9dba7b4f950f462822d9ea176ef9

data/.gitignore

@@ -12,4 +12,6 @@ Gemfile.lock
 .rbx/*
 chromedriver.log
 support/html5.html
-/doc
+/doc
+.idea
+.ruby-version

data/CHANGES.md

@@ -1,3 +1,10 @@
+### 0.6.9 (2014-04-13)
+
+* `Watir::Wait` timer can be re-implemented now (see #242)
+* Added `Watir::Cookies#[]` to retrieve cookie by name (see #251, thanks @mattparlane)
+* Added `Watir::Element#outer_html` (aliased to `#html`) (thanks @aderyabin)
+* Added `Watir::Element#inner_html` (thanks @aderyabin)
+
 ### 0.6.8 (2014-02-20)
 
 * `:css` selector can now be used with `:index` (fixes #241)

data/lib/watir-webdriver/atoms.rb

@@ -10,6 +10,7 @@ module Watir
     load :fireEvent
     load :getAttribute
     load :getOuterHtml
+    load :getInnerHtml
     load :getParentElement
 
     private

data/lib/watir-webdriver/atoms/getInnerHtml.js

@@ -0,0 +1,18 @@
+// Copyright 2011 Software Freedom Conservatory
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+function(){return function(){var d=this;function e(a,b){function c(){}c.prototype=b.prototype;a.b=b.prototype;a.prototype=new c};function f(a){this.stack=Error().stack||"";if(a)this.message=String(a)}e(f,Error);function i(a){for(var b=1;b<arguments.length;b++){var c=String(arguments[b]).replace(/\$/g,"$$$$");a=a.replace(/\%s/,c)}return a}
+function j(a,b){var c=0,A=String(a).replace(/^[\s\xa0]+|[\s\xa0]+$/g,"").split("."),B=String(b).replace(/^[\s\xa0]+|[\s\xa0]+$/g,"").split("."),H=Math.max(A.length,B.length);for(var l=0;c==0&&l<H;l++){var I=A[l]||"",J=B[l]||"",K=RegExp("(\\d*)(\\D*)","g"),L=RegExp("(\\d*)(\\D*)","g");do{var g=K.exec(I)||["","",""],h=L.exec(J)||["","",""];if(g[0].length==0&&h[0].length==0)break;c=k(g[1].length==0?0:parseInt(g[1],10),h[1].length==0?0:parseInt(h[1],10))||k(g[2].length==0,h[2].length==0)||k(g[2],h[2])}while(c==
+0)}return c}function k(a,b){if(a<b)return-1;else if(a>b)return 1;return 0};e(function(a,b){b.unshift(a);f.call(this,i.apply(null,b));b.shift();this.a=a},f);var m,n,o,p;function q(){return d.navigator?d.navigator.userAgent:null}p=o=n=m=false;var r;if(r=q()){var s=d.navigator;m=r.indexOf("Opera")==0;n=!m&&r.indexOf("MSIE")!=-1;o=!m&&r.indexOf("WebKit")!=-1;p=!m&&!o&&s.product=="Gecko"}var t=n,u=p,v=o,w;
+a:{var x="",y;if(m&&d.opera){var z=d.opera.version;x=typeof z=="function"?z():z}else{if(u)y=/rv\:([^\);]+)(\)|;)/;else if(t)y=/MSIE\s+([^\);]+)(\)|;)/;else if(v)y=/WebKit\/(\S+)/;if(y){var C=y.exec(q());x=C?C[1]:""}}if(t){var D,E=d.document;D=E?E.documentMode:undefined;if(D>parseFloat(x)){w=String(D);break a}}w=x}var F={};!t||F["9"]||(F["9"]=j(w,"9")>=0);t&&(F["9"]||(F["9"]=j(w,"9")>=0));function G(a){if("innerHTML"in a)return a.innerHTML;else{var b=(a.nodeType==9?a:a.ownerDocument||a.document).createElement("div");b.appendChild(a.cloneNode(true));return b.innerHTML}}var M="_".split("."),N=d;!(M[0]in N)&&N.execScript&&N.execScript("var "+M[0]);for(var O;M.length&&(O=M.shift());)if(!M.length&&G!==undefined)N[O]=G;else N=N[O]?N[O]:N[O]={};; return this._.apply(null,arguments);}.apply({navigator:typeof window!='undefined'?window.navigator:null}, arguments);}

data/lib/watir-webdriver/cookies.rb

@@ -18,11 +18,26 @@ module Watir
     #
 
     def to_a
-      @control.all_cookies.each do |e|
-        e[:expires] = to_time(e[:expires]) if e[:expires]
+      @control.all_cookies.map do |e|
+        e.merge(:expires => e[:expires] ? to_time(e[:expires]) : nil)
       end
     end
 
+    #
+    # Returns a cookie by name.
+    #
+    # @example
+    #   browser.cookies[:my_session]
+    #   #=> {:name=>"my_session", :value=>"BAh7B0kiD3Nlc3Npb25faWQGOgZFRkk", :domain=>"mysite.com"}
+    #
+    # @param [Symbol] name
+    # @return <Hash> or nil if not found
+    #
+
+    def [](name)
+      to_a.find { |c| c[:name] == name.to_s }
+    end
+
     #
     # Adds new cookie.
     #

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

@@ -284,11 +284,28 @@ module Watir
     # @return [String]
     #
 
-    def html
+    def outer_html
       assert_exists
       execute_atom(:getOuterHtml, @element).strip
     end
 
+    alias_method :html, :outer_html
+
+    #
+    # Returns inner HTML code of element.
+    #
+    # @example
+    #   browser.div(:id => "foo").html
+    #   #=> "<a>Click</a>"
+    #
+    # @return [String]
+    #
+
+    def inner_html
+      assert_exists
+      execute_atom(:getInnerHtml, @element).strip
+    end
+
     #
     # Sends sequence of keystrokes to element.
     #

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

@@ -222,5 +222,7 @@ module Watir
   module Container
     alias_method :select_list,  :select
     alias_method :select_lists, :selects
+
+    Watir.tag_to_class[:select_list] = Select
   end # Container
 end # Watir

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.6.8"
+  VERSION = "0.6.9"
 end

data/lib/watir-webdriver/wait.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'forwardable'
+require 'watir-webdriver/wait/timer'
 
 module Watir
   module Wait
@@ -8,7 +9,22 @@ module Watir
 
     INTERVAL = 0.1
 
+
     class << self
+
+      #
+      # @!attribute timer
+      #   Access Watir timer implementation in use.
+      #   @see Timer
+      #   @return [#wait]
+      #
+
+      attr_writer :timer
+
+      def timer
+        @timer ||= Timer.new
+      end
+
       #
       # Waits until the block evaluates to true or times out.
       #
@@ -22,9 +38,8 @@ module Watir
 
       def until(timeout = nil, message = nil, &block)
         timeout ||= Watir.default_timeout
-        end_time = ::Time.now + timeout
 
-        until ::Time.now > end_time
+        timer.wait(timeout) do
           result = yield(self)
           return result if result
           sleep INTERVAL
@@ -46,9 +61,8 @@ module Watir
 
       def while(timeout = nil, message = nil, &block)
         timeout ||= Watir.default_timeout
-        end_time = ::Time.now + timeout
 
-        until ::Time.now > end_time
+        timer.wait(timeout) do
           return unless yield(self)
           sleep INTERVAL
         end

data/lib/watir-webdriver/wait/timer.rb

@@ -0,0 +1,19 @@
+module Watir
+  module Wait
+    class Timer
+
+      #
+      # Executes given block until it returns true or exceeds timeout.
+      # @param [Fixnum] timeout
+      # @yield block
+      # @api private
+      #
+
+      def wait(timeout, &block)
+        end_time = ::Time.now + timeout
+        yield(block) until ::Time.now > end_time
+      end
+
+    end # Timer
+  end # Wait
+end # Watir

data/spec/browser_spec.rb

@@ -4,13 +4,13 @@ describe Watir::Browser do
 
   describe ".new" do
     it "passes the args to webdriver" do
-      Selenium::WebDriver.should_receive(:for).with(:firefox, :foo).and_return(nil)
+      expect(Selenium::WebDriver).to receive(:for).with(:firefox, :foo).and_return(nil)
       Watir::Browser.new(:firefox, :foo)
     end
 
     it "takes a Driver instance as argument" do
       mock_driver = double(Selenium::WebDriver::Driver)
-      Selenium::WebDriver::Driver.should_receive(:===).with(mock_driver).and_return(true)
+      expect(Selenium::WebDriver::Driver).to receive(:===).with(mock_driver).and_return(true)
       expect { Watir::Browser.new(mock_driver) }.to_not raise_error
     end
 
@@ -29,7 +29,7 @@ describe Watir::Browser do
 
     it "wraps elements in an array" do
       list = browser.execute_script("return [document.body];")
-      list.size.should == 1
+      expect(list.size).to eq 1
       expect(list.first).to be_kind_of(Watir::Body)
     end
 
@@ -41,7 +41,7 @@ describe Watir::Browser do
     it "wraps elements in a deep object" do
       hash = browser.execute_script("return {elements: [document.body], body: {element: document.body }}")
 
-      hash['elements'].first.should be_kind_of(Watir::Body)
+      expect(hash['elements'].first).to be_kind_of(Watir::Body)
       expect(hash['body']['element']).to be_kind_of(Watir::Body)
     end
   end
@@ -75,23 +75,23 @@ describe Watir::Browser do
 
   describe "#wait_while" do
     it "delegates to the Wait module" do
-      Wait.should_receive(:while).with(3, "foo").and_yield
+      expect(Wait).to receive(:while).with(3, "foo").and_yield
 
       called = false
       browser.wait_while(3, "foo") { called = true }
 
-      expect(called).to be_true
+      expect(called).to be true
     end
   end
 
   describe "#wait_until" do
     it "delegates to the Wait module" do
-      Wait.should_receive(:until).with(3, "foo").and_yield
+      expect(Wait).to receive(:until).with(3, "foo").and_yield
 
       called = false
       browser.wait_until(3, "foo") { called = true }
 
-      expect(called).to be_true
+      expect(called).to be true
     end
   end
 
@@ -106,7 +106,6 @@ describe Watir::Browser do
 
   describe "#ready_state" do
     it "gets the document's readyState property" do
-      #browser.should_receive(:execute_script).with('return document.readyState')
       expect(browser).to receive(:execute_script).with('return document.readyState')
       browser.ready_state
     end
@@ -114,7 +113,7 @@ describe Watir::Browser do
 
   describe "#inspect" do
     it "works even if browser is closed" do
-      browser.should_receive(:url).and_raise(Errno::ECONNREFUSED)
+      expect(browser).to receive(:url).and_raise(Errno::ECONNREFUSED)
       expect { browser.inspect }.to_not raise_error
     end
   end

data/spec/element_spec.rb

@@ -58,5 +58,4 @@ describe Watir::Element do
       end
     end
   end
-
 end

data/spec/html/inner_outer.html

@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <div id="foo"><a href="#">hello</a></div>
+  </body>
+</html>

data/spec/locator_spec_helper.rb

@@ -11,11 +11,11 @@ module LocatorSpecHelper
   end
 
   def expect_one(*args)
-    driver.should_receive(:find_element).with(*args)
+    expect(driver).to receive(:find_element).with(*args)
   end
 
   def expect_all(*args)
-    driver.should_receive(:find_elements).with(*args)
+    expect(driver).to receive(:find_elements).with(*args)
   end
 
   def locate_one(selector, attrs = nil)

metadata

@@ -1,167 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: watir-webdriver
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.18.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.2.1
 - !ruby/object:Gem::Dependency
   name: webidl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: WebDriver-backed Watir
@@ -171,11 +171,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".document"
-- ".gitignore"
-- ".gitmodules"
-- ".travis.yml"
-- ".yardopts"
+- .document
+- .gitignore
+- .gitmodules
+- .travis.yml
+- .yardopts
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -188,6 +188,7 @@ files:
 - lib/watir-webdriver/atoms/README
 - lib/watir-webdriver/atoms/fireEvent.js
 - lib/watir-webdriver/atoms/getAttribute.js
+- lib/watir-webdriver/atoms/getInnerHtml.js
 - lib/watir-webdriver/atoms/getOuterHtml.js
 - lib/watir-webdriver/atoms/getParentElement.js
 - lib/watir-webdriver/atoms/selectText.js
@@ -242,6 +243,7 @@ files:
 - lib/watir-webdriver/user_editable.rb
 - lib/watir-webdriver/version.rb
 - lib/watir-webdriver/wait.rb
+- lib/watir-webdriver/wait/timer.rb
 - lib/watir-webdriver/window.rb
 - lib/watir-webdriver/xpath_support.rb
 - lib/yard/handlers/watir.rb
@@ -252,6 +254,7 @@ files:
 - spec/element_spec.rb
 - spec/html/clicks.html
 - spec/html/hover.html
+- spec/html/inner_outer.html
 - spec/html/removed_element.html
 - spec/html/special_chars.html
 - spec/implementation.rb
@@ -272,17 +275,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: watir-webdriver
-rubygems_version: 2.2.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Watir on WebDriver
@@ -294,6 +297,7 @@ test_files:
 - spec/element_spec.rb
 - spec/html/clicks.html
 - spec/html/hover.html
+- spec/html/inner_outer.html
 - spec/html/removed_element.html
 - spec/html/special_chars.html
 - spec/implementation.rb
@@ -301,4 +305,3 @@ test_files:
 - spec/locator_spec_helper.rb
 - spec/spec_helper.rb
 - spec/special_chars_spec.rb
-has_rdoc: