firewatir 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/firewatir.gemspec

@@ -38,7 +38,6 @@ spec = Gem::Specification.new do |s|
   s.require_path = 'lib'    
 
   s.add_dependency 'commonwatir', '= ' + version
-  s.add_dependency 'activesupport', '=2.3.9'
 
   s.has_rdoc = true
   s.rdoc_options <<

data/lib/firewatir.rb

@@ -1,9 +1,6 @@
 $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'socket'
-gem 'activesupport', '=2.3.9'
-require 'active_support'
-
 require 'watir'
 require 'firewatir/exceptions'
 require 'firewatir/jssh_socket'

data/lib/firewatir/firefox.rb

@@ -16,9 +16,6 @@ module FireWatir
     #
     # Input:
     #   options  - Hash of any of the following options:
-    #     :waitTime - Time to wait for Firefox to start. By default it waits for 2 seconds.
-    #                 This is done because if Firefox is not started and we try to connect
-    #                 to jssh on port 9997 an exception is thrown.
     #     :profile  - The Firefox profile to use. If none is specified, Firefox will use
     #                 the last used profile.
     #     :suppress_launch_process - do not create a new firefox process. Connect to an existing one.
@@ -26,21 +23,17 @@ module FireWatir
     # TODO: Start the firefox version given by user.
 
     def initialize(options = {})
-      if(options.kind_of?(Integer))
-        options = {:waitTime => options}
-      end
-
-      # check for jssh not running, firefox may be open but not with -jssh
-      # if its not open at all, regardless of the :suppress_launch_process option start it
-      # error if running without jssh, we don't want to kill their current window (mac only)
-      jssh_down = false
-      begin
-        set_defaults()
-      rescue Watir::Exception::UnableToStartJSShException
-        jssh_down = true
-      end
-
       if current_os == :macosx && !%x{ps x | grep firefox-bin | grep -v grep}.empty?
+        # check for jssh not running, firefox may be open but not with -jssh
+        # if its not open at all, regardless of the :suppress_launch_process option start it
+        # error if running without jssh, we don't want to kill their current window (mac only)
+        jssh_down = false
+        begin
+          set_defaults()
+        rescue Watir::Exception::UnableToStartJSShException
+          jssh_down = true
+        end
+
         raise "Firefox is running without -jssh" if jssh_down
         open_window unless options[:suppress_launch_process]
       elsif not options[:suppress_launch_process]
@@ -70,8 +63,6 @@ module FireWatir
 
       bin = path_to_bin()
       @t = Thread.new { system("#{bin} -jssh #{profile_opt}") }
-      sleep options[:waitTime] || 2
-
     end
     private :launch_browser
 
@@ -144,7 +135,8 @@ module FireWatir
     private
     # This function creates a new socket at port 9997 and sets the default values for instance and class variables.
     # Generatesi UnableToStartJSShException if cannot connect to jssh even after 3 tries.
-    def set_defaults(no_of_tries = 0)
+    def set_defaults
+      no_of_tries = 0
       # JSSH listens on port 9997. Create a new socket to connect to port 9997.
       begin
         $jssh_socket = TCPSocket::new(MACHINE_IP, "9997")
@@ -152,7 +144,8 @@ module FireWatir
         read_socket()
       rescue
         no_of_tries += 1
-        retry if no_of_tries < 3
+        sleep 1
+        retry if no_of_tries < 10
         raise UnableToStartJSShException, "Unable to connect to machine : #{MACHINE_IP} on port 9997. Make sure that JSSh is properly installed and Firefox is running with '-jssh' option"
       end
       @error_checkers = []

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: firewatir
 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: 
 - Angrez Singh
@@ -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 
@@ -26,30 +27,15 @@ 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: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 2
-        - 3
-        - 9
-        version: 2.3.9
-  type: :runtime
-  version_requirements: *id002
 description: "    FireWatir stands for \"Web Application Testing in Ruby for Firefox\". FireWatir (pronounced firewater) is a free, \n    open-source functional testing tool for automating browser-based tests of web applications. \n    It works with applications written in any language.\n    FireWatir drives the Firefox browser the same way an end user would. \n    It clicks links, fills in forms, presses buttons. \n    FireWatir also checks results, such as whether expected text appears on the page, or whether a control is enabled.\n    FireWatir is a Ruby library that works with Firefox on Windows. It also works on Linux, Mac but without support for\n    JavaScript popups (currently support will be there shortly).\n"
 email: watir-general@googlegroups.com
 executables: []
@@ -211,12 +197,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: 
 - Mozilla Firefox browser 1.5 or later.
 rubyforge_project: Watir