toothbrush 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5cab23c424716b62f91cc911e5cc791b7996a59
-  data.tar.gz: 63dae1dc762876bf9b631d14433b65a51dd47b6f
+  metadata.gz: e729053dd3e4656eac581379c6d50103cfbdc77f
+  data.tar.gz: 51aa92f76c716fb31296b74c04e3bbde8885ac8c
 SHA512:
-  metadata.gz: 47a187e4cad4dcbcad24ba42af9f5ca50847876a8466375399c77339ade89a4e3773d99b499c497dec263c02778e091eab0ea7dbaf4d2e2348dea7b9fa645b23
-  data.tar.gz: 9dc68841bf341c38a27df44c17e8fea4097472b9c7e22b27345153c15d1c45df501502dd4bba3ff0a13e24486949205070ad0298713bc6160cb024453736c859
+  metadata.gz: ebe6b2deabfbe3b24d4c7141ded8b3695f124359f5d2a97d29ad80c24b547802a9a61902d6b371e3f4cd4ed71c0665983346ed0cc61502edbd098c1675165dc8
+  data.tar.gz: 7bdb18f32932475d5c00dcdb8777ab0edd569247f887402f398e13ca4ba01a734f9efa86081512e7db4a70419aa26e585c46031fbf041be09e0005f8b8e49976

data/lib/toothbrush/helpers.rb

@@ -125,7 +125,14 @@ RSpec::Matchers.define :include_table do |selector, *header_content|
     check_foot = lambda do
       return true unless expected_foot
       return false if expected_foot && !has_tfoot[]
-      html_foot[] == expected_foot
+      if !column_equivalence.empty?
+        columns = column_equivalence.sort_by {|k, v| k }.map {|(k, v)| v }
+        foot_values = html_foot[]
+        foot_to_compare = columns.map {|index| foot_values[index] }
+      else
+        foot_to_compare = html_foot[]
+      end
+      foot_to_compare == expected_foot
     end
 
     result = check_selector[] && check_header[] && check_content[] && check_foot[]

data/spec/dummy_app/page.html

@@ -106,16 +106,48 @@
     <tr>
       <td>1</td>
       <td>2</td>
+      <td>3</td>
     </tr>
     <tr>
-      <td>3</td>
       <td>4</td>
+      <td>5</td>
+      <td>6</td>
     </tr>
   </tbody>
   <tfoot>
     <tr>
+      <td>7</td>
+      <td>8</td>
+      <td>9</td>
+    </tr>
+  </tfoot>
+</table>
+
+<table id='with-tfoot-thead'>
+  <thead>
+    <tr>
+      <th>First</th>
+      <th>Second</th>
+      <th>Third</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>1</td>
+      <td>2</td>
+      <td>3</td>
+    </tr>
+    <tr>
+      <td>4</td>
       <td>5</td>
       <td>6</td>
     </tr>
+  </tbody>
+  <tfoot>
+    <tr>
+      <td>7</td>
+      <td>8</td>
+      <td>9</td>
+    </tr>
   </tfoot>
 </table>

data/spec/toothbrush_spec.rb

@@ -165,6 +165,51 @@ but found
            %w(   0   Fluminense ),
            %w(   0    Botafogo  )]
     end
+
+    describe 'supports <tfoot>' do
+      it 'passing' do
+        expect {
+          expect(page).to include_table '#with-tfoot',
+            [%w( 1 2 3 ),
+             %w( 4 5 6 )],
+             %w( 7 8 9 )
+        }.to_not raise_error
+      end
+
+      it 'failing' do
+        expect {
+          expect(page).to include_table '#with-tfoot',
+            [%w( 1 2 3 ),
+             %w( 4 5 6 )],
+             %w( 7 8 0 )
+        }.to raise_error(RSpec::Expectations::ExpectationNotMetError,
+  """expected to include table
++---+---+---+
+| 1 | 2 | 3 |
+| 4 | 5 | 6 |
++---+---+---+
+| 7 | 8 | 0 |
++---+---+---+
+but found
++---+---+---+
+| 1 | 2 | 3 |
+| 4 | 5 | 6 |
++---+---+---+
+| 7 | 8 | 9 |
++---+---+---+
+""")
+      end
+
+      it 'supports omitted columns' do
+        expect {
+          expect(page).to include_table '#with-tfoot-thead',
+             %w( First   Third ),
+            [%w(   1       3   ),
+             %w(   4       6   )],
+             %w(   7       9 )
+        }.to_not raise_error
+      end
+    end
   end
 
   it 'supports table having nothing inside' do
@@ -186,39 +231,4 @@ but found
 ++
 """)
   end
-
-  describe 'supports <tfoot>' do
-    it 'passing' do
-      expect {
-        expect(page).to include_table '#with-tfoot',
-          [%w( 1 2 ),
-           %w( 3 4 )],
-           %w( 5 6 )
-      }.to_not raise_error
-    end
-
-    it 'failing' do
-      expect {
-        expect(page).to include_table '#with-tfoot',
-          [%w( 1 2 ),
-           %w( 3 4 )],
-           %w( 5 7 )
-      }.to raise_error(RSpec::Expectations::ExpectationNotMetError,
-"""expected to include table
-+---+---+
-| 1 | 2 |
-| 3 | 4 |
-+---+---+
-| 5 | 7 |
-+---+---+
-but found
-+---+---+
-| 1 | 2 |
-| 3 | 4 |
-+---+---+
-| 5 | 6 |
-+---+---+
-""")
-    end
-  end
 end

data/toothbrush.gemspec

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

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: toothbrush
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Rodrigo Manhães
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: text-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: pry-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Useful stuff for testing with Capybara
@@ -88,8 +88,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
-- .rspec
+- ".document"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -112,17 +112,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Useful stuff for testing with Capybara