watir 1.6.6.rc1 → 1.6.6.rc2

data/CHANGES

@@ -10,7 +10,7 @@
 * Added an optional numeric parameter max_depth for Table#to_a and TableRow#to_a for getting text values for nested tables. Closes http://jira.openqa.org/browse/WTR-445 (Jarmo Pertman)
 * #close will close the browser even if #wait raises an Exception. Closes http://jira.openqa.org/browse/WTR-443 (Jarmo Pertman)
 * Added #element and #elements methods for locating non-specific elements. Closes http://jira.openqa.org/browse/WTR-103 (Hugh McGowan)
-* #click_no_wait fixes and improvements. Closes http://jira.openqa.org/browse/WTR-449 (Jarmo Pertman)
+* #click_no_wait fixes and improvements. Closes http://jira.openqa.org/browse/WTR-320 and http://jira.openqa.org/browse/WTR-449 (Jarmo Pertman)
 * #wait will raise a Timeout::Error if page hasn't been loaded within 5 minutes. Closes http://jira.openqa.org/browse/WTR-452 (Bret)
 * Fixed a problem when #wait blocked forever. Closes http://jira.openqa.org/browse/WTR-446 (Jarmo Pertman)
 
@@ -26,6 +26,12 @@
 
 * Some rdoc cleanup (marekj)
 * Removed Watir::Utils (Jarmo Pertman)
+* It is now possible to execute unit-tests within gems with `rake test` (Jarmo Pertman)
+* Don't output unnecessary information to stdout in FireWatir unit-tests (Željko Filipin)
+
+
+Whole Changelog is available at http://github.com/bret/watir/compare/v1.6.5...v1.6.6
+
 
 == Version 1.6.5
 

data/VERSION

@@ -1 +1 @@
-1.6.6.rc1
+1.6.6.rc2

data/lib/watir/core.rb

@@ -2,6 +2,7 @@
 # to work with minimum functionality
 #
 # this is needed for #click_no_wait to perform faster
+require 'timeout'
 require 'watir/win32ole'
 
 require 'logger'

data/lib/watir/element.rb

@@ -232,13 +232,29 @@ module Watir
 
     def click_no_wait
       assert_enabled
-
       highlight(:set)
       element = "#{self.class}.new(#{@page_container.attach_command}, :unique_number, #{self.unique_number})"
-      @page_container.click_no_wait(element)
+      ruby_code = "require 'rubygems';" <<
+              "require '#{File.expand_path(File.dirname(__FILE__))}/core';" <<
+              "#{element}.click!"
+      system(spawned_click_no_wait_command(ruby_code))
       highlight(:clear)
     end
 
+    def spawned_click_no_wait_command(command)
+      command = "-e #{command.inspect}"
+      unless $DEBUG
+        "start rubyw #{command}"
+      else
+        puts "#click_no_wait command:"
+        command = "ruby #{command}"
+        puts command
+        command
+      end
+    end
+
+    private :spawned_click_no_wait_command
+
     def click!
       assert_enabled
 

data/lib/watir/ie-class.rb

@@ -482,6 +482,10 @@ module Watir
 
       Timeout::timeout(5*60) do
         begin
+          while @ie.busy
+            sleep interval
+          end
+
           until [READYSTATE_INTERACTIVE, READYSTATE_COMPLETE].include?(@ie.readyState)
             sleep interval
           end

data/lib/watir/page-container.rb

@@ -48,26 +48,6 @@ module Watir
       page.innertext.strip
     end
 
-    def click_no_wait(element)
-      ruby_code = "require 'rubygems';" <<
-              "require '#{File.expand_path(File.dirname(__FILE__))}/core';" <<
-              "#{element}.click!"
-      system(spawned_click_no_wait_command(ruby_code))
-    end
-
-    def spawned_click_no_wait_command(command)
-      unless $DEBUG
-        "start rubyw -e #{command.inspect}"
-      else
-        puts "#click_no_wait command:"
-        command = "ruby -e #{command.inspect}"
-        puts command
-        command
-      end
-    end
-
-    private :spawned_click_no_wait_command
-
     def set_container container
       @container = container
       @page_container = self

data/rakefile.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'rake/clean'
 require 'rake/packagetask'
+require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
 
@@ -21,6 +22,11 @@ Rake::RDocTask.new('rdoc') do |rdoc|
   rdoc.rdoc_files.exclude('lib/watir/camel_case.rb')
 end
 
+Rake::TestTask.new do |t|
+  t.test_files = FileList['unittests/core_tests.rb']
+  t.verbose = true
+end
+
 CLEAN << 'pkg' << 'rdoc'
 
 task :default => :package

data/unittests/click_no_wait_test.rb

@@ -15,7 +15,7 @@ class ClickNoWait_Tests < Watir::TestCase
   end
 
   def test_spawned_click_no_wait_command
-    assert_equal("start rubyw -e \"some command\"", browser.page_container.send(:__spawned_click_no_wait_command, "some command"))
+    assert_equal("start rubyw -e \"some command\"", browser.link(:id => 'link1').send(:__spawned_click_no_wait_command, "some command"))
   end
 
 end

data/unittests/form_test.rb

@@ -36,12 +36,23 @@ class TC_Forms2 < Test::Unit::TestCase # Note: there is no TC_Forms1
     assert_equal('Click Me', browser.form(:index, 1).button(:name, 'b1').value)
   end
 
-  # The following tests form bug 2261 
+  # The following tests form bug 2261
   tag_method :test_form_outer_html, :fails_on_firefox
-  def test_form_outer_html 
+
+  def test_form_outer_html
     expected = "\r\n<FORM id=f2 name=test2 action=pass2.html method=get><BR><INPUT type=submit value=Submit> </FORM>"
-    assert_equal(expected, browser.form(:name, 'test2').html)
+    actual = browser.form(:name, 'test2').html
+
+    # ignore attributes order by sorting them
+    sorted_expected, sorted_actual = [expected, actual].map! do |html|
+      html.strip.downcase.scan(%r{<form (.*)><br><(.*)> </form>}).flatten.
+              map {|part| part.split(" ").sort.join(" ")}.join("><br><")
+    end
+    assert_not_equal("", sorted_expected)
+    assert_not_equal("", sorted_actual)
+    assert_equal(sorted_expected, sorted_actual)
   end
+  
   tag_method :test_form_inner_html, :fails_on_ie
   def test_form_inner_html
     expected = "\n<br><input value=\"Submit\" type=\"submit\">\n"

data/unittests/setup.rb

@@ -10,9 +10,11 @@ end
 topdir = File.join(File.dirname(__FILE__), '..')
 $firewatir_dev_lib = File.join(topdir, '..', 'firewatir', 'lib')
 $watir_dev_lib = File.join(topdir, 'lib')
+commonwatir_dir = "commonwatir-#{File.read("VERSION").strip}" rescue "commonwatir"
+commonwatir_absolute_dir = File.join(topdir, '..', commonwatir_dir)
 libs = []
-libs << File.join(topdir, '..', 'commonwatir', 'lib')
-libs << File.join(topdir, '..', 'commonwatir') # for the unit tests
+libs << File.join(commonwatir_absolute_dir, 'lib')
+libs << commonwatir_absolute_dir # for the unit tests
 libs.each { |lib| append_to_load_path(lib) }
 
 require 'watir/browser'
@@ -31,15 +33,10 @@ Test Suites
 * window_tests -- window intensive tests
 =end
 
-tiptopdir = File.join topdir, '..'
-commondir = File.join topdir, '..', 'commonwatir'
-append_to_load_path tiptopdir
 $all_tests = []
-Dir.chdir tiptopdir do
-  $all_tests += Dir["watir/unittests/*_test.rb"]
-end
-Dir.chdir tiptopdir do
-  $all_tests += Dir["commonwatir/unittests/*_test.rb"]
+$all_tests += Dir["unittests/*_test.rb"]
+Dir.chdir commonwatir_absolute_dir do
+  $all_tests += Dir["unittests/*_test.rb"]
 end
 
 # These tests won't load unless Watir is in the path
@@ -48,7 +45,7 @@ $watir_only_tests = [
         "images_test.rb",
         "dialog_test.rb",
         "ie_test.rb"
-].map {|file| "watir/unittests/#{file}"}
+].map {|file| "unittests/#{file}"}
 
 if Watir::UnitTest.options[:browser] != 'ie'
   $all_tests -= $watir_only_tests
@@ -69,12 +66,11 @@ end
      'open_close',
      'send_keys', # visible
 =end
-Dir.chdir tiptopdir do
-  $window_tests = Dir["watir/unittests/windows/*_test.rb"] - ["watir/unittests/windows/ie-each_test.rb"]
-end
+
+$window_tests = Dir["unittests/windows/*_test.rb"] - ["unittests/windows/ie-each_test.rb"]
 
 # load development libs also in #click_no_wait processes
-Watir::PageContainer.class_eval do
+Watir::Element.class_eval do
   alias_method :__spawned_click_no_wait_command, :spawned_click_no_wait_command
 
   def spawned_click_no_wait_command(command)

data/watir-rdoc.rb

@@ -0,0 +1,7 @@
+$WATIR_RDOC_OPTIONS = [] << 
+      '--title' << 'Watir API Reference' <<
+  		'--accessor' << 'def_wrap=R,def_wrap_guard=R,def_creator=R,def_creator_with_default=R' <<
+  		'--main' << 'Watir::IE' << 
+  		'--exclude' << 'unittests|camel_case.rb'
+$WATIR_EXTRA_RDOC_FILES = ['lib/readme.rb', 'lib/changes.rb', 'lib/license.rb'] 		
+

data/watir.gemspec

@@ -0,0 +1,56 @@
+require 'watir-rdoc'
+
+$__watir_source_patterns = [
+    'CHANGES', 'rakefile.rb', 'VERSION', 'watir.gemspec', 'watir-rdoc.rb',
+    'lib/watir/*.rb', 'lib/watir/AutoItX3.dll',
+    'unittests/*.rb', 'unittests/html/*.html', 'unittests/html/images/*.*',
+    'unittests/other/*.rb', 'unittests/testcase/*.rb', 'unittests/windows/*.rb',
+    'lib/watir/IEDialog/Release/IEDialog.dll', 'lib/watir/win32ole/win32ole.so',
+    'lib/watir/contrib/*.rb'] +
+    $WATIR_EXTRA_RDOC_FILES
+
+spec = Gem::Specification.new do |s|
+  version = File.read("VERSION").strip rescue "0.0.0"
+  s.name = 'watir'
+  s.version = version
+  s.summary = 'Automated testing tool for web applications.'
+  s.description = <<-EOF
+    WATIR is "Web Application Testing in Ruby". Watir (pronounced water) is a free,
+    open-source functional testing tool for automating browser-based tests of web applications.
+    It works with applications written in any language.
+    Watir drives the Internet Explorer browser the same way an end user would.
+    It clicks links, fills in forms, presses buttons.
+    Watir also checks results, such as whether expected text appears on the
+    page, or whether a control is enabled.
+    Watir can test web applications written in any language.
+    Watir is a Ruby library that works with Internet Explorer on Windows.
+  EOF
+  s.author = 'Bret Pettichord'
+  s.email = 'watir-general@groups.google.com'
+  s.rubyforge_project = 'Watir'
+  s.homepage = 'http://www.watir.com/'
+
+  s.platform = Gem::Platform::RUBY
+  s.requirements << 'Microsoft Windows running Internet Explorer 5.5 or later.'
+  s.require_path = 'lib'
+
+  s.add_dependency 'win32-process', '>= 0.5.5'
+  s.add_dependency 'windows-pr', '>= 0.6.6'
+  s.add_dependency 'commonwatir', '= ' + version
+  s.add_dependency 'firewatir', '= ' + version
+  s.add_dependency 'nokogiri'
+
+  s.has_rdoc = true
+  s.rdoc_options += $WATIR_RDOC_OPTIONS
+  s.executables << 'watir-console'
+
+#  s.test_file  = 'unittests/core_tests.rb'
+
+  s.files = $__watir_source_patterns.inject([]) { |list, glob|
+  	list << Dir[glob].delete_if { |path|
+      File.directory?(path) or
+      path.include?('CVS')
+    }
+  }.flatten
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: watir
 version: !ruby/object:Gem::Version 
-  hash: 977940598
+  hash: 977940599
   prerelease: true
   segments: 
   - 1
   - 6
   - 6
-  - rc1
-  version: 1.6.6.rc1
+  - rc2
+  version: 1.6.6.rc2
 platform: ruby
 authors: 
 - Bret Pettichord
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-24 00:00:00 -06:00
+date: 2010-09-30 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,13 +59,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 977940598
+        hash: 977940599
         segments: 
         - 1
         - 6
         - 6
-        - rc1
-        version: 1.6.6.rc1
+        - rc2
+        version: 1.6.6.rc2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,13 +76,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 977940598
+        hash: 977940599
         segments: 
         - 1
         - 6
         - 6
-        - rc1
-        version: 1.6.6.rc1
+        - rc2
+        version: 1.6.6.rc2
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -111,6 +111,8 @@ files:
 - CHANGES
 - rakefile.rb
 - VERSION
+- watir.gemspec
+- watir-rdoc.rb
 - lib/watir/camel_case.rb
 - lib/watir/clickJSDialog.rb
 - lib/watir/close_all.rb