watir-webdriver 0.5.0 → 0.5.1

data/lib/watir-webdriver.rb

@@ -9,6 +9,7 @@ require 'watir-webdriver/window'
 require 'watir-webdriver/has_window'
 require 'watir-webdriver/atoms'
 require 'watir-webdriver/container'
+require 'watir-webdriver/cookies'
 require 'watir-webdriver/locators/element_locator'
 require 'watir-webdriver/locators/button_locator'
 require 'watir-webdriver/locators/text_field_locator'

data/lib/watir-webdriver/browser.rb

@@ -88,9 +88,14 @@ module Watir
     alias_method :quit, :close # TODO: close vs quit
 
     def clear_cookies
+      warn 'Browser#clear_cookies is deprecated and replaced by Browser#cookies (i.e. browser.cookies.clear)'
       @driver.manage.delete_all_cookies
     end
 
+    def cookies
+      @cookies ||= Cookies.new driver.manage
+    end
+
     def text
       @driver.find_element(:tag_name, "body").text
     end

data/lib/watir-webdriver/cookies.rb

@@ -0,0 +1,40 @@
+module Watir
+  class Cookies
+    def initialize(control)
+      @control = control
+    end
+
+    def to_a
+      @control.all_cookies.each do |e|
+        e[:expires] = to_time(e[:expires]) if e[:expires]
+      end
+    end
+
+    def add(name, value, opts = {})
+      @control.add_cookie :name    => name,
+                          :value   => value,
+                          :secure  => opts[:secure],
+                          :path    => opts[:path],
+                          :expires => opts[:expires]
+    end
+
+    def delete(name)
+      @control.delete_cookie(name)
+    end
+
+    def clear
+      @control.delete_all_cookies
+    end
+
+    private
+
+    def to_time(dt)
+      if dt.respond_to?(:to_time)
+        dt.to_time
+      else
+        Time.local t.year, t.month, t.day, t.hour, t.min, t.sec
+      end
+    end
+  end
+end
+

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/watir-webdriver/xpath_support.rb

@@ -1,32 +1,6 @@
 # encoding: utf-8
 module Watir
   module XpathSupport
-    include Selenium
-
-    #
-    # Find the first element matching the given XPath
-    #
-
-    def element_by_xpath(xpath)
-      warn 'element_by_xpath is deprecated and replaced by .element(:xpath, ...)'
-
-      e = wd.find_element(:xpath, xpath)
-      Watir.element_class_for(e.tag_name.downcase).new(self, :element => e)
-    rescue WebDriver::Error::NoSuchElementError
-      Element.new(self, :xpath => xpath)
-    end
-
-    #
-    # Find all elements matching the given XPath
-    #
-
-    def elements_by_xpath(xpath)
-      warn 'elements_by_xpath is deprecated and replaced by .elements(:xpath, ...)'
-
-      wd.find_elements(:xpath, xpath).map do |e|
-        Watir.element_class_for(e.tag_name.downcase).new(self, :element => e)
-      end
-    end
 
     def self.escape(value)
       if value.include? "'"
@@ -38,5 +12,6 @@ module Watir
         "'#{value}'"
       end
     end
+
   end # XpathSupport
 end # Watir

data/spec/alert_spec.rb

@@ -3,7 +3,7 @@ require "watir-webdriver/extensions/alerts"
 
 describe "AlertHelper" do
   before do
-    browser.goto("file://" + File.expand_path("html/alerts.html", File.dirname(__FILE__)))
+    browser.goto WatirSpec.url_for("alerts.html", :needs_server => true)
   end
 
   it "handles an alert()" do

data/spec/browser_spec.rb

@@ -21,7 +21,7 @@ describe Watir::Browser do
   end
 
   describe "#execute_script" do
-    before { browser.goto(WatirSpec.files + "/definition_lists.html") }
+    before { browser.goto WatirSpec.url_for("definition_lists.html") }
 
     it "wraps elements as Watir objects" do
       returned = browser.execute_script("return document.body")
@@ -49,14 +49,14 @@ describe Watir::Browser do
 
   describe "#send_key{,s}" do
     it "sends keystrokes to the active element" do
-      browser.goto WatirSpec.files + "/forms_with_input_elements.html"
+      browser.goto WatirSpec.url_for "forms_with_input_elements.html"
 
       browser.send_keys "hello"
       browser.text_field(:id => "new_user_first_name").value.should == "hello"
     end
 
     it "sends keys to a frame" do
-      browser.goto WatirSpec.files + "/frames.html"
+      browser.goto WatirSpec.url_for "frames.html"
       tf = browser.frame.text_field(:id => "senderElement")
       tf.clear
 
@@ -68,7 +68,7 @@ describe Watir::Browser do
 
   it "raises an error when trying to interact with a closed browser" do
     b = WatirSpec.new_browser
-    b.goto(WatirSpec.files + "/definition_lists.html")
+    b.goto WatirSpec.url_for "definition_lists.html"
     b.close
 
     lambda { b.dl(:id => "experience-list").id }.should raise_error(Error, "browser was closed")

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('file://' + File.expand_path('../html/clicks.html', __FILE__))
+      browser.goto WatirSpec.url_for('clicks.html', :needs_server => true)
     }
 
     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('file://' + File.expand_path('html/wait.html', File.dirname(__FILE__)))
+      browser.goto(WatirSpec.url_for("wait.html", :needs_server => true))
     end
 
     it 'returns true if the element exists and is visible' do
@@ -32,7 +32,7 @@ describe Watir::Element do
 
   describe "#exists?" do
     it "should not propagate ObsoleteElementErrors" do
-      browser.goto 'file://' + File.expand_path('../html/removed_element.html', __FILE__)
+      browser.goto WatirSpec.url_for('removed_element.html', :needs_server => true)
 
       button  = browser.button(:id => "remove-button")
       element = browser.div(:id => "text")
@@ -46,7 +46,7 @@ describe Watir::Element do
   describe "#hover" do
     not_compliant_on [:webdriver, :firefox, :synthesized_events], [:webdriver, :ie] do
       it "should hover over the element" do
-        browser.goto 'file://' + File.expand_path('../html/hover.html', __FILE__)
+        browser.goto WatirSpec.url_for('hover.html', :needs_server => true)
         link = browser.a
 
         link.style("font-size").should == "10px"

data/spec/implementation.rb

@@ -9,6 +9,9 @@ class ImplementationConfig
     set_webdriver
     set_browser_args
     set_guard_proc
+    add_html_routes
+
+    WatirSpec.always_use_server = mobile?
   end
 
   private
@@ -29,6 +32,10 @@ class ImplementationConfig
     end
   end
 
+  def mobile?
+    [:android, :iphone].include? browser
+  end
+
   def set_guard_proc
     matching_guards = [
       :webdriver,            # guard only applies to webdriver
@@ -77,6 +84,13 @@ class ImplementationConfig
     @imp.browser_args = [:chrome, opts]
   end
 
+  def add_html_routes
+    glob = File.expand_path("../html/*.html", __FILE__)
+    Dir[glob].each do |path|
+      WatirSpec::Server.get("/#{File.basename path}") { File.read(path) }
+    end
+  end
+
   def browser
     @browser ||= (ENV['WATIR_WEBDRIVER_BROWSER'] || :firefox).to_sym
   end

data/spec/input_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path('watirspec/spec_helper', File.dirname(__FILE__))
 describe Watir::Input do
 
   before do
-    browser.goto(WatirSpec.files + "/forms_with_input_elements.html")
+    browser.goto WatirSpec.url_for("forms_with_input_elements.html")
   end
 
   describe "#to_subtype" do

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("file://" + File.expand_path("../html/special_chars.html", __FILE__))
+    browser.goto WatirSpec.url_for("special_chars.html", :needs_server => true)
   end
 
   it "finds elements with single quotes" do

data/spec/wait_spec.rb

@@ -41,7 +41,7 @@ end
 describe Watir::Element do
 
   before do
-    browser.goto("file://" + File.expand_path("html/wait.html", File.dirname(__FILE__)))
+    browser.goto WatirSpec.url_for("wait.html", :needs_server => true)
   end
 
   describe "#when_present" do

data/watir-webdriver.gemspec

@@ -38,5 +38,15 @@ Please note that watir-webdriver 0.5.0 brings some backwards incompatible change
   * Finding elements by :class now matches partial class attributes.
       [ https://github.com/watir/watir-webdriver/issues/36 ]
 
+Additionally, watir-webdriver 0.5.1 removes the following deprecated methods:
+
+  * element_by_xpath  : replaced by .element(:xpath, '...')
+  * elements_by_xpath : replaced by .elements(:xpath, '...')
+
+And deprecates the following methods:
+
+ * Browser#clear_cookies - replaced by Browser#cookies API
+   [ https://github.com/watir/watir-webdriver/issues/24 ]
+
   MSG
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watir-webdriver
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Jari Bakken
@@ -188,6 +188,7 @@ files:
 - lib/watir-webdriver/browser.rb
 - lib/watir-webdriver/cell_container.rb
 - lib/watir-webdriver/container.rb
+- lib/watir-webdriver/cookies.rb
 - lib/watir-webdriver/element_collection.rb
 - lib/watir-webdriver/elements/button.rb
 - lib/watir-webdriver/elements/checkbox.rb
@@ -265,6 +266,16 @@ post_install_message: |+
     * Finding elements by :class now matches partial class attributes.
         [ https://github.com/watir/watir-webdriver/issues/36 ]
   
+  Additionally, watir-webdriver 0.5.1 removes the following deprecated methods:
+  
+    * element_by_xpath  : replaced by .element(:xpath, '...')
+    * elements_by_xpath : replaced by .elements(:xpath, '...')
+  
+  And deprecates the following methods:
+  
+   * Browser#clear_cookies - replaced by Browser#cookies API
+     [ https://github.com/watir/watir-webdriver/issues/24 ]
+  
 rdoc_options: []
 
 require_paths: