watir-classic 3.4.0 → 3.5.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjFhN2FkNjA3OWY3Y2NjM2ZiM2UwNGU3OWRhNWJmY2ViYThjMDc1Ng==
+  data.tar.gz: !binary |-
+    OTU2NmYzOWZkZmY2NGM5ZDgxOWVjZDUxZWZjYzhhYWU5MTZlN2VjNA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZTg1ODg2NjFjZTUyYzM2MGQxODhmYjY1NzkwOTVkNTRkNzY2MDNjYzUwYTRj
+    ZjI4ZGJmNDA0MWFhMjk1YTI2ZDljNDkzMjVhNjUwMGQyOGJiODkwZWZiOWJl
+    N2EyOWY4NTIzN2Q0OWJiYWEyY2MzNjcyNDU5Yjc4YjUzOTI2ZWQ=
+  data.tar.gz: !binary |-
+    OTYyNWQ2YjVkYjA4NWQyMjFlZWQwYWNiNDNjYjA2MWFhYWQ0M2VmNDE4YTI0
+    ZTdhNzBlNGQ2MjY1MGE5ZTNhYmFmNjJmMTlkMDJjMjE4MjI1NzgwNjhjNTFi
+    MjJmY2NlNzk0OTVlY2Y4YWQ5OTcyMDZjZTdlZWYzZmFjYmVjMDg=

data/CHANGES

@@ -1,3 +1,11 @@
+== 3.5.0 - 2013/03/10
+
+* Browser#name returns :internet_explorer instead of :ie.
+* Element#visible? returns true for child element with visibility set to visible even if parent has visibility set to hidden. Fixes #52.
+* Loosen up RAutomation dependency version.
+* Make FileField window titles, button values etc configurable for multi language environments. Closes #50.
+* When searching elements with :css locator then elements should be of class Watir::Element. Closes https://github.com/watir/watir/issues/7
+
 == 3.4.0 - 2013/01/06
 
 * All deprecated methods will print out warnings.

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source "https://rubygems.org"
 
 gemspec

data/Gemfile.lock

@@ -1,71 +1,74 @@
 PATH
   remote: .
   specs:
-    watir-classic (3.3.0)
+    watir-classic (3.4.0)
       ffi (~> 1.0)
       multi_json
       nokogiri
-      rautomation (~> 0.7.2)
+      rautomation (~> 0.7)
       user-choices
       win32-process (>= 0.5.5)
       win32screenshot
       windows-pr (>= 0.6.6)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    builder (3.1.4)
-    childprocess (0.3.4)
-      ffi (~> 1.0, >= 1.0.6)
-    diff-lcs (1.1.3)
-    ffi (1.1.3-x86-mingw32)
-    hoe (3.3.0)
-      rake (~> 0.8)
-    mini_magick (3.2.1)
-      subexec (~> 0.0.4)
-    multi_json (1.3.7)
-    nokogiri (1.5.5-x86-mingw32)
-    rack (1.4.1)
-    rack-protection (1.2.0)
+    builder (3.2.0)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    diff-lcs (1.2.1)
+    ffi (1.4.0)
+    ffi (1.4.0-x86-mingw32)
+    hoe (3.5.1)
+      rake (>= 0.8, < 11.0)
+    mini_magick (3.5.0)
+      subexec (~> 0.2.1)
+    multi_json (1.6.1)
+    nokogiri (1.5.6)
+    nokogiri (1.5.6-x86-mingw32)
+    rack (1.5.2)
+    rack-protection (1.4.0)
       rack
-    rake (0.9.4)
-    rautomation (0.7.3)
+    rake (10.0.3)
+    rautomation (0.8.0)
       ffi
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.0)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
     s4t-utils (1.0.4)
       hoe (>= 1.3.0)
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
+    sinatra (1.3.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
-    subexec (0.0.4)
+    subexec (0.2.2)
     syntax (1.0.0)
-    tilt (1.3.3)
+    tilt (1.3.4)
     user-choices (1.1.6.1)
       builder (>= 2.1.2)
       s4t-utils (>= 1.0.3)
       xml-simple (>= 1.0.11)
+    win32-api (1.4.8)
     win32-api (1.4.8-x86-mingw32)
-    win32-process (0.7.0)
+    win32-process (0.7.1)
       ffi (>= 1.0.0)
-    win32screenshot (1.0.7)
+    win32screenshot (1.0.8)
       ffi (~> 1.0)
-      mini_magick (~> 3.2.1)
-      rautomation (~> 0.7.0)
+      mini_magick (~> 3.2)
+      rautomation (~> 0.7)
     windows-api (0.4.2)
       win32-api (>= 1.4.5)
     windows-pr (1.2.2)
       win32-api (>= 1.4.5)
       windows-api (>= 0.3.0)
     xml-simple (1.1.2)
-    yard (0.8.3)
+    yard (0.8.5.2)
 
 PLATFORMS
   x86-mingw32

data/VERSION

@@ -1 +1 @@
-3.4.0
+3.5.0

data/lib/watir-classic/dialogs/alert.rb

@@ -8,7 +8,7 @@ module Watir
     #
     # @example When the title of your IE dialog is missing, add a new one:
     #   Watir::Alert::WINDOW_TITLES << "My missing title"
-    WINDOW_TITLES = ['Message from webpage', 'Windows Internet Explorer', 'Microsoft Internet Explorer', /Mensaje de p.*/, "Explorer User Prompt"]
+    WINDOW_TITLES = ['Message from webpage', 'Windows Internet Explorer', 'Microsoft Internet Explorer', /Mensaje de p.*/, 'Explorer User Prompt']
 
     def initialize(container)
       @container = container
@@ -47,7 +47,7 @@ module Watir
     private 
 
     def dialog
-      @window ||= RAutomation::Window.new(:hwnd => @container.hwnd).child(:title => /^(#{WINDOW_TITLES.join('|')})$/)
+      @window ||= RAutomation::Window.new(:hwnd => @container.hwnd).child(:title => Regexp.new("^#{Regexp.union WINDOW_TITLES}$", Regexp::IGNORECASE))
     end
 
     def wait_until_not_exists

data/lib/watir-classic/dialogs/file_field.rb

@@ -1,6 +1,24 @@
 module Watir
   # Returned by {Container#file_field}.
   class FileField < InputElement
+    # File upload dialog titles to search for.
+    #
+    # @example When the title of your IE dialog is missing, add a new one:
+    #   Watir::FileField::WINDOW_TITLES << "My missing title"    
+    WINDOW_TITLES = [/choose file( to upload)?/i, "Elegir archivos para cargar", "Datei zum Hochladen"] 
+
+    # File upload dialog "OK" button values to search for.
+    #
+    # @example When the "OK" button of your IE is missing, add a new one:
+    #   Watir::FileField::OK_BUTTON_VALUES << "My missing button value"    
+    OK_BUTTON_VALUES = ['&Open', '&Abrir', '&ffnen']
+
+    # File upload dialog "Cancel" button values to search for.
+    #
+    # @example When the "Cancel" button of your IE is missing, add a new one:
+    #   Watir::FileField::CANCEL_BUTTON_VALUES << "My missing button value"    
+    CANCEL_BUTTON_VALUES = ['Cancel', 'Abbrechen']
+
     # Set the path of the file field.
     #
     # @example
@@ -31,15 +49,21 @@ module Watir
     end
 
     def open_button
-      file_upload_window.button(:value => /&Open|&Abrir/)
+      file_upload_window.button(:value => formatted_regexp(OK_BUTTON_VALUES))
     end
 
     def cancel_button
-      file_upload_window.button(:value => /Cancel/)
+      file_upload_window.button(:value => formatted_regexp(CANCEL_BUTTON_VALUES))
     end
 
     def file_upload_window
-      @window ||= RAutomation::Window.new(:title => /^choose file( to upload)?|Elegir archivos para cargar$/i)
+      @window ||= RAutomation::Window.new(:title => formatted_regexp(WINDOW_TITLES))
+    end
+
+    private
+
+    def formatted_regexp(values)
+      Regexp.new("^#{Regexp.union values}$", Regexp::IGNORECASE)
     end
 
   end

data/lib/watir-classic/element.rb

@@ -251,12 +251,17 @@ module Watir
       # Now iterate up the DOM element tree and return false if any
       # parent element isn't visible 
       assert_exists
+      visible_child = false
       object = @o
       while object
         begin
-          if object.currentstyle.invoke('visibility') =~ /^hidden$/i
+          visibility = object.currentstyle.invoke('visibility')
+          if visibility =~ /^visible$/i
+            visible_child = true
+          elsif !visible_child && visibility =~ /^hidden$/i
             return false
           end
+
           if object.currentstyle.invoke('display') =~ /^none$/i
             return false
           end

data/lib/watir-classic/ie-class.rb

@@ -306,9 +306,9 @@ module Watir
       @hwnd ||= @ie.hwnd
     end
 
-    # @return [Symbol] the name of the browser. Is always :ie.
+    # @return [Symbol] the name of the browser. Is always :internet_explorer.
     def name
-      :ie
+      :internet_explorer
     end
 
     # @return [Boolean] true when IE is window exists, false otherwise.
@@ -523,7 +523,7 @@ module Watir
     # Gives focus to the window frame.
     def focus
       active_element = document.activeElement
-      active_element.blur unless active_element.tagName == "BODY"
+      active_element.blur if active_element && active_element.tagName != "BODY"
       document.focus
     end
 

data/lib/watir-classic/locator.rb

@@ -15,7 +15,7 @@ module Watir
     def each
       if has_excluding_specifiers?
         locate_elements_by_xpath_css_ole.each do |element|
-          yield element
+          yield create_element element
         end
       else
         @tags.each do |tag|

data/spec/elements_spec.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+require File.expand_path("watirspec/spec_helper", File.dirname(__FILE__))
+
+describe "Elements" do
+
+  before :each do
+    browser.goto(WatirSpec.url_for("non_control_elements.html"))
+  end
+
+  it "returns a collection of Watir::Element when searching with :css" do
+    elements = browser.elements(:css => "div")
+    elements.size.should > 0
+    elements.each do |element|
+      element.class.should == Watir::Element 
+    end
+  end
+
+end

data/spec/implementation.rb

@@ -6,11 +6,11 @@ WatirSpec.implementation do |imp|
 
   WatirSpec.persistent_browser = false
   imp.browser_class = Watir::IE
-  browser = :ie
-  browser_version = "ie#{imp.browser_class.version.to_i}".to_sym
+  browser = :internet_explorer
+  browser_version = "#{browser}#{imp.browser_class.version.to_i}".to_sym
 
   imp.guard_proc = lambda { |args|
-    args.any? {|arg| arg == :watir_classic || arg == [:watir_classic, browser] || arg == :ie || arg == browser_version || arg == [:watir_classic, browser_version] }
+    args.any? {|arg| arg == :watir_classic || arg == [:watir_classic, browser] || arg == browser.to_sym || arg == browser_version || arg == [:watir_classic, browser_version] }
   }
 end
 

data/watir-classic.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'windows-pr', '>= 0.6.6'
   s.add_dependency 'nokogiri'
   s.add_dependency 'ffi', '~>1.0'
-  s.add_dependency 'rautomation', '~>0.7.2'
+  s.add_dependency 'rautomation', '~>0.7'
   s.add_dependency 'user-choices'
   s.add_dependency 'multi_json'
   s.add_dependency 'win32screenshot'

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: watir-classic
 version: !ruby/object:Gem::Version
-  version: 3.4.0
-  prerelease: 
+  version: 3.5.0
 platform: ruby
 authors:
 - Bret Pettichord
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-06 00:00:00.000000000 Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: win32-process
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: windows-pr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,23 +69,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rautomation
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: user-choices
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: win32screenshot
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: syntax
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -190,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -198,7 +174,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -206,7 +181,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -214,7 +188,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -301,6 +274,7 @@ files:
 - lib/watir-classic/yard/global_macros.rb
 - spec/browser_spec.rb
 - spec/element_spec.rb
+- spec/elements_spec.rb
 - spec/frame_spec.rb
 - spec/implementation.rb
 - spec/link_spec.rb
@@ -308,18 +282,17 @@ files:
 - watir-classic.gemspec
 homepage: http://watir.com/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
@@ -327,13 +300,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Microsoft Windows running Internet Explorer 5.5 or later.
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Automated testing tool for web applications.
 test_files:
 - spec/browser_spec.rb
 - spec/element_spec.rb
+- spec/elements_spec.rb
 - spec/frame_spec.rb
 - spec/implementation.rb
 - spec/link_spec.rb