watirspec 0.1.1 → 0.1.2

data/History.rdoc

@@ -1,3 +1,11 @@
+=== 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.
+    expected_array = ["1", "2", /\d+/, "3"]
+    
+    ["1", "2", "66", "3"].should match_array(expected_array)
+    table(:id => "table_id").to_a.should match_array(expected_array)
+
 === 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.

data/lib/watirspec/spec.rb

@@ -0,0 +1,43 @@
+Spec::Runner.configure do |config| #:nodoc:
+  config.include(WatiRspec::SpecHelper)
+
+  config.before(:all) do
+    open_browser_at "about:blank"
+  end
+
+  config.after(:all) do
+    close
+  end
+end
+
+module Spec #:nodoc:all
+  class ExampleGroup
+    subject {self}
+  end
+end
+
+# match_array is useful for matching arrays where some elements are regular expressions.
+#    expected_array = ["1", "2", /\d+/, "3"]
+#
+#    ["1", "2", "66", "3"].should match_array(expected_array)
+#    table(:id => "table_id").to_a.should match_array(expected_array)
+Spec::Matchers.define :match_array do |array2|
+  match do |array1|
+    raise "match_array works only with Array objects!" unless array1.is_a?(Array) && array2.is_a?(Array)
+    match?(array1, array2)
+  end
+
+  def match?(array1, array2)
+    array2.each_with_index do |element, i|
+      if element.is_a?(Array)
+        return false unless match?(array1[i], element)
+      elsif element.is_a?(Regexp)
+        return false unless array1[i] =~ element
+      else
+        return false unless array1[i] == element
+      end
+    end
+
+    true
+  end
+end

data/lib/watirspec/version.rb

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

data/lib/watirspec/watir.rb

@@ -86,11 +86,7 @@ module Watir
     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
-
+      @o.rows.each do |row|
         y << TableRow.new(@container, :ole_object, row).to_a
       end
       y
@@ -99,7 +95,7 @@ module Watir
 
   class TableRow < Element
 
-    # This method returns (multi)-dimensional array of the text's in table row.
+    # This method returns (multi-dimensional) array of the text's in table's row.
     #
     # It works with th, td elements, colspan, rowspan and nested tables.
     def to_a
@@ -108,7 +104,10 @@ module Watir
       @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
+          # make sure that the inner table is directly child for this cell
+          if inner_table.parentElement.uniqueID == cell.uniqueID
+            y << Table.new(@container, :ole_object, inner_table).to_a
+          end
         end
 
         if inner_tables.length == 0

data/lib/watirspec.rb

@@ -5,7 +5,7 @@ require "watir"
 require "watirspec/util"
 require "watirspec/waiter"
 require "watirspec/spec_helper"
-require "watirspec/rspec"
+require "watirspec/spec"
 require "watirspec/watir"
 require "watirspec/autoit"
 

data/spec/spec_match_array_spec.rb

@@ -0,0 +1,21 @@
+require "spec/autorun"
+require "watirspec"
+
+describe "Array match_array matcher" do
+
+  it "matches other arrays with regexps" do
+    expected_ary = ["1", "2", "3", /\d/]
+    ["1", "2", "3", "5"].should match_array(expected_ary)
+
+    expected_ary = ["1", ["2", /\d+/], /3/]
+    ["1", [], "4"].should_not match_array(expected_ary)
+    ["1", ["2", "55"], "3"].should match_array(expected_ary)
+  end
+
+  it "doesn't work with other objects than Array" do
+    lambda {"".should match_array("")}.should raise_exception
+    lambda {[].should match_array("")}.should raise_exception
+    lambda {"".should match_array([])}.should raise_exception
+  end
+
+end

data/spec/watir_table_row_spec.rb

@@ -23,6 +23,12 @@ describe Watir::TableRow do
     second_row.to_a.should =~ [[%w[11 12], %w[13 14]], "3"]
   end
 
+  it "#to_a works with deep-nested tables" do
+    second_row = table(:id => "deepnested")[2]
+    second_row.to_a.should =~ [[%w[11 12],
+                                [[["404", "405"], ["406", "407"]], "14"]], "3"]
+  end
+
   it "#to_a works with colspan" do
     second_row = table(:id => "colspan")[2]
     second_row.to_a.should == ["3"]

data/spec/watir_table_spec.rb

@@ -34,6 +34,14 @@ describe Watir::Table do
     table(:id => "nested").to_a.should =~ expected_table
   end
 
+  it "#to_a works with deep-nested tables" do
+    expected_table = [
+            %w[1 2],
+            [[%w[11 12], [[["404", "405"], ["406", "407"]], "14"]], "3"]
+    ]
+    table(:id => "deepnested").to_a.should =~ expected_table
+  end
+
   it "#to_a works with colspan" do
     expected_table = [
             %w[1 2],

data/templates/common/environment.rb

@@ -1,7 +1,7 @@
 =begin
-  you have to require this file from your projects' environment.rb, which
+  you have to load this file from your projects' environment.rb, which
   will use common functionality:
-  require_rel "../../../ui-test-common/environment.rb
+  WatiRspec::Util.load_common
 
   add all your require statements into this file to avoid unnecessary
   code in your other projects' files

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -122,8 +122,8 @@ files:
 - lib/spec.opts
 - lib/watirspec/autoit.rb
 - lib/watirspec/html_formatter.rb
-- lib/watirspec/rspec.rb
 - lib/watirspec/runner.rb
+- lib/watirspec/spec.rb
 - lib/watirspec/spec_helper.rb
 - lib/watirspec/util.rb
 - lib/watirspec/version.rb
@@ -134,6 +134,7 @@ files:
 - Rakefile
 - README.rdoc
 - spec/spec_helper_spec.rb
+- spec/spec_match_array_spec.rb
 - spec/util_spec.rb
 - spec/watir_table_row_spec.rb
 - spec/watir_table_spec.rb
@@ -146,6 +147,7 @@ files:
 - templates/project/ide_runner.rb
 - templates/project/spec/dummy_spec.rb
 - watirspec-0.1.1.gem
+- watirspec-0.1.2.gem
 has_rdoc: true
 homepage: http://github.com/jarmo/WatiRspec
 licenses: []
@@ -187,6 +189,6 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: watirspec 0.1.1
+summary: watirspec 0.1.2
 test_files: []
 

data/lib/watirspec/rspec.rb

@@ -1,17 +0,0 @@
-Spec::Runner.configure do |config| #:nodoc:
-  config.include(WatiRspec::SpecHelper)
-
-  config.before(:all) do
-    open_browser_at "about:blank"
-  end
-
-  config.after(:all) do
-    close
-  end
-end
-
-module Spec #:nodoc:all
-  class ExampleGroup
-    subject {self}
-  end
-end