watir-webdriver 0.6.1 → 0.6.2

data/lib/watir-webdriver/xpath_support.rb

@@ -13,5 +13,9 @@ module Watir
       end
     end
 
+    def self.downcase(value)
+      "translate(#{value},'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz')"
+    end
+
   end # XpathSupport
 end # Watir

data/lib/yard/handlers/watir.rb

@@ -52,4 +52,4 @@ module YARD
       end # AttributesHandler
     end # Watir
   end # Handlers
-end
+end # YARD

data/spec/element_locator_spec.rb

@@ -121,8 +121,21 @@ describe Watir::ElementLocator do
         locate_one selector, Watir::Anchor.attributes
       end
 
+      it "wraps :type attribute with translate() for upper case values" do
+        translated_type = "translate(@type,'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz')"
+        expect_one :xpath, ".//input[#{translated_type}='file']"
+
+        selector = [
+          :tag_name, "input",
+          :type    , "file",
+        ]
+
+        locate_one selector, Watir::Input.attributes
+      end
+
       it "uses the corresponding <label>'s @for attribute when locating by label" do
-        expect_one :xpath, ".//input[@type='text' and @id=//label[normalize-space()='foo']/@for]"
+        translated_type = "translate(@type,'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz')"
+        expect_one :xpath, ".//input[#{translated_type}='text' and @id=//label[normalize-space()='foo']/@for]"
 
         selector = [
           :tag_name, "input",

data/spec/html/clicks.html

@@ -13,4 +13,4 @@
     <div id="click-logger">click me</div>
     <div id="log"></div>
   </body>
-</html>
+</html>

data/spec/implementation.rb

@@ -11,7 +11,7 @@ class ImplementationConfig
     set_guard_proc
     add_html_routes
 
-    WatirSpec.always_use_server = mobile? || ie? || safari?
+    WatirSpec.always_use_server = mobile? || ie? || safari? || remote?
   end
 
   private
@@ -27,6 +27,8 @@ class ImplementationConfig
              firefox_args
            when :chrome
              chrome_args
+           when :remote
+             remote_args
            else
              [browser, {}]
            end
@@ -52,19 +54,29 @@ class ImplementationConfig
     browser == :safari
   end
 
+  def remote?
+    browser == :remote
+  end
+
   def set_guard_proc
+    matching_browser = remote? ? remote_browser : browser
     matching_guards = [
-      :webdriver,            # guard only applies to webdriver
-      browser,               # guard only applies to this browser
-      [:webdriver, browser]  # guard only applies to this browser on webdriver
+      :webdriver,                     # guard only applies to webdriver
+      matching_browser,               # guard only applies to this browser
+      [:webdriver, matching_browser]  # guard only applies to this browser on webdriver
     ]
 
     if native_events?
       # guard only applies to this browser on webdriver with native events enabled
-      matching_guards << [:webdriver, browser, :native_events]
+      matching_guards << [:webdriver, matching_browser, :native_events]
     else
       # guard only applies to this browser on webdriver with native events disabled
-      matching_guards << [:webdriver, browser, :synthesized_events]
+      matching_guards << [:webdriver, matching_browser, :synthesized_events]
+    end
+
+    if !Selenium::WebDriver::Platform.linux? || ENV['DESKTOP_SESSION']
+      # some specs (i.e. Window#maximize) needs a window manager on linux
+      matching_guards << [:webdriver, matching_browser, :window_manager]
     end
 
     @imp.guard_proc = lambda { |args|
@@ -100,6 +112,10 @@ class ImplementationConfig
     [:chrome, opts]
   end
 
+  def remote_args
+    [:remote, {:url => ENV["WATIR_WEBDRIVER_REMOTE_URL"] || "http://127.0.0.1:8080"}]    
+  end
+
   def add_html_routes
     glob = File.expand_path("../html/*.html", __FILE__)
     Dir[glob].each do |path|
@@ -111,6 +127,13 @@ class ImplementationConfig
     @browser ||= (ENV['WATIR_WEBDRIVER_BROWSER'] || :firefox).to_sym
   end
 
+  def remote_browser
+    remote_browser = @imp.browser_class.new(*@imp.browser_args)
+    remote_browser.browser.name
+  ensure
+    remote_browser.close
+  end
+
   def native_events?
     if ENV['NATIVE_EVENTS'] == "true"
       true

data/spec/wait_spec.rb

@@ -49,7 +49,7 @@ not_compliant_on [:webdriver, :safari] do
         called = false
 
         browser.a(:id, 'show_bar').click
-        browser.div(:id, 'bar').when_present(1) { called = true }
+        browser.div(:id, 'bar').when_present(2) { called = true }
 
         called.should be_true
       end
@@ -58,7 +58,7 @@ not_compliant_on [:webdriver, :safari] do
         browser.a(:id, 'show_bar').click
 
         bar = browser.div(:id, 'bar')
-        bar.when_present(1).click
+        bar.when_present(2).click
         bar.text.should == "changed"
       end
 

data/support/travis.sh

@@ -1,7 +1,10 @@
 #/bin/sh
 
-CHROME_REVISION=127410
-sh -e /etc/init.d/xvfb start && git submodule update --init || exit 1
+set -e
+set -x
+
+CHROME_REVISION=142910
+sh -e /etc/init.d/xvfb start && git submodule update --init
 
 if [[ "$WATIR_WEBDRIVER_BROWSER" = "chrome" ]]; then
   sudo apt-get install -y unzip libxss1
@@ -10,4 +13,3 @@ if [[ "$WATIR_WEBDRIVER_BROWSER" = "chrome" ]]; then
   curl -L "http://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux/$CHROME_REVISION/chrome-linux.test/chromedriver" > chrome-linux/chromedriver
   chmod +x chrome-linux/chromedriver
 fi
-

data/support/version_differ.rb

@@ -0,0 +1,59 @@
+class VersionDiffer
+
+  def print_latest(io = $stdout)
+    io.puts diff(last_version, ".")
+  end
+
+  def update(path)
+    old = File.read(path)
+    File.open(path, "w") do |file|
+      show_latest(file)
+      file << old
+    end
+  end
+
+  def generate(path)
+    versions = released_versions
+    versions.unshift "."
+
+    versions.each_cons(2) do |new_version, old_version|
+      File.open(path, "a") do |file|
+        file << diff(old_version, new_version)
+      end
+    end
+  end
+
+  private
+
+  def last_version
+    released_versions.first
+  end
+
+  def released_versions
+    require 'open-uri'
+    require 'multi_json'
+
+    versions = MultiJson.decode(open("https://rubygems.org/api/v1/versions/watir-webdriver.json").read)
+    versions.map! { |e| e.fetch('number')}
+  end
+
+  def diff(old_version, new_version)
+    puts "diffing #{old_version} -> #{new_version}"
+
+    left = "watir-webdriver-#{old_version}.gem"
+    right = new_version == "." ? new_version : "watir-webdriver-#{new_version}.gem"
+
+    str = StringIO.new
+    str.puts "#{new_version}"
+    str.puts "=" * new_version.length
+    str.puts
+
+    # requires YARD > 0.8.2.1 (i.e. next release at the time of writing)
+    content = `yard diff --all --query '!@private && @api.text != "private" && object.visibility == :public' #{left} #{right} 2>&1`
+    str.puts content.split("\n").map { |line| line.empty? ? line : "   #{line}" }
+    str.puts "\n\n"
+
+    str.string
+  end
+
+end

data/watir-webdriver.gemspec

@@ -22,11 +22,12 @@ Gem::Specification.new do |s|
   s.add_dependency "selenium-webdriver", '>= 2.18.0'
 
   s.add_development_dependency "rspec", "~> 2.6"
-  s.add_development_dependency "yard", "~> 0.7.4"
-  s.add_development_dependency "webidl", ">= 0.1.4"
+  s.add_development_dependency "yard", "~> 0.8.2.1"
+  s.add_development_dependency "webidl", ">= 0.1.5"
   s.add_development_dependency "sinatra", "~> 1.0"
   s.add_development_dependency "rake", "~> 0.9.2"
   s.add_development_dependency "fuubar", "~> 0.0.6"
   s.add_development_dependency "nokogiri"
-  s.add_development_dependency "activesupport", "~> 2.3.5" # for pluralization during code generation
+  s.add_development_dependency "activesupport", "~> 3.0" # for pluralization during code generation
+  s.add_development_dependency "pry"
 end

metadata

@@ -1,176 +1,188 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: watir-webdriver
-version: !ruby/object:Gem::Version 
-  hash: 5
+version: !ruby/object:Gem::Version
+  version: 0.6.2
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 1
-  version: 0.6.1
 platform: ruby
-authors: 
+authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 71
-        segments: 
-        - 2
-        - 18
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.18.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.18.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 7
-        - 4
-        version: 0.7.4
+      - !ruby/object:Gem::Version
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.2.1
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: webidl
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 1
-        - 4
-        version: 0.1.4
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.2.1
+- !ruby/object:Gem::Dependency
+  name: webidl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.5
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: fuubar
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 0
-        - 6
+      - !ruby/object:Gem::Version
         version: 0.0.6
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 3
-        - 5
-        version: 2.3.5
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: WebDriver-backed Watir
-email: 
+email:
 - jari.bakken@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
 - .gitmodules
 - .travis.yml
+- CHANGES.md
 - Gemfile
 - LICENSE
 - README.md
@@ -237,13 +249,11 @@ files:
 - lib/watir-webdriver/window.rb
 - lib/watir-webdriver/xpath_support.rb
 - lib/yard/handlers/watir.rb
-- spec/alert_spec.rb
 - spec/browser_spec.rb
 - spec/click_spec.rb
 - spec/container_spec.rb
 - spec/element_locator_spec.rb
 - spec/element_spec.rb
-- spec/html/alerts.html
 - spec/html/clicks.html
 - spec/html/hover.html
 - spec/html/removed_element.html
@@ -252,54 +262,42 @@ files:
 - spec/implementation.rb
 - spec/input_spec.rb
 - spec/locator_spec_helper.rb
-- spec/screenshot_spec.rb
 - spec/spec_helper.rb
 - spec/special_chars_spec.rb
 - spec/wait_spec.rb
-- support/html5.html
 - support/travis.sh
+- support/version_differ.rb
 - watir-webdriver.gemspec
 homepage: http://github.com/watir/watir-webdriver
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: watir-webdriver
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Watir on WebDriver
-test_files: 
-- spec/alert_spec.rb
+test_files:
 - spec/browser_spec.rb
 - spec/click_spec.rb
 - spec/container_spec.rb
 - spec/element_locator_spec.rb
 - spec/element_spec.rb
-- spec/html/alerts.html
 - spec/html/clicks.html
 - spec/html/hover.html
 - spec/html/removed_element.html
@@ -308,7 +306,6 @@ test_files:
 - spec/implementation.rb
 - spec/input_spec.rb
 - spec/locator_spec_helper.rb
-- spec/screenshot_spec.rb
 - spec/spec_helper.rb
 - spec/special_chars_spec.rb
 - spec/wait_spec.rb