commonwatir 1.6.5 → 1.6.6.rc1

data/{README.txt → LICENSE}

@@ -1,48 +1,22 @@
-= commonwatir
-
-* FIX (url)
-
-== DESCRIPTION:
-
-Common code used by Watir and FireWatir
-
-== FEATURES/PROBLEMS:
-
-* FIX (list of features or problems)
-
-== SYNOPSIS:
-
-  FIX (code sample of usage)
-
-== REQUIREMENTS:
-
-* FIX (list of requirements)
-
-== INSTALL:
-
-* sudo gem install commonwatir
-
-== LICENSE:
-
-(The MIT License)
-
-Copyright (c) 2008, 2009 Bret Pettichord
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+(The MIT License)
+
+Copyright (c) 2008, 2009 Bret Pettichord
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,11 +1,13 @@
-require 'rubygems'
-require 'hoe'
-require './lib/commonwatir.rb'
-
-Hoe.spec 'commonwatir' do
-  self.version = CommonWatir::VERSION
-  self.rubyforge_name = 'wtr'
-  self.developer('Bret Pettichord', 'bret@pettichord.com')
-  self.extra_deps << ['user-choices', '>= 0']
-  self.url = 'http://www.watir.com'
-end
+require 'rubygems'
+require 'rake'
+require 'rake/clean'
+require 'rake/gempackagetask'
+
+task :default => :package
+
+gemspec = eval(File.read('commonwatir.gemspec'))
+Rake::GemPackageTask.new(gemspec) do |p|
+  p.gem_spec = gemspec
+  p.need_tar = false
+  p.need_zip = false
+end

data/VERSION

@@ -0,0 +1 @@
+1.6.6.rc1

data/lib/commonwatir.rb

@@ -1,3 +1,3 @@
-class CommonWatir
-  VERSION = '1.6.5'
-end
+class CommonWatir
+  VERSION = '1.6.5'
+end

data/lib/watir.rb

@@ -1,6 +1,7 @@
-# The 'watir' library loads the common watir code, common to all watir
-# implementations. The 'watir/browser' library will autoload the actual
-# implementations.
-
-require 'watir/waiter'
-require 'watir/browser'
+#--
+#  The 'watir' library loads the common watir code, common to all watir
+# implementations. The 'watir/browser' library will autoload the actual
+# implementations.
+
+require 'watir/waiter'
+require 'watir/browser'

data/lib/watir/assertions.rb

@@ -1,44 +1,44 @@
-require 'test/unit/assertions'
-
-module Watir
-  # Verification methods
-  module Assertions
-  include Test::Unit::Assertions
-    
-    # Log a failure if the boolean is true. The message is the failure
-    # message logged.
-    # Whether true or false, the assertion count is incremented.
-    def verify boolean, message = 'verify failed.'
-      add_assertion
-      add_failure message.to_s, caller unless boolean
-    end
-    
-    def verify_equal expected, actual, message=nil
-      full_message = build_message(message, <<EOT, expected, actual)
-<?> expected but was
-<?>.
-EOT
-      verify(expected == actual, full_message)
-    end
-    def verify_match pattern, string, message=nil
-      pattern = case(pattern)
-      when String
-        Regexp.new(Regexp.escape(pattern))
-      else
-        pattern
-      end
-      full_message = build_message(message, "<?> expected to be =~\n<?>.", string, pattern)
-      verify(string =~ pattern, full_message)
-    end
-    
-  end
-
-end
-module Test::Unit::Assertions
-    def assert_false(boolean, message=nil)
-        _wrap_assertion do
-            assert_block("assert should not be called with a block.") { !block_given? }
-            assert_block(build_message(message, "<?> is not false.", boolean)) { !boolean }
-        end
-    end
-end 
+require 'test/unit/assertions'
+
+module Watir
+  # Verification methods used by Watir::TestCase
+  module Assertions
+  include Test::Unit::Assertions
+    
+    # Log a failure if the boolean is true. The message is the failure
+    # message logged.
+    # Whether true or false, the assertion count is incremented.
+    def verify boolean, message = 'verify failed.'
+      add_assertion
+      add_failure message.to_s, caller unless boolean
+    end
+    
+    def verify_equal expected, actual, message=nil
+      full_message = build_message(message, <<EOT, expected, actual)
+<?> expected but was
+<?>.
+EOT
+      verify(expected == actual, full_message)
+    end
+    def verify_match pattern, string, message=nil
+      pattern = case(pattern)
+      when String
+        Regexp.new(Regexp.escape(pattern))
+      else
+        pattern
+      end
+      full_message = build_message(message, "<?> expected to be =~\n<?>.", string, pattern)
+      verify(string =~ pattern, full_message)
+    end
+    
+  end
+
+end
+module Test::Unit::Assertions
+    def assert_false(boolean, message=nil)
+        _wrap_assertion do
+            assert_block("assert should not be called with a block.") { !block_given? }
+            assert_block(build_message(message, "<?> is not false.", boolean)) { !boolean }
+        end
+    end
+end 

data/lib/watir/browser.rb

@@ -1,149 +1,149 @@
-# watir/browser
-require 'watir/options'
-module Watir
-  
-=begin rdoc
-
-Watir is a family of open-source drivers for automating web browsers. You
-can use it to write tests that are easy to read and maintain. 
-
-Watir drives browsers the same way people do. It clicks links, fills in forms,
-presses buttons. Watir also checks results, such as whether expected text 
-appears on a page.
-
-The Watir family currently includes support for Internet Explorer (on Windows),
-Firefox (on Windows, Mac and Linux) and Safari (on Mac). 
-
-Project Homepage: http://wtr.rubyforge.org
-
-This Browser module provides a generic interface
-that tests can use to access any browser. The actual browser (and thus
-the actual Watir driver) is determined at runtime based on configuration
-settings.
-
-  require 'watir'
-  browser = Watir::Browser.new
-  browser.goto 'http://google.com'
-  browser.text_field(:name, 'q').set 'pickaxe'  
-  browser.button(:name, 'btnG').click
-  if browser.text.include? 'Programming Ruby'
-    puts 'Text was found'
-  else
-    puts 'Text was not found'
-  end
-
-A comprehensive summary of the Watir API can be found here
-http://wiki.openqa.org/display/WTR/Methods+supported+by+Element
-
-There are two ways to configure the browser that will be used by your tests.
-
-One is to set the +watir_browser+ environment variable to +ie+ or +firefox+. 
-(How you do this depends on your platform.)
-
-The other is to create a file that looks like this.
-
-  browser: ie
-
-And then to add this line to your script, after the require statement and 
-before you invoke Browser.new.
-
-  Watir.options_file = 'path/to/the/file/you/just/created'
-
-=end rdoc
-  
-  module Browser
-    @@browser_classes = {}
-    @@sub_options = {}
-    @@default = nil
-    class << self
-
-      # Create a new instance of a browser driver, as determined by the
-      # configuration settings. (Don't be fooled: this is not actually 
-      # an instance of Browser class.)
-      def new
-        set_sub_options
-        klass.new
-      end
-      # Create a new instance as with #new and start the browser on the
-      # specified url.
-      def start url
-        set_sub_options
-        klass.start url
-      end
-      # Attach to an existing browser.
-      def attach(how, what)
-        set_sub_options
-        klass.attach(how, what)
-      end
-      def set_options options
-        return unless defined?(klass.set_options)
-        klass.set_options options
-      end
-      def options
-        return {} unless defined?(klass.options)
-        klass.options
-      end
-
-      def klass
-        key = Watir.options[:browser]
-        eval @@browser_classes[key] # this triggers the autoload
-      end
-      private :klass
-      # Add support for the browser option, using the specified class, 
-      # provided as a string. Optionally, additional options supported by
-      # the class can be specified as an array of symbols. Options specified
-      # by the user and included in this list will be passed (as a hash) to 
-      # the set_options class method (if defined) before creating an instance.
-      def support hash_args
-        option = hash_args[:name]
-        class_string = hash_args[:class]
-        additional_options = hash_args[:options]
-        library = hash_args[:library]
-        gem = hash_args[:gem] || library
-
-        @@browser_classes[option] = class_string        
-        @@sub_options[option] = additional_options
-
-        autoload class_string, library
-        activate_gem gem, option
-      end
-      
-      def default
-        @@default
-      end
-      # Specifies a default browser. Must be specified before options are parsed.
-      def default= option
-        @@default = option
-      end
-      # Returns the names of the browsers that are supported by this module.
-      # These are the options for 'watir_browser' (env var) or 'browser:' (yaml).
-      def browser_names
-        @@browser_classes.keys
-      end      
-      
-      private
-      def autoload class_string, library
-        mod, klass = class_string.split('::')
-        eval "module ::#{mod}; autoload :#{klass}, '#{library}'; end"
-      end
-      # Activate the gem (if installed). The default browser will be set
-      # to the first gem that activates.
-      def activate_gem gem_name, option
-        begin
-          gem gem_name 
-          @@default ||= option
-        rescue Gem::LoadError
-        end
-      end
-      def set_sub_options
-        sub_options = @@sub_options[Watir.options[:browser]]
-        return if sub_options.nil?
-        specified_options = Watir.options.reject {|k, v| !sub_options.include? k}
-        self.set_options specified_options
-      end
-    end
-  end
-
-end
-
-require 'watir/browsers'
+# watir/browser
+require 'watir/options'
+module Watir
+  
+=begin rdoc
+
+Watir is a family of open-source drivers for automating web browsers. You
+can use it to write tests that are easy to read and maintain. 
+
+Watir drives browsers the same way people do. It clicks links, fills in forms,
+presses buttons. Watir also checks results, such as whether expected text 
+appears on a page.
+
+The Watir family currently includes support for Internet Explorer (on Windows),
+Firefox (on Windows, Mac and Linux) and Safari (on Mac). 
+
+Project Homepage: http://wtr.rubyforge.org
+
+This Browser module provides a generic interface
+that tests can use to access any browser. The actual browser (and thus
+the actual Watir driver) is determined at runtime based on configuration
+settings.
+
+  require 'watir'
+  browser = Watir::Browser.new
+  browser.goto 'http://google.com'
+  browser.text_field(:name, 'q').set 'pickaxe'  
+  browser.button(:name, 'btnG').click
+  if browser.text.include? 'Programming Ruby'
+    puts 'Text was found'
+  else
+    puts 'Text was not found'
+  end
+
+A comprehensive summary of the Watir API can be found here
+http://wiki.openqa.org/display/WTR/Methods+supported+by+Element
+
+There are two ways to configure the browser that will be used by your tests.
+
+One is to set the +watir_browser+ environment variable to +ie+ or +firefox+. 
+(How you do this depends on your platform.)
+
+The other is to create a file that looks like this.
+
+  browser: ie
+
+And then to add this line to your script, after the require statement and 
+before you invoke Browser.new.
+
+  Watir.options_file = 'path/to/the/file/you/just/created'
+
+=end rdoc
+  
+  module Browser
+    @@browser_classes = {}
+    @@sub_options = {}
+    @@default = nil
+    class << self
+
+      # Create a new instance of a browser driver, as determined by the
+      # configuration settings. (Don't be fooled: this is not actually 
+      # an instance of Browser class.)
+      def new
+        set_sub_options
+        klass.new
+      end
+      # Create a new instance as with #new and start the browser on the
+      # specified url.
+      def start url
+        set_sub_options
+        klass.start url
+      end
+      # Attach to an existing browser.
+      def attach(how, what)
+        set_sub_options
+        klass.attach(how, what)
+      end
+      def set_options options
+        return unless klass.respond_to?(:set_options)
+        klass.set_options options
+      end
+      def options
+        return {} unless klass.respond_to?(:options)
+        klass.options
+      end
+
+      def klass
+        key = Watir.options[:browser]
+        eval @@browser_classes[key] # this triggers the autoload
+      end
+      private :klass
+      # Add support for the browser option, using the specified class, 
+      # provided as a string. Optionally, additional options supported by
+      # the class can be specified as an array of symbols. Options specified
+      # by the user and included in this list will be passed (as a hash) to 
+      # the set_options class method (if defined) before creating an instance.
+      def support hash_args
+        option = hash_args[:name]
+        class_string = hash_args[:class]
+        additional_options = hash_args[:options]
+        library = hash_args[:library]
+        gem = hash_args[:gem] || library
+
+        @@browser_classes[option] = class_string        
+        @@sub_options[option] = additional_options
+
+        autoload class_string, library
+        activate_gem gem, option
+      end
+      
+      def default
+        @@default
+      end
+      # Specifies a default browser. Must be specified before options are parsed.
+      def default= option
+        @@default = option
+      end
+      # Returns the names of the browsers that are supported by this module.
+      # These are the options for 'watir_browser' (env var) or 'browser:' (yaml).
+      def browser_names
+        @@browser_classes.keys
+      end      
+      
+      private
+      def autoload class_string, library
+        mod, klass = class_string.split('::')
+        eval "module ::#{mod}; autoload :#{klass}, '#{library}'; end"
+      end
+      # Activate the gem (if installed). The default browser will be set
+      # to the first gem that activates.
+      def activate_gem gem_name, option
+        begin
+          gem gem_name 
+          @@default ||= option
+        rescue Gem::LoadError
+        end
+      end
+      def set_sub_options
+        sub_options = @@sub_options[Watir.options[:browser]]
+        return if sub_options.nil?
+        specified_options = Watir.options.reject {|k, v| !sub_options.include? k}
+        self.set_options specified_options
+      end
+    end
+  end
+
+end
+
+require 'watir/browsers'