watir 1.7.0.rc1 → 1.7.0

data/CHANGES

@@ -1,8 +1,8 @@
-== Version 1.7.0 - 2010/12/20
+== Version 1.7.0 - 2011/01/06
 
 === IE improvements
 
-* Fixed Watir::IE#close_all. Closes http://jira.openqa.org/browse/WTR-463 (Jarmo Pertman)
+* Fixed Watir::IE#close_all to close all IE windows, even the ones with tabs. Closes http://jira.openqa.org/browse/WTR-463 (Jarmo Pertman)
 * IE#wait waits now again until browser has a state of READYSTATE_COMPLETE due to strange timing issues. Closes http://jira.openqa.org/browse/WTR-466 (Jarmo Pertman)
 * Added CSS3 selectors with usage like browser.text_field(:css => "input[name='text1']") (Jonas Tingeborn)
 * Updated bundled version of AutoIt to 3.3.6.1. Closes http://jira.openqa.org/browse/WTR-440 (Jarmo Pertman)
@@ -12,6 +12,12 @@
 * Fixed Element#exists? for cases where nested elements were used for locating (Alok Menghrajani)
 * Ignore uppercase tags in XHTML when searching for elements (Alok Menghrajani)
 
+=== General improvements
+
+* Return Element#id correctly when using Element#when_present and friends methods. Closes http://jira.openqa.org/browse/WTR-469 (Jarmo Pertman)
+
+Whole Changelog is available at http://github.com/bret/watir/compare/v1.6.7...v1.7.0
+
 == Version 1.6.7 - 2010/10/26
 
 === General improvements

data/VERSION

@@ -1 +1 @@
-1.7.0.rc1
+1.7.0

data/lib/watir/ie-class.rb

@@ -233,14 +233,18 @@ module Watir
     # Yields successively to each IE window on the current desktop. Takes a block.
     # This method will not work when
     # Watir/Ruby is run under a service (instead of a user).
-	# Yields to the window and its hwnd.
+    # Yields to the window and its hwnd.
     def self.each
       shell = WIN32OLE.new('Shell.Application')
+      ie_browsers = []
       shell.Windows.each do |window|
         next unless (window.path =~ /Internet Explorer/ rescue false)
         next unless (hwnd = window.hwnd rescue false)
         ie = IE.bind(window)
         ie.hwnd = hwnd
+        ie_browsers << ie
+      end
+      ie_browsers.each do |ie|
         yield ie
       end
     end
@@ -312,7 +316,7 @@ module Watir
   	# Are we attached to an open browser?
     def exists?
       begin
-        @ie.name =~ /Internet Explorer/
+        !!(@ie.name =~ /Internet Explorer/)
       rescue WIN32OLERuntimeError
         false
       end
@@ -398,7 +402,13 @@ module Watir
       wait rescue nil
       chwnd = @ie.hwnd.to_i
       @ie.quit
-      while Win32API.new("user32","IsWindow", 'L', 'L').Call(chwnd) == 1
+      t = Time.now
+      while exists?
+        # just in case to avoid possible endless loop
+        if Time.now - t > 10
+          puts "Impossible to close all IE windows, continuing."
+          break
+        end
         sleep 0.3
       end
     end

data/unittests/close_all_test.rb

@@ -0,0 +1,17 @@
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
+require 'unittests/setup'
+
+class TC_CloseAllWindows < Watir::TestCase
+  
+  def setup
+    @browsers = []
+    5.times {@browsers << Watir::Browser.new}
+  end
+
+  def test_close_all_windows
+    assert @browsers.all? {|browser| browser.exists?}
+    Watir::IE.close_all
+    assert @browsers.all? {|browser| not browser.exists?}
+  end
+  
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watir
 version: !ruby/object:Gem::Version 
-  hash: 977940582
-  prerelease: true
+  hash: 11
+  prerelease: false
   segments: 
   - 1
   - 7
   - 0
-  - rc1
-  version: 1.7.0.rc1
+  version: 1.7.0
 platform: ruby
 authors: 
 - Bret Pettichord
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 +02:00
+date: 2011-01-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,13 +58,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 977940582
+        hash: 11
         segments: 
         - 1
         - 7
         - 0
-        - rc1
-        version: 1.7.0.rc1
+        version: 1.7.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,13 +74,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 977940582
+        hash: 11
         segments: 
         - 1
         - 7
         - 0
-        - rc1
-        version: 1.7.0.rc1
+        version: 1.7.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -158,6 +155,7 @@ files:
 - unittests/checkbox_test.rb
 - unittests/checkbox_xpath_test.rb
 - unittests/click_no_wait_test.rb
+- unittests/close_all_test.rb
 - unittests/core_tests.rb
 - unittests/css_selector_test.rb
 - unittests/css_test.rb
@@ -335,14 +333,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: 
 - Microsoft Windows running Internet Explorer 5.5 or later.
 rubyforge_project: Watir