toothbrush 0.1.2 → 0.1.3

data/README.rdoc

@@ -2,6 +2,37 @@
 
 Useful stuff for testing with Capybara.
 
+== Install
+
+Add to your gemfile:
+
+    gem 'toothbrush', group: :test
+
+Add the file spec/support/toothbrush.rb with this content:
+
+    RSpec.configure do |config|
+      config.include Toothbrush::Helpers
+    end
+
+== Usage
+
+For now, the only feature is ``ensure_table``.
+
+In an integration/acceptance/whatever test using Capybara, you can ensure the
+contents of a table:
+
+    ensure_table '#football-clubs-from-rio-de-janeiro-and-their-honors',
+      %w(   Club     World  Libertadores  Brasileiro  Brasil  Carioca ),
+      [%w( Flamengo    1          1            6         2       32   ),
+       %w( Vasco       0          1            4         1       22   ),
+       %w( Fluminense  0          0            3         1       30   ),
+       %w( Botafogo    0          0            1         0       19   )]
+
+The arguments are the CSS selector for the table, an array with the table headers and
+a two-dimensional array including the table content. As the example above shows,
+code layout can be arranged in order to seem like a table.
+
+
 == Contributing to toothbrush
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.3

data/lib/toothbrush/helpers.rb

@@ -7,39 +7,15 @@ module Toothbrush
         header = header_or_content
       end
 
-      columns = {}
-      header.each do |title|
-        n = 1
-        while true do
-          begin
-            within("#{table_selector} thead tr th:nth-child(#{n})") do
-              columns[title] = n if page.has_content?(title)
-              n += 1
-            end
-          rescue Capybara::ElementNotFound
-            begin
-              within("#{table_selector} tr th:nth-child(#{n})") do
-                columns[title] = n if page.has_content?(title)
-                n += 1
-              end
-            rescue Capybara::ElementNotFound
-              break
-            end
-          end
-        end
-      end
-
-      columns.keys.should =~ header
-
-      content.each_with_index do |celulas, index|
-        celulas.each_with_index do |value, td_index|
+      content.each_with_index do |row, row_index|
+        row.each_with_index do |cell, cell_index|
           begin
-            within("#{table_selector} tbody tr:nth-child(#{index+1}) td:nth-child(#{columns[header[td_index]]})") do
-              page.should have_content(value)
+            within("#{table_selector} tbody tr:nth-child(#{row_index+1}) td:nth-child(#{cell_index+1})") do
+              page.should have_content(cell)
             end
           rescue Capybara::ElementNotFound
-            within("#{table_selector} tr:nth-child(#{index+2}) td:nth-child(#{columns[header[td_index]]})") do
-              page.should have_content(value)
+            within("#{table_selector} tr:nth-child(#{row_index+2}) td:nth-child(#{cell_index+1})") do
+              page.should have_content(cell)
             end
           end
         end
@@ -49,7 +25,6 @@ module Toothbrush
     private
 
     def _ensure_table(selector, content)
-      column_count = content[0].count
       content.each_with_index do |row, row_index|
         row.each_with_index do |cell_data, cell_index|
           within("#{selector} tr:nth-child(#{row_index + 1}) td:nth-child(#{cell_index + 1})") do

data/spec/dummy_app/page.html

@@ -76,3 +76,24 @@
     <td>6</td>
   </tr>
 </table>
+
+<table id='different-th-td-number'>
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>City</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Americano</td>
+      <td>Campos</td>
+      <td>Destroy</td>
+    </tr>
+    <tr>
+      <td>Goytacaz</td>
+      <td>Campos</td>
+      <td>You can't destroy this</td>
+    </tr>
+  </tbody>
+</table>

data/spec/toothbrush_spec.rb

@@ -42,5 +42,14 @@ describe "Toothbrush" do
          %w(3 4),
          %w(5 6)]
     end
+
+    it 'supports tables with different <th> and <td> number' do
+      ensure_table '#different-th-td-number',
+        ['Name', 'City'],
+        [
+          ['Americano', 'Campos', 'Destroy'],
+          ['Goytacaz', 'Campos', "You can't destroy this"]
+        ]
+    end
   end
 end

data/toothbrush.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "toothbrush"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rodrigo Manh\u{e3}es"]
-  s.date = "2012-11-21"
+  s.date = "2013-02-23"
   s.description = "Useful stuff for testing with Capybara"
   s.email = "rmanhaes@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toothbrush
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2013-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec