toothbrush 0.1.3 → 0.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c0236cdd0e3cd84517f2172af73e1eb430373dd8
+  data.tar.gz: 16bbf613fe9f1b22077041dbba1fc482043d2454
+SHA512:
+  metadata.gz: 3e27a550cef69208428161cccb36ef51d6bac05e8fc7631c2efabdbe70cad113aadd9f0f0eaa69db69026552aa629ee737d291c2609e4b0d6601c53724fae6e5
+  data.tar.gz: b2ea8d28c73be7673841d675cc6e81de457178b85e8ebbe7ae8548d1f0b54a728afb0f19771e06e4256c8ff83fc7e3dd4be8ca8e9a65b794a7f9b2081597041a

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/toothbrush/helpers.rb

@@ -1,37 +1,133 @@
-module Toothbrush
-  module Helpers
-    def ensure_table(table_selector, header_or_content, content = nil)
-      if content.nil?
-        return _ensure_table(table_selector, header_or_content)
+require 'rspec/expectations'
+require 'text-table'
+
+RSpec::Matchers.define :include_table do |selector, *header_content|
+  match do |actual|
+    if header_content.count == 2
+      expected_header, expected_content = header_content.map(&:clone)
+    else
+      expected_header, expected_content = nil, header_content[0].clone
+    end
+
+    check_selector = lambda do
+      actual.has_selector?(selector)
+    end
+
+    has_thead = lambda do
+      actual.has_selector?("#{selector} thead")
+    end
+
+    has_tbody = lambda do
+      actual.has_selector?("#{selector} tbody")
+    end
+
+    has_header = lambda do
+      has_thead[] || actual.has_selector?("#{selector} tr th")
+    end
+
+    expected_has_header = lambda do
+      expected_header && !expected_header.empty?
+    end
+
+    html_table_to_array = lambda do
+      if has_thead[]
+        header = actual.all("#{selector} thead tr th").map(&:text)
+        header = actual.all("#{selector} thead tr td").map(&:text) if header.empty?
+      elsif has_header[]
+        header = actual.first("#{selector} tr").all('th').map(&:text)
+        header = actual.first("#{selector} tr").all('td').map(&:text) if header.empty?
+      end
+      body_rows = if has_tbody[]
+        actual.all("#{selector} tbody tr")
+      elsif has_header[]
+        actual.all("#{selector} tr")[1..-1]
       else
-        header = header_or_content
+        actual.all("#{selector} tr")
+      end
+      body = body_rows.map {|tr| tr.all('td').map(&:text) }
+      if header && !header.empty?
+        body_size = body.first ? body.first.size : 0
+        header << '' while header.size < body_size
+        body.unshift(header)
       end
+      body.to_table(first_row_is_head: has_header[]).to_s
+    end
+
+    column_equivalence = {}
 
-      content.each_with_index do |row, row_index|
-        row.each_with_index do |cell, cell_index|
-          begin
-            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(#{row_index+2}) td:nth-child(#{cell_index+1})") do
-              page.should have_content(cell)
-            end
+    check_header = lambda do
+      return true unless expected_header
+
+      check_header_content = lambda do |*header_selector|
+        columns = {}
+        sub_selector = header_selector.empty? ? '' : header_selector[0]
+        first_row = actual.all("#{selector} #{sub_selector} tr")[0]
+        if first_row
+          first_row.
+            all("th, td").
+            each_with_index {|td, index| columns[td.text] = index }
+          expected_header.each_with_index do |title, index|
+            column_equivalence[index] = columns[title] if columns.has_key? title
           end
+          expected_header.all? {|title| columns.has_key? title }
+        else
+          expected_header.empty?
         end
       end
+
+      (has_thead[] && check_header_content.('thead')) ||
+      (!has_thead[] && check_header_content[])
     end
 
-    private
+    check_content = lambda do
+      check_body_content = lambda do |sub_selector_or_flag|
+        if sub_selector_or_flag.is_a? Symbol
+          sub_selector, exclude_first_line = '', sub_selector_or_flag == :exclude_first_line
+        else
+          sub_selector, exclude_first_line = sub_selector_or_flag, false
+        end
+        trs = actual.all("#{selector} #{sub_selector} tr").to_a
+        trs.shift if exclude_first_line
+        expected_content.map.with_index {|row, row_index|
+          tds = trs[row_index].all('td')
+          row.map.with_index {|data, col_index|
+            tds[column_equivalence[col_index] || col_index].has_content? data
+          }.all?
+        }.compact.all?
+      end
 
-    def _ensure_table(selector, content)
-      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
-            page.should have_content cell_data
-          end
+      if has_tbody[]
+        check_body_content.('tbody')
+      elsif has_header[]
+        check_body_content.(:exclude_first_line)
+      else
+        check_body_content.('')
+      end
+    end
+
+    result = check_selector[] && check_header[] && check_content[]
+    if !result
+      if !check_selector[]
+        @message = "expected to have selector '#{selector}'"
+      else
+        expected_table = expected_content.clone
+        if expected_header
+          expected_header << '' while expected_header.size < expected_table.first.size
+          expected_table.unshift(expected_header)
         end
+        @message = "expected to include table\n%sbut found\n%s" %
+          [expected_table.to_table(first_row_is_head: expected_has_header[]),
+          html_table_to_array[]]
       end
     end
+    result
+  end
+
+  class << self
+    alias :failure_message :failure_message_for_should
+  end unless respond_to? :failure_message
+
+  failure_message do |actual|
+    @message
   end
 end

data/spec/dummy_app/page.html

@@ -96,4 +96,7 @@
       <td>You can't destroy this</td>
     </tr>
   </tbody>
-</table>
+</table>
+
+<table id='nothing-inside'>
+</table>

data/spec/spec_helper.rb

@@ -4,6 +4,8 @@ require 'rspec'
 require 'toothbrush'
 require 'capybara'
 require 'capybara/dsl'
+require 'pry-rails'
+require 'text-table'
 
 require File.join(File.dirname(__FILE__), 'dummy_app', 'app')
 Capybara.app = Sinatra::Application
@@ -14,5 +16,4 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
   config.include Capybara::DSL
-  config.include Toothbrush::Helpers
 end

data/spec/toothbrush_spec.rb

@@ -4,12 +4,12 @@ describe "Toothbrush" do
   before(:each) { visit '/dummy' }
 
   it 'talks to the dummy app' do
-    page.should have_content "Hey, ho, let's go!"
+    expect(page).to have_content "Hey, ho, let's go!"
   end
 
   describe 'ensures table content' do
     it 'correct table' do
-      ensure_table '#football-clubs-from-rio-de-janeiro-and-their-honors',
+      expect(page).to include_table '#football-clubs-from-rio-de-janeiro-and-their-honors',
         [   'Club',    'World', 'Libertadores', 'Brasileiro', 'Copa do Brasil', 'Carioca'],
         [%w( Flamengo     1            1              6              2              32   ),
          %w( Vasco        0            1              4              1              22   ),
@@ -19,37 +19,171 @@ describe "Toothbrush" do
 
     it 'vasco is not a world club champion' do
       expect {
-        ensure_table '#football-clubs-from-rio-de-janeiro-and-their-honors',
+        expect(page).to include_table '#football-clubs-from-rio-de-janeiro-and-their-honors',
           [   'Club',    'World', 'Libertadores', 'Brasileiro', 'Copa do Brasil', 'Carioca'],
           [%w( Flamengo     1            1              6              2              32   ),
            %w( Vasco        1            1              4              1              22   ),
            %w( Fluminense   0            0              3              1              30   ),
            %w( Botafogo     0            0              1              0              19   )]
        }.to raise_error(RSpec::Expectations::ExpectationNotMetError,
-                        'expected #has_content?("1") to return true, got false')
+"""expected to include table
++------------+-------+--------------+------------+----------------+---------+
+|    Club    | World | Libertadores | Brasileiro | Copa do Brasil | Carioca |
++------------+-------+--------------+------------+----------------+---------+
+| Flamengo   | 1     | 1            | 6          | 2              | 32      |
+| Vasco      | 1     | 1            | 4          | 1              | 22      |
+| Fluminense | 0     | 0            | 3          | 1              | 30      |
+| Botafogo   | 0     | 0            | 1          | 0              | 19      |
++------------+-------+--------------+------------+----------------+---------+
+but found
++------------+-------+--------------+------------+----------------+---------+
+|    Club    | World | Libertadores | Brasileiro | Copa do Brasil | Carioca |
++------------+-------+--------------+------------+----------------+---------+
+| Flamengo   | 1     | 1            | 6          | 2              | 32      |
+| Vasco      | 0     | 1            | 4          | 1              | 22      |
+| Fluminense | 0     | 0            | 3          | 1              | 30      |
+| Botafogo   | 0     | 0            | 1          | 0              | 19      |
++------------+-------+--------------+------------+----------------+---------+
+""")
     end
 
-    it 'supports tables without <thead> and <tbody>' do
-      ensure_table '#without-thead-tbody',
-        %w( 1 2),
-        [%w(3 4),
-         %w(5 6)]
+    describe 'supports tables without <thead> and <tbody>' do
+      it 'passing' do
+        expect(page).to include_table '#without-thead-tbody',
+          %w( 1 2),
+          [%w(3 4),
+           %w(5 6)]
+     end
+
+     it 'failing' do
+        expect {
+          expect(page).to include_table '#without-thead-tbody',
+            %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
 
-    it 'supports tables without <th>' do
-      ensure_table '#without-th',
-        [%w(1 2),
-         %w(3 4),
-         %w(5 6)]
+    describe 'supports tables without header' do
+      it 'passing' do
+        expect(page).to include_table '#without-th',
+          [%w(1 2),
+           %w(3 4),
+           %w(5 6)]
+      end
+
+      it 'failing' do
+        expect {
+          expect(page).to include_table '#without-th',
+            [%w(1 2),
+             %w(3 4),
+             %w(6 6)]
+        }.to raise_error(RSpec::Expectations::ExpectationNotMetError,
+"""expected to include table
++---+---+
+| 1 | 2 |
+| 3 | 4 |
+| 6 | 6 |
++---+---+
+but found
++---+---+
+| 1 | 2 |
+| 3 | 4 |
+| 5 | 6 |
++---+---+
+""")
+      end
+    end
+
+    describe 'supports tables with different <th> and <td> number' do
+      it 'passing' do
+        expect(page).to include_table '#different-th-td-number',
+          ['Name', 'City'],
+          [
+            ['Americano', 'Campos', 'Destroy'],
+            ['Goytacaz', 'Campos', "You can't destroy this"]
+          ]
+      end
+
+      it 'failing' do
+        expect {
+          expect(page).to include_table '#different-th-td-number',
+            ['Name', 'Cidade'],
+            [
+              ['Americano', 'Campos', 'Destroy'],
+              ['Goytacaz', 'Campos', "You can't destroy this"]
+            ]
+        }.to raise_error(RSpec::Expectations::ExpectationNotMetError,
+"""expected to include table
++-----------+--------+------------------------+
+|   Name    | Cidade |                        |
++-----------+--------+------------------------+
+| Americano | Campos | Destroy                |
+| Goytacaz  | Campos | You can't destroy this |
++-----------+--------+------------------------+
+but found
++-----------+--------+------------------------+
+|   Name    |  City  |                        |
++-----------+--------+------------------------+
+| Americano | Campos | Destroy                |
+| Goytacaz  | Campos | You can't destroy this |
++-----------+--------+------------------------+
+""")
+      end
     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"]
-        ]
+    it 'supports partial table' do
+      expect(page).to include_table '#football-clubs-from-rio-de-janeiro-and-their-honors',
+          %w(    Club     World ),
+          [%w( Flamengo     1   ),
+           %w( Vasco        0   ),
+           %w( Fluminense   0   ),
+           %w( Botafogo     0   )]
     end
+
+    it 'does not care about column ordering' do
+      expect(page).to include_table '#football-clubs-from-rio-de-janeiro-and-their-honors',
+          %w(  World    Club    ),
+          [%w(   1    Flamengo  ),
+           %w(   0     Vasco    ),
+           %w(   0   Fluminense ),
+           %w(   0    Botafogo  )]
+    end
+  end
+
+  it 'supports table having nothing inside' do
+    expect {
+      expect(page).to include_table '#nothing-inside',
+         ['a'],
+        [['b'],
+         ['c']]
+     }.to raise_error(RSpec::Expectations::ExpectationNotMetError,
+"""expected to include table
++---+
+| a |
++---+
+| b |
+| c |
++---+
+but found
+++
+++
+""")
   end
 end

data/toothbrush.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "toothbrush"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rodrigo Manh\u{e3}es"]
@@ -37,7 +37,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.summary = "Useful stuff for testing with Capybara"
 
-  s.add_development_dependency('rspec', '~> 2.0')
+  s.add_dependency('text-table')
+  s.add_development_dependency('rspec', '>= 2.11.0')
   s.add_development_dependency('sinatra', '>= 0')
   s.add_development_dependency('capybara', '>= 1.0')
+  s.add_development_dependency('pry-rails')
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toothbrush
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.1.4
 platform: ruby
 authors:
 - Rodrigo Manhães
@@ -11,54 +10,76 @@ bindir: bin
 cert_chain: []
 date: 2013-02-23 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
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     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
 email: rmanhaes@gmail.com
 executables: []
@@ -67,8 +88,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
-- .rspec
+- ".document"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -84,26 +105,25 @@ files:
 homepage: http://github.com/rodrigomanhaes/toothbrush
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Useful stuff for testing with Capybara
 test_files: []