watirspec 0.1.2 → 0.1.3

data/History.rdoc

@@ -1,3 +1,7 @@
+=== Version 0.1.3 / 2010-04-06
+
+ * fixed a bug where inner table was not shown with Watir::Table#to_a when it was not a direct child, but some other element was in between for example form, span, div etc.
+
 === Version 0.1.2 / 2010-04-05
 
  * Added match_array matcher for RSpec for using with Array when regular expressions are needed. It is useful when verifying html tables with #to_a method.

data/lib/watirspec/version.rb

@@ -1,3 +1,3 @@
 module WatiRspec
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/watirspec/watir.rb

@@ -105,7 +105,7 @@ module Watir
         inner_tables = cell.getElementsByTagName("TABLE")
         inner_tables.each do |inner_table|
           # make sure that the inner table is directly child for this cell
-          if inner_table.parentElement.uniqueID == cell.uniqueID
+          if inner_table?(cell, inner_table)
             y << Table.new(@container, :ole_object, inner_table).to_a
           end
         end
@@ -116,5 +116,19 @@ module Watir
       end
       y
     end
+
+    private
+    # returns true if inner_table is direct child
+    # table for cell and there's not any table-s in between
+    def inner_table?(cell, inner_table)
+      parent_element = inner_table.parentElement
+      if parent_element.uniqueID == cell.uniqueID
+        return true
+      elsif parent_element.tagName == "TABLE"
+        return false
+      else
+        return inner_table?(cell, parent_element)
+      end
+    end
   end
 end

data/spec/watir_table_spec.rb

@@ -14,7 +14,7 @@ describe Watir::Table do
             %w[4 5 6],
             %w[7 8 9]
     ]
-    table(:id => "normal").to_a.should =~ expected_table
+    table(:id => "normal").to_a.should match_array(expected_table)
   end
 
   it "#to_a works with table with headers" do
@@ -23,7 +23,7 @@ describe Watir::Table do
             %w[5 6 7 8],
             %w[9 10 11 12],
     ]
-    table(:id => "headers").to_a.should =~ expected_table
+    table(:id => "headers").to_a.should match_array(expected_table)
   end
 
   it "#to_a works with nested tables" do
@@ -31,7 +31,16 @@ describe Watir::Table do
             %w[1 2],
             [[%w[11 12], %w[13 14]], "3"]
     ]
-    table(:id => "nested").to_a.should =~ expected_table
+    table(:id => "nested").to_a.should match_array(expected_table)
+  end
+
+  it "#to_a works with nested table with non-direct child" do
+    expected_table = [
+            %w[1 2],
+            [[%w[11 12], %w[13 14]], "3"]
+    ]
+
+    table(:id => "nestednondirectchild").to_a.should match_array(expected_table)
   end
 
   it "#to_a works with deep-nested tables" do
@@ -39,7 +48,7 @@ describe Watir::Table do
             %w[1 2],
             [[%w[11 12], [[["404", "405"], ["406", "407"]], "14"]], "3"]
     ]
-    table(:id => "deepnested").to_a.should =~ expected_table
+    table(:id => "deepnested").to_a.should match_array(expected_table)
   end
 
   it "#to_a works with colspan" do
@@ -47,7 +56,7 @@ describe Watir::Table do
             %w[1 2],
             ["3"]
     ]
-    table(:id => "colspan").to_a.should =~ expected_table
+    table(:id => "colspan").to_a.should match_array(expected_table)
   end
 
   it "#to_a works with rowspan" do
@@ -56,6 +65,6 @@ describe Watir::Table do
             %w[3 4],
             %w[5]
     ]
-    table(:id => "rowspan").to_a.should =~ expected_table
+    table(:id => "rowspan").to_a.should match_array(expected_table)
   end
 end

data/todo.txt

@@ -0,0 +1 @@
+viga, et kui n�iteks inner table ei ole otsene element tabeli all, vaid n�iteks on veel vahepeal ka span v�i form vms, siis seda tabelit ei leita...

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 +03:00
+date: 2010-04-06 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,6 +118,7 @@ extra_rdoc_files:
 - License.txt
 files: 
 - bin/watirspec
+- coverage.data
 - History.rdoc
 - lib/spec.opts
 - lib/watirspec/autoit.rb
@@ -146,6 +147,7 @@ files:
 - templates/project/environment.rb
 - templates/project/ide_runner.rb
 - templates/project/spec/dummy_spec.rb
+- todo.txt
 - watirspec-0.1.1.gem
 - watirspec-0.1.2.gem
 has_rdoc: true
@@ -189,6 +191,6 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: watirspec 0.1.2
+summary: watirspec 0.1.3
 test_files: []