capybara-js_finders 0.2.2 → 0.3.0

data/lib/capybara-js_finders/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module JsFinders
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

data/lib/capybara-js_finders.rb

@@ -76,9 +76,16 @@ module Capybara
       "(./@#{BR} >= #{rtr} and ./@#{TR} <= #{rbr})"
     end
 
+    def self.not_equal_to(headers)
+      headers.reject{|h| h == true}.map do |h|
+        "( ./@#{TR} != #{h[TR]} or ./@#{BR} != #{h[BR]} or ./@#{LR} != #{h[LR]} or ./@#{RR} != #{h[RR]} )"
+      end.join(" and ")
+    end
+
     # Condition for td to be under one of column and on the same level as one of the rows
+    # and cannot be the same cell as one of the row-header or column-header
     def self.cell_condition(columns, rows)
-      xpath = "( #{overlaps_rows(rows)} ) and ( #{overlaps_columns(columns)} ) "
+      xpath = "( #{overlaps_rows(rows)} ) and ( #{overlaps_columns(columns)} ) and (#{not_equal_to(columns + rows)})"
       return xpath
     end
 

data/test/unit/find_cell_tests/app/views/table.erubis

@@ -21,6 +21,10 @@
         <td colspan="3">
           ThreeColumns
         </td>
+
+        <td>
+          March 2013
+        </td>
       </tr>
 
       <tr>
@@ -45,6 +49,10 @@
         <td style="background-color: DarkGoldenRod;">
           DarkGoldenRod
         </td>
+
+        <td>
+          13
+        </td>
       </tr>
 
       <tr>
@@ -146,6 +154,14 @@
         </td>
       </tr>
 
+      <tr>
+        <td>
+            January 2012
+        </td>
+        <td>
+            12
+        </td>
+      </tr>
     </table>
 
   </body>

data/test/unit/find_cell_tests/basic_test.rb

@@ -67,6 +67,7 @@ module FindCellTests
     end
 
     def test_find_cell_not_found
+      user.visit '/'
       assert_not_found{ user.find_cell(:row => "OneRow", :column => "OneColumn", :text => "hor") }
       assert_not_found{ user.find_cell(:row => "OneRow", :column => "OneColumn", :text => "ver") }
 
@@ -77,10 +78,20 @@ module FindCellTests
     end
 
     def test_find_cell_without_row_or_column
+      user.visit '/'
       assert user.find_cell(:row => "OneRow", :text => "red").has_content?("red")
       assert user.find_cell(:column => "OneColumn", :text => "red").has_content?("red")
     end
 
+    def test_does_not_find_row_header_as_a_cell
+      user.visit '/'
+      assert ! user.find_cell(:row => "January 2012", :text => "12").has_content?("January")
+    end
+
+    def test_does_not_find_column_header_as_a_cell
+      user.visit '/'
+      assert ! user.find_cell(:column => "March 2013", :text => "13").has_content?("March")
+    end
 
     private
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-js_finders
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-25 00:00:00.000000000 +02:00
+date: 2011-07-27 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &78592980 !ruby/object:Gem::Requirement
+  requirement: &72850780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *78592980
+  version_requirements: *72850780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &78592730 !ruby/object:Gem::Requirement
+  requirement: &72850530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *78592730
+  version_requirements: *72850530
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &78592500 !ruby/object:Gem::Requirement
+  requirement: &72850300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 2.4.2
   type: :development
   prerelease: false
-  version_requirements: *78592500
+  version_requirements: *72850300
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &78592270 !ruby/object:Gem::Requirement
+  requirement: &72850070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.2.6
   type: :development
   prerelease: false
-  version_requirements: *78592270
+  version_requirements: *72850070
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &78592040 !ruby/object:Gem::Requirement
+  requirement: &72849840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.6.6
   type: :development
   prerelease: false
-  version_requirements: *78592040
+  version_requirements: *72849840
 - !ruby/object:Gem::Dependency
   name: bbq
-  requirement: &78591810 !ruby/object:Gem::Requirement
+  requirement: &72849610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.0.3
   type: :development
   prerelease: false
-  version_requirements: *78591810
+  version_requirements: *72849610
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &78591580 !ruby/object:Gem::Requirement
+  requirement: &72849380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: '1.17'
   type: :development
   prerelease: false
-  version_requirements: *78591580
+  version_requirements: *72849380
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &78591390 !ruby/object:Gem::Requirement
+  requirement: &72849190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78591390
+  version_requirements: *72849190
 description: ! "    Additional finders for capybara that for some reason\n    cannot
   use only xpath for finding nodes but needs to\n    execute js for some calculations.\n\n
   \   Ex: I you want to find a table cell\n    that is under or next to other cell
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 767245201
+      hash: 1067246483
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 767245201
+      hash: 1067246483
 requirements: []
 rubyforge_project: capybara-js_finders
 rubygems_version: 1.6.2