watir 1.7.1 → 1.8.0.rc1

data/CHANGES

@@ -1,3 +1,15 @@
+== Version X.X.X - 2011/XX/XX
+
+=== IE improvements
+
+* Improved speed of #click_no_wait by not loading RubyGems (Jarmo Pertman)
+* Added check to maxlength so we don't clobber any incoming js events. (Charley Baker)
+
+=== Firefox improvements
+
+* Removed dependency for ActiveSupport, making it possible to use FireWatir with Rails 3 (Jarmo Pertman)
+* Removed :waitTime option and try to handle better firefox startup (Jarmo Pertman)
+
 == Version 1.7.1 - 2011/01/10
 
 === IE improvements
@@ -18,6 +30,8 @@ Whole Changelog is available at http://github.com/bret/watir/compare/v1.7.1...v1
 * 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)
+    Note: If you want to use this version of AutoIt, you'll need to manually uninstall all previously installed Watir and possibly manually installed AutoIt versions first.
+    When you run your Watir scripts, it will automatically install and use the new version.
 
 === Firefox improvements
 

data/VERSION

@@ -1 +1 @@
-1.7.1
+1.8.0.rc1

data/lib/watir/core.rb

@@ -4,6 +4,7 @@ require 'timeout'
 require 'watir/win32ole'
 
 # these are required already in commonwatir, but not when using click_no_wait!
+require 'watir/core_ext'
 require 'watir/exceptions'
 require 'watir/matches'
 require 'watir/wait'
@@ -11,7 +12,6 @@ require 'watir/wait_helper'
 require 'watir/element_extensions'
 
 require 'logger'
-require 'watir/core_ext'
 require 'watir/logger'
 require 'watir/container'
 require 'watir/locator'
@@ -28,4 +28,4 @@ require 'watir/image'
 require 'watir/link'
 require 'watir/html_element'
 
-require 'watir/module'
+require 'watir/module'

data/lib/watir/element.rb

@@ -236,9 +236,9 @@ module Watir
       assert_enabled
       highlight(:set)
       element = "#{self.class}.new(#{@page_container.attach_command}, :unique_number, #{self.unique_number})"
-      ruby_code = "require 'rubygems';" <<
-              "require '#{File.expand_path(File.dirname(__FILE__))}/core';" <<
-              "#{element}.click!"
+      # fill the $LOAD_PATH in spawned process
+      ruby_code = "$:.unshift(#{$LOAD_PATH.grep(%r{watir(-.*?)?/lib}).map {|p| "'#{p}'" }.join(").unshift(")});" <<
+                    "require '#{File.expand_path(File.dirname(__FILE__))}/core';#{element}.click!"
       system(spawned_click_no_wait_command(ruby_code))
       highlight(:clear)
     end

data/lib/watir/input_elements.rb

@@ -245,7 +245,7 @@ module Watir
     
     # return number of maxlength attribute
     def maxlength
-      assert_exists
+      assert_exists unless @o
       begin
         ole_object.invoke('maxlength').to_i
       rescue WIN32OLERuntimeError

data/unittests/close_all_test.rb

@@ -3,12 +3,12 @@ require 'unittests/setup'
 
 class TC_CloseAllWindows < Watir::TestCase
   
-  def setup
+  def xsetup
     @browsers = []
     5.times {@browsers << Watir::Browser.new}
   end
 
-  def test_close_all_windows
+  def xtest_close_all_windows
     assert @browsers.all? {|browser| browser.exists?}
     Watir::IE.close_all
     assert @browsers.all? {|browser| not browser.exists?}

data/unittests/html/textfields1.html

@@ -9,6 +9,16 @@ Test page for Text Fields
 function addEvent(e) {
     document.all.events_text.value = document.all.events_text.value + "\n" + e
 }
+function handle_focus(obj) {
+	if (obj.value == "foo") {
+		obj.value = "";
+	}
+}
+function handle_blur(obj) {
+	if (obj.value == "") {
+		obj.value = "foo";
+	}
+}
 </script>
 
 
@@ -73,6 +83,9 @@ This Field has javascript events in it
 <textarea name = events_text cols = 20 rows = 10 ></textarea>
 <input type=button onClick='document.all.events_text.value=""' value="Clear Events Box">
 
+Handle text field with focus and blur events for maxlength issue.
+<input type="text" value="foo" onfocus="handle_focus(this);" onblur="handle_blur(this);">
+
 
 <br>
 Password Fields

data/unittests/textfields_test.rb

@@ -23,6 +23,7 @@ class TC_Fields < Test::Unit::TestCase
     
     assert(browser.text_field(:beforeText, /after/i).exists? )
     assert(browser.text_field(:afterText, /before/i).exists? )
+    assert(browser.text_field(:value, 'foo').exists?)
   end
   
   tag_method :test_text_field_dragContentsTo, :fails_on_firefox
@@ -136,7 +137,7 @@ class TC_Fields < Test::Unit::TestCase
   end
   
   def test_text_field_iterators
-    assert_equal(13, browser.text_fields.length)
+    assert_equal(14, browser.text_fields.length)
     
     # watir is 1 based, so this is the first text field
     assert_equal("Hello World", browser.text_fields[1].value)
@@ -215,4 +216,9 @@ class TC_Fields < Test::Unit::TestCase
   def test_max_length
     assert_equal(20, browser.text_field(:name, 'text1').maxlength)
   end
+  
+  def test_additional_events
+    browser.text_field(:value, 'foo').set 'bar'
+	assert(browser.text_field(:value, 'bar').exists?)
+  end
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: watir
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
+  hash: 977940510
+  prerelease: true
   segments: 
   - 1
-  - 7
-  - 1
-  version: 1.7.1
+  - 8
+  - 0
+  - rc1
+  version: 1.8.0.rc1
 platform: ruby
 authors: 
 - Bret Pettichord
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 +02:00
+date: 2011-02-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,12 +59,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 977940510
         segments: 
         - 1
-        - 7
-        - 1
-        version: 1.7.1
+        - 8
+        - 0
+        - rc1
+        version: 1.8.0.rc1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -74,12 +76,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 977940510
         segments: 
         - 1
-        - 7
-        - 1
-        version: 1.7.1
+        - 8
+        - 0
+        - rc1
+        version: 1.8.0.rc1
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -119,7 +122,6 @@ files:
 - lib/watir/container.rb
 - lib/watir/cookiemanager.rb
 - lib/watir/core.rb
-- lib/watir/core_ext.rb
 - lib/watir/dialog.rb
 - lib/watir/element.rb
 - lib/watir/element_collections.rb
@@ -333,12 +335,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: 
 - Microsoft Windows running Internet Explorer 5.5 or later.
 rubyforge_project: Watir

data/lib/watir/core_ext.rb

@@ -1,18 +0,0 @@
-class String
-  
-  #
-  # "Watir::Span" => "Span"
-  # 
-  
-  def demodulize
-    gsub(/^.*::/, '')
-  end
-  
-  #
-  # "FooBar" => "foo_bar"
-  # 
-  
-  def underscore
-    gsub(/\B[A-Z][^A-Z]/, '_\&').downcase.gsub(' ', '_')
-  end
-end