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

@@ -0,0 +1,56 @@
+$__firewatir_source_patterns = [
+  'lib/firewatir.rb',
+  'lib/firewatir/*.rb',
+  'lib/firewatir/elements/*.rb',
+  'unittests/*.rb',
+  'unittests/html/*.html',
+  'unittests/html/images/*.*',
+  'LICENSE',
+  'CHANGES',
+  'rakefile.rb',
+  'VERSION',
+  'firewatir.gemspec'
+]
+
+spec = Gem::Specification.new do |s|
+  version = File.read("VERSION").strip rescue "0.0.0"
+  s.name = 'firewatir'
+  s.version = version
+  s.summary = 'Automated testing tool for web applications using Firefox browser.'
+  s.description = <<-EOF
+    FireWatir stands for "Web Application Testing in Ruby for Firefox". FireWatir (pronounced firewater) is a free, 
+    open-source functional testing tool for automating browser-based tests of web applications. 
+    It works with applications written in any language.
+    FireWatir drives the Firefox browser the same way an end user would. 
+    It clicks links, fills in forms, presses buttons. 
+    FireWatir also checks results, such as whether expected text appears on the page, or whether a control is enabled.
+    FireWatir is a Ruby library that works with Firefox on Windows. It also works on Linux, Mac but without support for
+    JavaScript popups (currently support will be there shortly).
+  EOF
+  s.author = 'Angrez Singh'
+  s.homepage = 'http://www.watir.com'
+  s.email = 'watir-general@googlegroups.com'
+  s.rubyforge_project = 'Watir'
+
+  s.requirements << 'Mozilla Firefox browser 1.5 or later.'
+  s.require_path = 'lib'    
+
+  s.add_dependency 'commonwatir', '= ' + version
+  s.add_dependency 'activesupport', '=2.3.9'
+
+  s.has_rdoc = true
+    s.rdoc_options << 
+      '--title' << 'FireWatir API Reference' <<
+  		'--accessor' << 'def_wrap=R,def_wrap_guard=R,def_creator=R,def_creator_with_default=R' <<
+  		'--exclude' << 'unittests|camel_case.rb|testUnitAddons.rb'
+
+#  s.test_file  = 'unittests/mozilla_all_tests.rb'
+
+  s.files = $__firewatir_source_patterns.inject([]) { |list, glob|
+  	list << Dir[glob].delete_if { |path|
+      File.directory?(path) or
+      path.include?('CVS')
+    }
+  }.flatten
+
+end

data/lib/firewatir/container.rb

@@ -470,17 +470,19 @@ module FireWatir
     # Output:
     #   Prints all the available elements on the page.
     #
-    def show_all_objects
-      puts "-----------Objects in the current context-------------" 
+    def show_all_objects(output = true)
       locate if respond_to?(:locate)
       elements = Document.new(self).all
-      puts elements.length
-      elements.each  do |n|
-        puts n.tagName
-        puts n.to_s
-        puts "------------------------------------------" 
+      if output
+        puts "-----------Objects in the current context-------------"
+        puts elements.length
+        elements.each  do |n|
+          puts n.tagName
+          puts n.to_s
+          puts "------------------------------------------"
+        end
+        puts "Total number of objects in the current context :	#{elements.length}"
       end
-      puts "Total number of objects in the current context :	#{elements.length}"
       return elements
       # Test the index access. 
       # puts doc[35].to_s

data/rakefile.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'rake'
 require 'rake/clean'
+require 'rake/testtask'
 require 'rake/gempackagetask'
 
 task :default => :package
@@ -13,3 +14,8 @@ Rake::GemPackageTask.new(gemspec) do |p|
   p.need_tar = false
   p.need_zip = false
 end
+
+Rake::TestTask.new do |t|
+  t.test_files = FileList['unittests/mozilla_all_tests.rb']
+  t.verbose = true
+end

data/unittests/bug_fixes_test.rb

@@ -149,7 +149,7 @@ class TC_Bugs< Test::Unit::TestCase
     def test_file_field_bug_20
         goto_page("fileupload.html")
         # Enter dummy path.
-        if(RUBY_PLATFORM =~ /.*mswin.*/)
+        if(RUBY_PLATFORM =~ /mswin|msys|mingw32/)
             browser.file_field(:name, "file3").set("c:\\results.txt")
         else    
             browser.file_field(:name, "file3").set("/user/lib/results.txt")

data/unittests/div_test.rb

@@ -24,8 +24,8 @@ class TC_Divs < Test::Unit::TestCase
   
   tag_method :test_show_all_objects, :fails_on_ie
   def test_show_all_objects
-    assert_equal(36, browser.show_all_objects.length)
-    assert_equal(3,browser.div(:id,"text_fields1").show_all_objects.length)
+    assert_equal(36, browser.show_all_objects(false).length)
+    assert_equal(3,browser.div(:id,"text_fields1").show_all_objects(false).length)
    
     assert_equal(8,browser.text_fields.length)
     assert_equal(3,browser.div(:id,"text_fields1").text_fields.length)

data/unittests/images_test.rb

@@ -122,8 +122,8 @@ class TC_Images < Test::Unit::TestCase
         assert_equal('square_image', browser.image(:id, 'square').title)
 
         # to string tests -- output should be verified!
-        puts browser.image(:name  , "circle").to_s
-        puts  browser.image(:index , 2).to_s
+        assert_equal("name:         circle\ntype:         \nid:           \nvalue:        \ndisabled:     \nsrc:          images/circle.jpg\nheight:       106\nalt:          \nwidth:        106", browser.image(:name, "circle").to_s)
+        assert_equal("name:         \ntype:         \nid:           square\nvalue:        \ndisabled:     \nsrc:          images/square.jpg\nheight:       88\nalt:          \nwidth:        88", browser.image(:index , 2).to_s)
     end
     
     def test_image_iterator

data/unittests/images_xpath_test.rb

@@ -111,7 +111,7 @@ class TC_Images_XPath < Test::Unit::TestCase
         #assert_raises(UnknownObjectException ) { browser.image(:xpath , "//img[@src='no_image_with_this']").hasLoaded? }
         
         # to string tests -- output should be verified!
-        puts browser.image(:xpath , "//img[@name='circle']").to_s
+        assert_equal("name:         circle\ntype:         \nid:           \nvalue:        \ndisabled:     \nsrc:          images/circle.jpg\nheight:       106\nalt:          \nwidth:        106", browser.image(:xpath , "//img[@name='circle']").to_s)
     end
     
 end

data/unittests/links_test.rb

@@ -137,7 +137,7 @@ class TC_Links < Test::Unit::TestCase
         assert_nothing_raised {browser.link(:text, 'Create').exists? }   
     end
     def test_link_to_s
-       puts  browser.link(:id,"linktos").to_s
+      assert_equal("name:         \ntype:         \nid:           linktos\nvalue:        \ndisabled:     \nhref:         link_pass.html\ninner text:   to string test", browser.link(:id,"linktos").to_s)
     end
 end
 

data/unittests/radios_xpath_test.rb

@@ -45,7 +45,6 @@ class TC_Radios_XPath < Test::Unit::TestCase
     def test_Radio_isSet
        assert_raises(UnknownObjectException) {   browser.radio(:xpath, "//input[@name='noName']").isSet?  }  
 
-       puts "radio 1 is set : #{ browser.radio(:xpath, "//input[@name='box1']").isSet? } "
        assert_false(browser.radio(:xpath, "//input[@name='box1']").isSet?)   
 
        assert(browser.radio(:xpath, "//input[@name='box3']").isSet?)   

data/unittests/selectbox_test.rb

@@ -119,8 +119,16 @@ class TC_SelectList < Test::Unit::TestCase
             index+=1
         end
         assert_equal( index-1, browser.select_lists.length)
-        # Bug Fix 25 
-        browser.select_lists.each { |list| puts list.getAllContents() }
+        # Bug Fix 25
+        values = [
+          ["Option 1", "Option 2", "Option 3", "Option 4"],
+          ["Option 1", "Option 2", "Option 3", "Option 4", "Option 5", "Option 6"],
+          ["Option 1", "Option 2", "Option 3", "Option 4"],
+          ["Option 1", "Option 2"],
+          ["Option 1", "Option 2"]]
+        browser.select_lists.each_with_index do |list, index|
+          assert_equal(values[index], list.getAllContents())
+        end
     end
 end
 

data/unittests/setup.rb

@@ -5,12 +5,13 @@ $myDir = File.expand_path(File.dirname(__FILE__))
 topdir = File.join(File.dirname(__FILE__), '..')
 $firewatir_dev_lib = File.join(topdir, 'lib')
 $watir_dev_lib = File.join(topdir, '..', 'watir', 'lib')
+commonwatir_dir = "commonwatir-#{File.read("VERSION").strip}" rescue "commonwatir"
 libs = []
-libs << File.join(topdir, '..', 'commonwatir', 'lib')
-libs << File.join(topdir, '..', 'commonwatir') # for the unit tests
+libs << File.join(topdir, '..', commonwatir_dir, 'lib')
+libs << File.join(topdir, '..', commonwatir_dir) # for the unit tests
 libs.each { |lib| $LOAD_PATH.unshift File.expand_path(lib) }
 
-require 'watir'
+require 'watir/browser'
 Watir::Browser.default = 'firefox'
 require 'unittests/setup/lib'
 module Watir::UnitTest
@@ -19,7 +20,7 @@ end
 
 require 'unittests/setup/testUnitAddons'
 
-commondir = File.join(topdir, '..', 'commonwatir')
+commondir = File.join(topdir, '..', commonwatir_dir)
 $all_tests = []
 Dir.chdir topdir do
   $all_tests += Dir["unittests/*_test.rb"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: firewatir
 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: 
 - Angrez Singh
@@ -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 
@@ -27,13 +27,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: *id001
 - !ruby/object:Gem::Dependency 
@@ -178,9 +178,9 @@ files:
 - unittests/html/images/triangle.jpg
 - LICENSE
 - CHANGES
-- README.rdoc
 - rakefile.rb
 - VERSION
+- firewatir.gemspec
 has_rdoc: true
 homepage: http://www.watir.com
 licenses: []

data/README.rdoc

@@ -1,112 +0,0 @@
-= FireWatir
-This is FireWatir, Web Application Testing In Ruby using Firefox browser
-
-Project Home:: http://www.watir.com
-Gem:: http://gemcutter.org/gems/firewatir
-Source Code:: http://github.com/bret/watir
-General Usage Discussions:: http://groups.google.com/group/watir-general
-Development Discussions:: http://rubyforge.org/mailman/listinfo/wtr-development
-Bugs, Issues, Roadmap:: http://jira.openqa.org/browse/WTR
-
-== DESCRIPTION
-
-Firewatir is part of Watir project, a family of open-source drivers for automating web browsers.
-For other browsers please see www.watir.com
-
-== EXAMPLES
-* http://watir.com/examples
-
-Start new Firefox browser driver
-
-  # using Watir::Browser interface
-  require 'watir'
-  Watir::Browser.default = 'firefox'
-  browser = Watir::Browser.new
-
-  # or using Firewatir library directly
-  require 'firewatir'
-  browser = FireWatir::Firefox.new
-
-Typical usage
-
-  require "firewatir"
-  # go to the page you want to test
-  ff = FireWatir::Firefox.start("http://myserver/mypage")
-
-  # enter "Angrez" into an input field named "username"
-  ff.text_field(:name, "username").set("Angrez")
-
-  # enter "Ruby Co" into input field with id "company_ID"
-  ff.text_field(:id, "company_ID").set("Ruby Co")
-
-  # click on a link that has "green" somewhere in the text that is displayed
-  # to the user, using a regular expression
-  ff.link(:text, /green/)
-
-  # click button that has a caption of "Cancel"
-  ff.button(:value, "Cancel").click
-
-== FEATURES
-
-FireWatir allows your script to read and interact with HTML objects--HTML tags and their attributes and contents.
-Types of objects that FireWatir can identify include:
-
-  Type         Description
-  ===========  ===============================================================
-  button       <tt><input></tt> tags, with the type="button" attribute
-  check_box    <tt><input></tt> tags, with the type="checkbox" attribute
-  div          <tt><div></tt> tags
-  form
-  frame
-  hidden       hidden <tt><input></tt> tags
-  image        <tt><img></tt> tags
-  label
-  link         <tt><a></tt> (anchor) tags
-  p            <tt><p></tt> (paragraph) tags
-  radio        radio buttons; <tt><input></tt> tags, with the type="radio" attribute
-  select_list  <tt><select></tt> tags, known informally as drop-down boxes
-  span         <tt><span></tt> tags
-  table        <tt><table></tt> tags
-  text_field   <tt><input></tt> tags with the type="text" attribute (a single-line
-               text field), the type="text_area" attribute (a multi-line
-               text field), and the type="password" attribute (a
-               single-line field in which the input is replaced with asterisks)
-
-In general, there are several ways to identify a specific object.  FireWatir's
-syntax is in the form (how, what), where "how" is a means of identifying
-the object, and "what" is the specific string or regular expression
-that FireWatir will seek, as shown in the examples above.  Available "how"
-options depend upon the type of object, but here are a few examples:
-
-   How           Description
-   ============  ===============================================================
-   :id           Used to find an object that has an "id=" attribute. Since each
-                 id should be unique, according to the XHTML specification,
-                 this is recommended as the most reliable method to find an
-                 object.
-   :name         Used to find an object that has a "name=" attribute.  This is
-                 useful for older versions of HTML, but "name" is deprecated
-                 in XHTML.
-   :value        Used to find a text field with a given default value, or a
-                 button with a given caption
-   :index        Used to find the nth object of the specified type on a page.
-                 For example, button(:index, 2) finds the second button.
-                 Current versions of FireWatir use 1-based indexing, but future
-                 versions will use 0-based indexing.
-   :xpath	     The xpath expression for identifying the element.
-
-Note that the XHTML specification requires that tags and their attributes be
-in lower case.  FireWatir doesn't enforce this; FireWatir will find tags and
-attributes whether they're in upper, lower, or mixed case.  This is either
-a bug or a feature.
-
-
-== INSTALL
-* http://wiki.openqa.org/display/WTR/FireWatir+Installation
-
-Firewatir gen is normally installed during watir gem installation
-however you need to install Jssh to communicate with Firefox.
-
-  [sudo] gem install firewatir
-
-