watir 1.6.6 → 1.6.7.rc1

data/CHANGES

@@ -1,3 +1,32 @@
+== Version 1.6.7 - 2010/10/21
+
+=== General improvements
+
+* added new waiting methods on Watir::Element: #when_present, #wait_until_present and #wait_while_present (Jari Bakken and Jarmo Pertman)
+* added new waiting methods on Watir::IE and Watir::Firefox: #wait_until and #wait_while (Jari Bakken and Jarmo Pertman)
+* added method #present? for Watir::Element (Jari Bakken and Jarmo Pertman)
+* deprecated old waiting methods in Watir::Waiter which will be removed in some future version - use Watir::Wait instead (Jarmo Pertman)
+
+=== IE improvements
+
+* removed Watir::Simple (Željko Filipin)
+* #click_no_wait was not working with frame elements. Closes http://jira.openqa.org/browse/WTR-459 (Jarmo Pertman)
+
+=== Firefox improvements
+
+* get_attribute_value now works with attributes named something like "foo-bar" (Alan Shields)
+
+=== Cleanup & Maintenance
+
+* cleaned up repo at GitHub
+* merge licenses into one (Željko Filipin)
+* Rakefile works now under non-Windows systems too (Alan Shields)
+* Removed datahandler.rb
+
+
+Whole Changelog is available at http://github.com/bret/watir/compare/v1.6.6...v1.6.7
+
+
 == Version 1.6.6 - 2010/10/2
 
 === IE improvements

data/LICENSE

@@ -0,0 +1,34 @@
+---------------------------------------------------------------------------
+Copyright (c) 2004 - 2006, Paul Rogers
+Copyright (c) 2006 - 2007, Angrez Singh
+Copyright (c) 2004 - 2010, Bret Pettichord
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+3. Neither the names Paul Rogers, nor Bret Pettichord, nor Angrez Singh nor the names of any
+other contributors to this software may be used to endorse or promote
+products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
+IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------
+(based on BSD Open Source License)

data/VERSION

@@ -1 +1 @@
-1.6.6
+1.6.7.rc1

data/lib/watir/container.rb

@@ -820,7 +820,7 @@ module Watir
     #   * what  - string that we are looking for, ex. the name, or id tag attribute or index of the object we are looking for.
     #   * types - what object types we will look at.
     #   * value - used for objects that have one name, but many values. ex. radio lists and checkboxes
-    def locate_input_element(how, what, types, value=nil)
+    def locate_input_element(how, what, types, value=nil, klass=nil)
       case how
       when :xpath
         return element_by_xpath(what)
@@ -835,6 +835,7 @@ module Watir
       return locator.element if locator.fast_locate
       # todo: restrict search to elements.getElementsByTag('INPUT'); faster
       locator.elements = ole_inner_elements if locator.elements.nil?
+      locator.klass = klass if klass 
       locator.locate
     end
     

data/lib/watir/contrib/enabled_popup.rb

@@ -7,7 +7,7 @@ module Watir
       # Use handle of our parent window to see if we have any currently
       # enabled popup.
       hwnd_modal = 0
-      Waiter.wait_until(timeout) do
+      Wait.until(timeout) do
         hwnd_modal, arr = GetWindow.call(hwnd, GW_ENABLEDPOPUP)
         hwnd_modal > 0
       end

data/lib/watir/core.rb

@@ -1,14 +1,16 @@
 # these require statements are needed for Watir
 # to work with minimum functionality
-#
-# this is needed for #click_no_wait to perform faster
 require 'timeout'
 require 'watir/win32ole'
 
-require 'logger'
+# these are required already in commonwatir, but not when using click_no_wait!
 require 'watir/exceptions'
 require 'watir/matches'
+require 'watir/wait'
+require 'watir/wait_helper'
+require 'watir/element_extensions'
 
+require 'logger'
 require 'watir/core_ext'
 require 'watir/logger'
 require 'watir/container'
@@ -18,6 +20,7 @@ require 'watir/ie-class'
 require 'watir/element'
 require 'watir/element_collections'
 require 'watir/form'
+require 'watir/frame'
 require 'watir/non_control_elements'
 require 'watir/input_elements'
 require 'watir/table'
@@ -25,5 +28,4 @@ require 'watir/image'
 require 'watir/link'
 require 'watir/html_element'
 
-require 'watir/waiter'
 require 'watir/module'

data/lib/watir/element.rb

@@ -2,7 +2,8 @@ module Watir
   # Base class for html elements.
   # This is not a class that users would normally access.
   class Element # Wrapper
-    include Watir::Exception
+    include ElementExtensions
+    include Exception
     include Container # presumes @container is defined
     attr_accessor :container
 
@@ -231,6 +232,7 @@ module Watir
     end
 
     def click_no_wait
+      assert_exists
       assert_enabled
       highlight(:set)
       element = "#{self.class}.new(#{@page_container.attach_command}, :unique_number, #{self.unique_number})"
@@ -256,6 +258,7 @@ module Watir
     private :spawned_click_no_wait_command
 
     def click!
+      assert_exists
       assert_enabled
 
       highlight(:set)
@@ -281,6 +284,7 @@ module Watir
     #   raises: UnknownObjectException  if the object is not found
     #           ObjectDisabledException if the object is currently disabled
     def fire_event(event)
+      assert_exists
       assert_enabled
 
       highlight(:set)
@@ -293,6 +297,7 @@ module Watir
     #   raises: UnknownObjectException  if the object is not found
     #           ObjectDisabledException if the object is currently disabled
     def focus
+      assert_exists
       assert_enabled
       ole_object.focus
     end

data/lib/watir/frame.rb

@@ -53,7 +53,7 @@ module Watir
     end
 
     def attach_command
-      @container.page_container.attach_command + ".frame(#{@how.inspect}, #{@what.inspect})"
+      @container.page_container.attach_command + ".frame(#{@how.inspect}, #{@what.inspect})".gsub('"','\'')
     end
     
   end

data/lib/watir/ie-class.rb

@@ -1,6 +1,7 @@
 module Watir
   class IE
-    include Watir::Exception
+    include WaitHelper
+    include Exception
     include Container
     include PageContainer
 
@@ -294,7 +295,7 @@ module Watir
         Watir::until_with_timeout do
           ieTemp = IE._find how, what
         end
-      rescue TimeOutException
+      rescue Watir::Wait::TimeoutError
         raise NoMatchingWindowFoundException,
                  "Unable to locate a window with #{how} of #{what}"
       end

data/lib/watir/ie-process.rb

@@ -17,7 +17,7 @@ module Watir
       attr_reader :process_id
       
       def window
-        Waiter.wait_until do
+        Wait.until do
           IE.each do | ie |
             window = ie.ie
             hwnd = ie.hwnd

data/lib/watir/ie.rb

@@ -1,40 +1,4 @@
-=begin
-  license
-  ---------------------------------------------------------------------------
-  Copyright (c) 2004 - 2005, Paul Rogers and Bret Pettichord
-  Copyright (c) 2006 - 2008, Bret Pettichord
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-
-  3. Neither the names Paul Rogers, nor Bret Pettichord nor the names of any
-  other contributors to this software may be used to endorse or promote
-  products derived from this software without specific prior written
-  permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
-  IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
-  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  --------------------------------------------------------------------------
-  (based on BSD Open Source License)
-=end
-
+require 'watir'
 require 'watir/core'
 require 'watir/winClicker'
 require 'watir/close_all'
@@ -62,9 +26,7 @@ ARGV.delete('-s')
 
 require 'watir/win32'
 require 'watir/popup'
-require 'watir/frame'
 require 'watir/modal_dialog'
 require 'watir/collections'
-require 'watir'
 
 require 'watir/camel_case'

data/lib/watir/input_elements.rb

@@ -325,6 +325,7 @@ module Watir
     #   Raises ObjectDisabledException if the object is disabled
     #   Raises ObjectReadOnlyException if the object is read only
     def clear
+      assert_exists
       assert_enabled
       assert_not_readonly
       
@@ -346,6 +347,7 @@ module Watir
     #   Raises ObjectDisabledException if the object is disabled
     #   Raises ObjectReadOnlyException if the object is read only
     def append(value)
+      assert_exists
       assert_enabled
       assert_not_readonly
       
@@ -361,6 +363,7 @@ module Watir
     #   Raises ObjectDisabledException if the object is disabled
     #   Raises ObjectReadOnlyException if the object is read only
     def set(value)
+      assert_exists
       assert_enabled
       assert_not_readonly
       
@@ -524,7 +527,7 @@ module Watir
   # most of the methods available to this element are inherited from the Element class
   class RadioCheckCommon < InputElement
     def locate #:nodoc:
-      @o = @container.locate_input_element(@how, @what, self.class::INPUT_TYPES, @value)
+      @o = @container.locate_input_element(@how, @what, self.class::INPUT_TYPES, @value, self.class)
     end
     def initialize(container, how, what, value=nil)
       super container, how, what
@@ -566,6 +569,7 @@ module Watir
     #   Raises UnknownObjectException if its unable to locate an object
     #         ObjectDisabledException IF THE OBJECT IS DISABLED
     def clear
+      assert_exists
       assert_enabled
       highlight(:set)
       set_clear_item(false)
@@ -576,6 +580,7 @@ module Watir
     #   Raises UnknownObjectException  if it's unable to locate an object
     #         ObjectDisabledException  if the object is disabled
     def set
+      assert_exists
       assert_enabled
       highlight(:set)
       @o.scrollIntoView
@@ -595,6 +600,7 @@ module Watir
     #   Raises UnknownObjectException if it's unable to locate an object
     #         ObjectDisabledException if the object is disabled
     def set(value=true)
+      assert_exists
       assert_enabled
       highlight :set
       unless @o.checked == value

data/lib/watir/locator.rb

@@ -89,14 +89,15 @@ module Watir
   end
   class InputElementLocator < Locator
 
-    attr_accessor :document, :element, :elements
+    attr_accessor :document, :element, :elements, :klass
 
     def initialize container, types
       @container = container
       @types = types
       @elements = nil
+      @klass = Element
     end
-
+    
     def specifier= arg
       how, what, value = arg
 
@@ -117,7 +118,13 @@ module Watir
     def locate
       count = 0
       @elements.each do |object|
-        element = Element.new(object)
+        if @klass == Element
+          element = Element.new(object)
+        else
+          element = @klass.new(@container, @specifiers, nil)
+          element.ole_object = object
+          def element.locate; @o; end
+        end
 
         catch :next_element do
           throw :next_element unless @types.include?(element.type)

data/lib/watir/module.rb

@@ -4,12 +4,10 @@ module Watir
 # Directory containing the watir.rb file
   @@dir = File.expand_path(File.dirname(__FILE__))
 
-  ATTACHER = Waiter.new
 # Like regular Ruby "until", except that a TimeOutException is raised
 # if the timeout is exceeded. Timeout is IE.attach_timeout.
   def self.until_with_timeout # block
-    ATTACHER.timeout = IE.attach_timeout
-    ATTACHER.wait_until { yield }
+    Wait.until(IE.attach_timeout) { yield }
   end
 
   @@autoit = nil

data/lib/watir/winClicker.rb

@@ -1,39 +1,3 @@
-=begin
-  license
-  ---------------------------------------------------------------------------
-  Copyright (c) 2004-2006, Paul Rogers and Bret Pettichord
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-
-  3. Neither the names Paul Rogers, nor Bret Pettichord nor the names of any 
-  other contributors to this software may be used to endorse or promote 
-  products derived from this software without specific prior written 
-  permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
-  IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
-  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  --------------------------------------------------------------------------
-  (based on BSD Open Source License)
-=end
-
 =begin rdoc
    This is Watir's window clicker helper class, uses Win32 api
    calls to access buttons and windows. 

data/rakefile.rb

@@ -44,33 +44,3 @@ if defined? Rake::GemPackageTask
 else
   puts 'Warning: without Rubygems packaging tasks are not available'
 end
-
-desc "Create the bonus files zip"
-task :bonus_zip => [:rdoc] do
-
-  begin
-    gem 'rubyzip'
-    require 'zip/zip'
-  rescue LoadError
-    puts "rubyzip needs to be installed: gem install rubyzip."
-    raise
-  end
-  
-  version = File.read("VERSION").strip rescue "0.0.0"
-  bonus_zip = "pkg/watir-bonus-#{version}.zip"
-
-  if File.exist?(bonus_zip)
-    File.delete(bonus_zip)
-  end
-  if !File.directory?("pkg")
-    Dir.mkdir("pkg")
-  end
-  Zip::ZipFile::open(bonus_zip, true) do |zf|
-    Dir['{doc,rdoc,examples,unittests}/**/*'].each { |f| zf.add(f, f) }
-  end
-  
-  puts "  Successfully built BonusZip"
-  puts "  File: #{bonus_zip}"
-  
-end
-