watirspec 0.1.0 → 0.1.1

data/History.rdoc

@@ -1,3 +1,13 @@
+=== Version 0.1.1 / 2010-04-04
+
+* Watir::Table#to_a and Watir::TableRow#to_a work now well with tr, th, td elements, colspan and nested tables.
+This means that you can test easily tables now:
+    expected_table = [["one", "two"], ["three", "four"]]
+    table(:id => "table_id").to_a.should =~ expected_table
+
+* removed strict version requirements for dependencies
+
+
 === Version 0.1.0 / 2010-04-03
 
 First release of WatiRspec, a small library for combining Watir and RSpec for browser-based functional testing in Ruby.

data/lib/watirspec/version.rb

@@ -1,3 +1,3 @@
 module WatiRspec
-  VERSION = "0.1.0" #:nodoc:
+  VERSION = "0.1.1"
 end

data/lib/watirspec/watir.rb

@@ -6,8 +6,8 @@ module Watir
 end
 
 # patches for Watir
-module Watir #:nodoc:all
-  class IE
+module Watir
+  class IE #:nodoc:all
     # This is Watir's overriden wait method, which is used in many places for deciding
     # if browser is ready or not. We have to patch one line in it to work properly
     # when file save as dialog has been displayed. For some reason READYSTATE (4)
@@ -65,7 +65,7 @@ module Watir #:nodoc:all
     end
   end
 
-  module PageContainer
+  module PageContainer #:nodoc:all
     # patch for .click_no_wait
     def eval_in_spawned_process(command)
       command.strip!
@@ -77,4 +77,45 @@ module Watir #:nodoc:all
       system(exec_string)
     end
   end
+
+  class Table < Element
+
+    # This method returns multi-dimensional array of the text's in table.
+    #
+    # It works with tr, th, td elements, colspan, rowspan and nested tables.
+    def to_a
+      assert_exists
+      y = []
+      @o.getElementsByTagName("TR").each do |row|
+        # make sure that this row is directly child element of the table
+        # and not from some inner table
+        next unless row.parentElement.parentElement.uniqueID == @o.uniqueID
+
+        y << TableRow.new(@container, :ole_object, row).to_a
+      end
+      y
+    end
+  end
+
+  class TableRow < Element
+
+    # This method returns (multi)-dimensional array of the text's in table row.
+    #
+    # It works with th, td elements, colspan, rowspan and nested tables.
+    def to_a
+      assert_exists
+      y = []
+      @o.cells.each do |cell|
+        inner_tables = cell.getElementsByTagName("TABLE")
+        inner_tables.each do |inner_table|
+          y << Watir::Table.new(@container, :ole_object, inner_table).to_a
+        end
+
+        if inner_tables.length == 0
+          y << cell.innerText.strip
+        end
+      end
+      y
+    end
+  end
 end

data/spec/watir_table_row_spec.rb

@@ -0,0 +1,40 @@
+require "watirspec"
+require "spec/autorun"
+
+describe Watir::TableRow do
+  include WatiRspec::SpecHelper
+
+  before :all do
+    goto "http://dl.dropbox.com/u/2731643/misc/tables.html"
+  end
+
+  it "#to_a works with regular row" do
+    first_row = table(:id => "normal")[1]
+    first_row.to_a.should =~ %w[1 2 3]
+  end
+
+  it "#to_a works with headers in row" do
+    first_row = table(:id => "headers")[1]
+    first_row.to_a.should =~ %w[1 2 3 4]
+  end
+
+  it "#to_a works with nested tables" do
+    second_row = table(:id => "nested")[2]
+    second_row.to_a.should =~ [[%w[11 12], %w[13 14]], "3"]
+  end
+
+  it "#to_a works with colspan" do
+    second_row = table(:id => "colspan")[2]
+    second_row.to_a.should == ["3"]
+  end
+
+  it "#to_a works with rowspan" do
+    t = table(:id => "rowspan")
+    second_row = t[2]
+    second_row.to_a.should == ["3", "4"]
+
+    third_row = t[3]
+    third_row.to_a.should == ["5"]
+  end
+
+end

data/spec/watir_table_spec.rb

@@ -0,0 +1,53 @@
+require "watirspec"
+require "spec/autorun"
+
+describe Watir::Table do
+  include WatiRspec::SpecHelper
+
+  before :all do
+    goto "http://dl.dropbox.com/u/2731643/misc/tables.html"
+  end
+
+  it "#to_a works with regular table" do
+    expected_table = [
+            %w[1 2 3],
+            %w[4 5 6],
+            %w[7 8 9]
+    ]
+    table(:id => "normal").to_a.should =~ expected_table
+  end
+
+  it "#to_a works with table with headers" do
+    expected_table = [
+            %w[1 2 3 4],
+            %w[5 6 7 8],
+            %w[9 10 11 12],
+    ]
+    table(:id => "headers").to_a.should =~ expected_table
+  end
+
+  it "#to_a works with nested tables" do
+    expected_table = [
+            %w[1 2],
+            [[%w[11 12], %w[13 14]], "3"]
+    ]
+    table(:id => "nested").to_a.should =~ expected_table
+  end
+
+  it "#to_a works with colspan" do
+    expected_table = [
+            %w[1 2],
+            ["3"]
+    ]
+    table(:id => "colspan").to_a.should =~ expected_table
+  end
+
+  it "#to_a works with rowspan" do
+    expected_table = [
+            %w[1 2],
+            %w[3 4],
+            %w[5]
+    ]
+    table(:id => "rowspan").to_a.should =~ expected_table
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-03 00:00:00 +03:00
+date: 2010-04-05 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
@@ -36,7 +36,7 @@ dependencies:
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
@@ -74,13 +74,11 @@ dependencies:
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
-        - 12
         - 0
-        version: 2.12.0
+        version: "0"
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -137,6 +135,8 @@ files:
 - README.rdoc
 - spec/spec_helper_spec.rb
 - spec/util_spec.rb
+- spec/watir_table_row_spec.rb
+- spec/watir_table_spec.rb
 - templates/common/config.rb
 - templates/common/environment.rb
 - templates/common/lib/common_application_helper.rb
@@ -145,7 +145,7 @@ files:
 - templates/project/environment.rb
 - templates/project/ide_runner.rb
 - templates/project/spec/dummy_spec.rb
-- watirspec-0.1.0.gem
+- watirspec-0.1.1.gem
 has_rdoc: true
 homepage: http://github.com/jarmo/WatiRspec
 licenses: []
@@ -187,6 +187,6 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: watirspec 0.1.0
+summary: watirspec 0.1.1
 test_files: []