sorting_table_for 0.2.2 → 0.3.0

data/spec/helpers/footer_spec.rb

@@ -8,7 +8,7 @@ include SortingTableForSpecHelper
 describe SortingTableFor, :type => :helper do
 
   before :all do
-    (SortingTableFor::Tools::rails3?) ? routes_rails3 : routes_rails2
+    routes_rails
   end
 
   before :each do
@@ -22,7 +22,7 @@ describe SortingTableFor, :type => :helper do
     it "should set nothing" do
       helper.sorting_table_for(@users) do |table|
         html = table.footers
-        html.should_not have_comp_tag("tfoot")
+        html.should_not have_selector("tfoot")
       end
     end
     
@@ -33,50 +33,50 @@ describe SortingTableFor, :type => :helper do
     it "should set a footer with argument" do
       helper.sorting_table_for(@users) do |table|
         html = table.footers 'hello'
-        html.should have_comp_tag("tfoot", :count => 1)
-        html.should have_comp_tag("tr", :count => 1)
-        html.should have_comp_tag("td", :count => 1)        
+        html.should have_selector("tfoot", :count => 1)
+        html.should have_selector("tr", :count => 1)
+        html.should have_selector("td", :count => 1)        
       end
     end
 
     it "should set a footer with multiple arguments" do
       helper.sorting_table_for(@users) do |table|
         html = table.footers 'hello', 'hi', 'footer'
-        html.should have_comp_tag("tfoot", :count => 1)
-        html.should have_comp_tag("tr", :count => 1)
-        html.should have_comp_tag("td", :count => 3)
+        html.should have_selector("tfoot", :count => 1)
+        html.should have_selector("tr", :count => 1)
+        html.should have_selector("td", :count => 3)
       end
     end
 
     it "should set i18n" do
       helper.sorting_table_for(@users) do |table|
         html = table.footers :username
-        html.should have_comp_tag('td', :text => 'UserFoot')
+        html.should have_selector('td', :content => 'UserFoot')
       end
     end
 
     it "should set i18n for multiple arguments" do
       helper.sorting_table_for(@users) do |table|
         html = table.footers :username, :price
-        html.should have_comp_tag('td:nth-child(1)', :text => 'UserFoot')
-        html.should have_comp_tag('td:nth-child(2)', :text => 'PriceFoot')
+        html.should have_selector('td:nth-child(1)', :content => 'UserFoot')
+        html.should have_selector('td:nth-child(2)', :content => 'PriceFoot')
       end
     end
 
     it "should works with colspan" do
       helper.sorting_table_for(@users) do |table|
         html = table.footers :username, :colspan => 5
-        html.should have_comp_tag('td[colspan="5"]')
+        html.should have_selector('td[colspan="5"]')
       end
     end
 
     it "should be customize with html" do
       table_html = helper.sorting_table_for(@users, :html => { :class => 'table_class', :id => 'table_id' }) do |table|
         html = table.footers :username, :html => { :class => 'header_class', :id => 'header_id' }
-        html.should have_comp_tag("tr[class=header_class][id=header_id]")
+        html.should have_selector("tr[class=header_class][id=header_id]")
       end
       helper.output_buffer.concat(table_html)
-      helper.output_buffer.should have_comp_tag("table[class='table_class sorting_table_for'][id=table_id]")
+      helper.output_buffer.should have_selector("table[class='table_class sorting_table_for'][id=table_id]")
     end
 
   end
@@ -88,9 +88,9 @@ describe SortingTableFor, :type => :helper do
         html = table.footers do 
           table.footer 'hello'
         end
-        html.should have_comp_tag("tfoot", :count => 1)
-        html.should have_comp_tag("tr", :count => 1)
-        html.should have_comp_tag("td", :count => 1)        
+        html.should have_selector("tfoot", :count => 1)
+        html.should have_selector("tr", :count => 1)
+        html.should have_selector("td", :count => 1)        
       end
     end
 
@@ -101,9 +101,9 @@ describe SortingTableFor, :type => :helper do
           table.footer 'hi'
           table.footer 'footer'
         end
-        html.should have_comp_tag("tfoot", :count => 1)
-        html.should have_comp_tag("tr", :count => 1)
-        html.should have_comp_tag("td", :count => 3)
+        html.should have_selector("tfoot", :count => 1)
+        html.should have_selector("tr", :count => 1)
+        html.should have_selector("td", :count => 3)
       end
     end
 
@@ -112,7 +112,7 @@ describe SortingTableFor, :type => :helper do
         html = table.footers do
           table.footer :username
         end
-        html.should have_comp_tag('td', :text => 'UserFoot')
+        html.should have_selector('td', :content => 'UserFoot')
       end
     end
 
@@ -122,8 +122,8 @@ describe SortingTableFor, :type => :helper do
           table.footer :username
           table.footer :price
         end
-        html.should have_comp_tag('td:nth-child(1)', :text => 'UserFoot')
-        html.should have_comp_tag('td:nth-child(2)', :text => 'PriceFoot')
+        html.should have_selector('td:nth-child(1)', :content => 'UserFoot')
+        html.should have_selector('td:nth-child(2)', :content => 'PriceFoot')
       end
     end
 
@@ -132,7 +132,7 @@ describe SortingTableFor, :type => :helper do
         html = table.footers do 
           table.footer :username, :colspan => 5
         end
-        html.should have_comp_tag('td[colspan="5"]')
+        html.should have_selector('td[colspan="5"]')
       end
     end
 
@@ -143,13 +143,13 @@ describe SortingTableFor, :type => :helper do
           table.footer :firstname, :html => { :class => 'cell_2_class', :id => 'cell_2_id', :title => 'hello_2' }
           table.footer 'hello', :html => { :class => 'cell_3_class', :id => 'cell_3_id', :title => 'hello_3' }
         end
-        html.should have_comp_tag("tr[class=header_class][id=header_id]")
-        html.should have_comp_tag("td:nth-child(1)[class='cell_1_class'][id=cell_1_id][title=hello_1]")
-        html.should have_comp_tag("td:nth-child(2)[class='cell_2_class'][id=cell_2_id][title=hello_2]")
-        html.should have_comp_tag("td:nth-child(3)[class=cell_3_class][id=cell_3_id][title=hello_3]")
+        html.should have_selector("tr[class=header_class][id=header_id]")
+        html.should have_selector("td:nth-child(1)[class='cell_1_class'][id=cell_1_id][title=hello_1]")
+        html.should have_selector("td:nth-child(2)[class='cell_2_class'][id=cell_2_id][title=hello_2]")
+        html.should have_selector("td:nth-child(3)[class=cell_3_class][id=cell_3_id][title=hello_3]")
       end
       helper.output_buffer.concat(table_html)
-      helper.output_buffer.should have_comp_tag("table[class='table_class sorting_table_for'][id=table_id]")
+      helper.output_buffer.should have_selector("table[class='table_class sorting_table_for'][id=table_id]")
     end
 
   end
@@ -163,9 +163,9 @@ describe SortingTableFor, :type => :helper do
             'hello'
           end
         end
-        html.should have_comp_tag("tfoot", :count => 1)
-        html.should have_comp_tag("tr", :count => 1)
-        html.should have_comp_tag("td", :count => 1)        
+        html.should have_selector("tfoot", :count => 1)
+        html.should have_selector("tr", :count => 1)
+        html.should have_selector("td", :count => 1)        
       end
     end
 
@@ -182,9 +182,9 @@ describe SortingTableFor, :type => :helper do
             'footer'
           end
         end
-        html.should have_comp_tag("tfoot", :count => 1)
-        html.should have_comp_tag("tr", :count => 1)
-        html.should have_comp_tag("td", :count => 3)
+        html.should have_selector("tfoot", :count => 1)
+        html.should have_selector("tr", :count => 1)
+        html.should have_selector("td", :count => 3)
       end
     end
 
@@ -195,7 +195,7 @@ describe SortingTableFor, :type => :helper do
             :username
           end
         end
-        html.should_not have_comp_tag('td', :text => 'UserFoot')
+        html.should_not have_selector('td', :content => 'UserFoot')
       end
     end
 
@@ -209,8 +209,8 @@ describe SortingTableFor, :type => :helper do
             :price
           end
         end
-        html.should_not have_comp_tag('td:nth-child(1)', :text => 'UserFoot')
-        html.should_not have_comp_tag('td:nth-child(2)', :text => 'PriceFoot')
+        html.should_not have_selector('td:nth-child(1)', :content => 'UserFoot')
+        html.should_not have_selector('td:nth-child(2)', :content => 'PriceFoot')
       end
     end
 
@@ -221,7 +221,7 @@ describe SortingTableFor, :type => :helper do
             :username
           end
         end
-        html.should have_comp_tag('td[colspan="5"]')
+        html.should have_selector('td[colspan="5"]')
       end
     end
 
@@ -238,13 +238,13 @@ describe SortingTableFor, :type => :helper do
             'hello'
           end
         end
-        html.should have_comp_tag("tr[class=header_class][id=header_id]")
-        html.should have_comp_tag("td:nth-child(1)[class='cell_1_class'][id=cell_1_id][title=hello_1]")
-        html.should have_comp_tag("td:nth-child(2)[class='cell_2_class'][id=cell_2_id][title=hello_2]")
-        html.should have_comp_tag("td:nth-child(3)[class=cell_3_class][id=cell_3_id][title=hello_3]")
+        html.should have_selector("tr[class=header_class][id=header_id]")
+        html.should have_selector("td:nth-child(1)[class='cell_1_class'][id=cell_1_id][title=hello_1]")
+        html.should have_selector("td:nth-child(2)[class='cell_2_class'][id=cell_2_id][title=hello_2]")
+        html.should have_selector("td:nth-child(3)[class=cell_3_class][id=cell_3_id][title=hello_3]")
       end
       helper.output_buffer.concat(table_html)
-      helper.output_buffer.should have_comp_tag("table[class='table_class sorting_table_for'][id=table_id]")
+      helper.output_buffer.should have_selector("table[class='table_class sorting_table_for'][id=table_id]")
     end
 
   end
@@ -260,8 +260,8 @@ describe SortingTableFor, :type => :helper do
       SortingTableFor::TableBuilder.i18n_add_footer_action_scope = :header
       helper.sorting_table_for(@users) do |table|
         html = table.footers :username, :price
-        html.should have_comp_tag('td:nth-child(1)', :text => 'Usernames')
-        html.should have_comp_tag('td:nth-child(2)', :text => 'Prices')
+        html.should have_selector('td:nth-child(1)', :content => 'Usernames')
+        html.should have_selector('td:nth-child(2)', :content => 'Prices')
       end
     end
     

data/spec/helpers/header_spec.rb

@@ -8,10 +8,11 @@ include SortingTableForSpecHelper
 describe SortingTableFor, :type => :helper do
 
   before :all do
-    (SortingTableFor::Tools::rails3?) ? routes_rails3 : routes_rails2
+    routes_rails
   end
   
   before :each do
+    SortingTableFor::TableBuilder.default_actions = [:edit, :delete]
     @users = SortingTableForUser.all
     helper.stub!(:params).and_return({ :controller => 'sorting_table_for_users', :action => 'index' })
     helper.output_buffer = ''
@@ -24,44 +25,44 @@ describe SortingTableFor, :type => :helper do
       it "should works" do
         helper.sorting_table_for(@users) do |table|
           html = table.headers
-          html.should have_comp_tag("thead", :count => 1)
-          html.should have_comp_tag("tr", :count => 1)
-          html.should have_comp_tag("th", :count => 11)
+          html.should have_selector("thead", :count => 1)
+          html.should have_selector("tr", :count => 1)
+          html.should have_selector("th", :count => 11)
         end
       end
 
       it "should add sorting class on th" do
         helper.sorting_table_for(@users) do |table|
-          table.headers.should have_comp_tag("th[class='cur-sort-not']", :count => 9)
+          table.headers.should have_selector("th[class='cur-sort-not']", :count => 9)
         end
       end
       
       it "should have link for sorting" do
         helper.sorting_table_for(@users) do |table|
-          table.headers.should have_comp_tag("a", :count => 9)
+          table.headers.should have_selector("a", :count => 9)
         end
       end
       
       it "should not sort" do
         helper.sorting_table_for(@users, :sort => false) do |table|
-          table.headers.should_not have_comp_tag("th[class='cur-sort-not']")
-          table.headers.should_not have_comp_tag("a")
+          table.headers.should_not have_selector("th[class='cur-sort-not']")
+          table.headers.should_not have_selector("a")
         end
       end
       
       it "should be customize with html" do
         table_html = helper.sorting_table_for(@users, :html => { :class => 'table_class', :id => 'table_id' }) do |table|
           html = table.headers(:html => { :class => 'header_class', :id => 'header_id' })
-          html.should have_comp_tag("tr[class=header_class][id=header_id]")
+          html.should have_selector("tr[class=header_class][id=header_id]")
         end
         helper.output_buffer.concat(table_html)
-        helper.output_buffer.should have_comp_tag("table[class='table_class sorting_table_for'][id=table_id]")
+        helper.output_buffer.should have_selector("table[class='table_class sorting_table_for'][id=table_id]")
       end
       
       it "should have option colspan" do
         table_html = helper.sorting_table_for(@users) do |table|
           html = table.headers :colspan => 5
-          html.should have_comp_tag('th[colspan="5"]', :count => SortingTableForUser.content_columns.size)          
+          html.should have_selector('th[colspan="5"]', :count => SortingTableForUser.content_columns.size)          
         end
       end      
 
@@ -71,58 +72,58 @@ describe SortingTableFor, :type => :helper do
        
       it "should choose one column" do
         helper.sorting_table_for(@users) do |table|
-          table.headers(:username).should have_comp_tag("th", :count => 1)
+          table.headers(:username).should have_selector("th", :count => 1)
         end
       end
     
       it "should choose multi columns" do
         helper.sorting_table_for(@users) do |table|
-          table.headers(:username, :price).should have_comp_tag("th", :count => 2)
+          table.headers(:username, :price).should have_selector("th", :count => 2)
         end
       end
     
       it "should choose multi columns and one action" do
         helper.sorting_table_for(@users) do |table|
-          table.headers(:username, :price, :actions => :edit).should have_comp_tag("th", :count => 3)
+          table.headers(:username, :price, :actions => :edit).should have_selector("th", :count => 3)
         end
       end
       
       it "should choose multi columns and actions" do
         helper.sorting_table_for(@users) do |table|
-          table.headers(:username, :price, :actions => [:edit, :edit_password]).should have_comp_tag("th", :count => 4)
+          table.headers(:username, :price, :actions => [:edit, :edit_password]).should have_selector("th", :count => 4)
         end
       end
       
       it "should works with non symbol field" do
         helper.sorting_table_for(@users) do |table|
           html = table.headers(:username, 'test', image_tag('rails.png'))
-          html.should have_comp_tag("th", :count => 3)
-          html.should have_comp_tag("th:nth-child(2)", :text => 'test')
-          html.should have_comp_tag("th:nth-child(3) img")
+          html.should have_selector("th", :count => 3)
+          html.should have_selector("th:nth-child(2)", :content => 'test')
+          html.should have_selector("th:nth-child(3) img")
         end
       end
       
       it "should works with non key symbol" do
         helper.sorting_table_for(@users) do |table|
-          table.headers(:username, :test).should have_comp_tag("th", :count => 2)
+          table.headers(:username, :test).should have_selector("th", :count => 2)
         end
       end
       
       it "should works with i18n for symbol" do
         helper.sorting_table_for(@users) do |table|
           html = table.headers(:username, :firstname, 'hello', :my_fake, :actions => :edit)
-          html.should have_comp_tag("th:nth-child(1)", :text => 'Usernames')
-          html.should have_comp_tag("th:nth-child(2)", :text => 'Firstnames')
-          html.should have_comp_tag("th:nth-child(3)", :text => 'hello')
-          html.should have_comp_tag("th:nth-child(4)", :text => 'Hello fake')
-          html.should have_comp_tag("th:nth-child(5)", :text => 'Edit users')          
+          html.should have_selector("th:nth-child(1)", :content => 'Usernames')
+          html.should have_selector("th:nth-child(2)", :content => 'Firstnames')
+          html.should have_selector("th:nth-child(3)", :content => 'hello')
+          html.should have_selector("th:nth-child(4)", :content => 'Hello fake')
+          html.should have_selector("th:nth-child(5)", :content => 'Edit users')          
         end
       end
 
       it "should have option colspan" do
         table_html = helper.sorting_table_for(@users) do |table|
           html = table.headers :username, :colspan => 5
-          html.should have_comp_tag('th[colspan="5"]', :count => 1)
+          html.should have_selector('th[colspan="5"]', :count => 1)
         end
       end
       
@@ -135,9 +136,9 @@ describe SortingTableFor, :type => :helper do
           html = table.headers do
             table.header(:username)
           end
-          html.should have_comp_tag("thead", :count => 1)
-          html.should have_comp_tag("tr", :count => 1)
-          html.should have_comp_tag("th", :count => 1)
+          html.should have_selector("thead", :count => 1)
+          html.should have_selector("tr", :count => 1)
+          html.should have_selector("th", :count => 1)
         end
       end
       
@@ -150,11 +151,11 @@ describe SortingTableFor, :type => :helper do
             table.header image_tag('rails.png')
             table.header I18n.t('my_test', :scope => [:fake_scope])
           end
-          html.should have_comp_tag("th", :count => 5)
-          html.should have_comp_tag("th[class=cur-sort-not]", :count => 2)
-          html.should have_comp_tag("th:nth-child(3)", :text => 'test')
-          html.should have_comp_tag("th:nth-child(4) img")
-          html.should have_comp_tag('th:nth-child(5)', :text => 'Hello')
+          html.should have_selector("th", :count => 5)
+          html.should have_selector("th[class=cur-sort-not]", :count => 2)
+          html.should have_selector("th:nth-child(3)", :content => 'test')
+          html.should have_selector("th:nth-child(4) img")
+          html.should have_selector('th:nth-child(5)', :content => 'Hello')
         end
       end
       
@@ -165,13 +166,13 @@ describe SortingTableFor, :type => :helper do
             table.header :firstname, :html => { :class => 'cell_2_class', :id => 'cell_2_id', :title => 'hello_2' }
             table.header 'hello', :html => { :class => 'cell_3_class', :id => 'cell_3_id', :title => 'hello_3' }
           end
-          html.should have_comp_tag("tr[class=header_class][id=header_id]")
-          html.should have_comp_tag("th:nth-child(1)[class='cell_1_class cur-sort-not'][id=cell_1_id][title=hello_1]")
-          html.should have_comp_tag("th:nth-child(2)[class='cell_2_class cur-sort-not'][id=cell_2_id][title=hello_2]")
-          html.should have_comp_tag("th:nth-child(3)[class=cell_3_class][id=cell_3_id][title=hello_3]")
+          html.should have_selector("tr[class=header_class][id=header_id]")
+          html.should have_selector("th:nth-child(1)[class='cell_1_class cur-sort-not'][id=cell_1_id][title=hello_1]")
+          html.should have_selector("th:nth-child(2)[class='cell_2_class cur-sort-not'][id=cell_2_id][title=hello_2]")
+          html.should have_selector("th:nth-child(3)[class=cell_3_class][id=cell_3_id][title=hello_3]")
         end
         helper.output_buffer.concat(table_html)
-        helper.output_buffer.should have_comp_tag("table[class='table_class sorting_table_for'][id=table_id]")
+        helper.output_buffer.should have_selector("table[class='table_class sorting_table_for'][id=table_id]")
       end
     
       it "should works with i18n for symbol" do
@@ -183,11 +184,11 @@ describe SortingTableFor, :type => :helper do
             table.header :my_fake
             table.header :action => :edit
           end
-          html.should have_comp_tag("th:nth-child(1)", :text => 'Usernames')
-          html.should have_comp_tag("th:nth-child(2)", :text => 'Firstnames')
-          html.should have_comp_tag("th:nth-child(3)", :text => 'hello')
-          html.should have_comp_tag("th:nth-child(4)", :text => 'Hello fake')
-          html.should have_comp_tag("th:nth-child(5)", :text => 'Edit users')          
+          html.should have_selector("th:nth-child(1)", :content => 'Usernames')
+          html.should have_selector("th:nth-child(2)", :content => 'Firstnames')
+          html.should have_selector("th:nth-child(3)", :content => 'hello')
+          html.should have_selector("th:nth-child(4)", :content => 'Hello fake')
+          html.should have_selector("th:nth-child(5)", :content => 'Edit users')          
         end
       end
     
@@ -197,7 +198,7 @@ describe SortingTableFor, :type => :helper do
             table.header :username
             table.header :price
           end
-          html.should_not have_comp_tag("th[class=cur-sort-not]")
+          html.should_not have_selector("th[class=cur-sort-not]")
         end
       end
     
@@ -207,8 +208,8 @@ describe SortingTableFor, :type => :helper do
             table.header :username, :sort => true
             table.header :price, :sort => false
           end
-          html.should have_comp_tag("th:nth-child(1)[class=cur-sort-not]")
-          html.should_not have_comp_tag("th:nth-child(2)[class=cur-sort-not]")
+          html.should have_selector("th:nth-child(1)[class=cur-sort-not]")
+          html.should_not have_selector("th:nth-child(2)[class=cur-sort-not]")
         end        
       end
       
@@ -218,8 +219,8 @@ describe SortingTableFor, :type => :helper do
             table.header :username, :sort => true
             table.header :price, :sort => false
           end
-          html.should have_comp_tag("th:nth-child(1)[class=cur-sort-not]")
-          html.should_not have_comp_tag("th:nth-child(2)[class=cur-sort-not]")
+          html.should have_selector("th:nth-child(1)[class=cur-sort-not]")
+          html.should_not have_selector("th:nth-child(2)[class=cur-sort-not]")
         end
       end
       
@@ -228,8 +229,8 @@ describe SortingTableFor, :type => :helper do
           html = table.headers do
             table.header 'my name', :sort_as => :username
           end
-          html.should have_comp_tag("th:nth-child(1)", :text => 'my name')
-          html.should have_comp_tag("th:nth-child(1)[class=cur-sort-not]")
+          html.should have_selector("th:nth-child(1)", :content => 'my name')
+          html.should have_selector("th:nth-child(1)[class=cur-sort-not]")
         end
       end
 
@@ -239,9 +240,9 @@ describe SortingTableFor, :type => :helper do
             table.header 'my name', :sort_as => :username, :sort => true
             table.header :price
           end
-          html.should have_comp_tag("th:nth-child(1)", :text => 'my name')
-          html.should have_comp_tag("th:nth-child(1)[class=cur-sort-not]")
-          html.should_not have_comp_tag("th:nth-child(2)[class=cur-sort-not]")
+          html.should have_selector("th:nth-child(1)", :content => 'my name')
+          html.should have_selector("th:nth-child(1)[class=cur-sort-not]")
+          html.should_not have_selector("th:nth-child(2)[class=cur-sort-not]")
         end
       end
 
@@ -251,8 +252,8 @@ describe SortingTableFor, :type => :helper do
             table.header :username, :colspan => 5
             table.header :price, :colspan => 3
           end
-          html.should have_comp_tag('th[colspan="5"]', :count => 1)
-          html.should have_comp_tag('th[colspan="3"]', :count => 1)
+          html.should have_selector('th[colspan="5"]', :count => 1)
+          html.should have_selector('th[colspan="3"]', :count => 1)
         end
       end      
       
@@ -270,7 +271,7 @@ describe SortingTableFor, :type => :helper do
               :firstname
             end
           end
-          html.should have_comp_tag("th", :count => 2)
+          html.should have_selector("th", :count => 2)
         end
       end
       
@@ -281,7 +282,7 @@ describe SortingTableFor, :type => :helper do
               :username
             end
           end
-          html.should_not have_comp_tag("a")
+          html.should_not have_selector("a")
         end
       end
       
@@ -292,7 +293,7 @@ describe SortingTableFor, :type => :helper do
               :username
             end
           end
-          html.should_not have_comp_tag("th[class=cur-sort-not]")
+          html.should_not have_selector("th[class=cur-sort-not]")
         end
       end
       
@@ -309,13 +310,9 @@ describe SortingTableFor, :type => :helper do
               I18n.t(:my_test, :scope => :fake_scope)
             end
           end
-          if SortingTableFor::Tools::rails3?
-            html.should have_comp_tag("th:nth-child(1)", :text => '')
-          else
-            html.should have_comp_tag("th:nth-child(1)", :text => 'username')
-          end
-          html.should have_comp_tag("th:nth-child(2)", :text => 'firstname')
-          html.should have_comp_tag("th:nth-child(3)", :text => 'Hello')
+          html.should have_selector("th:nth-child(1)", :content => '')
+          html.should have_selector("th:nth-child(2)", :content => 'firstname')
+          html.should have_selector("th:nth-child(3)", :content => 'Hello')
         end
       end
       
@@ -332,13 +329,13 @@ describe SortingTableFor, :type => :helper do
               'hello'
             end
           end
-          html.should have_comp_tag("tr[class=header_class][id=header_id]")
-          html.should have_comp_tag("th:nth-child(1)[class='cell_1_class'][id=cell_1_id][title=hello_1]")
-          html.should have_comp_tag("th:nth-child(2)[class='cell_2_class'][id=cell_2_id][title=hello_2]")
-          html.should have_comp_tag("th:nth-child(3)[class=cell_3_class][id=cell_3_id][title=hello_3]")
+          html.should have_selector("tr[class=header_class][id=header_id]")
+          html.should have_selector("th:nth-child(1)[class='cell_1_class'][id=cell_1_id][title=hello_1]")
+          html.should have_selector("th:nth-child(2)[class='cell_2_class'][id=cell_2_id][title=hello_2]")
+          html.should have_selector("th:nth-child(3)[class=cell_3_class][id=cell_3_id][title=hello_3]")
         end
         helper.output_buffer.concat(table_html)
-        helper.output_buffer.should have_comp_tag("table[class='table_class sorting_table_for'][id=table_id]")
+        helper.output_buffer.should have_selector("table[class='table_class sorting_table_for'][id=table_id]")
       end
       
       it "should have option colspan" do
@@ -351,8 +348,8 @@ describe SortingTableFor, :type => :helper do
               'my_colspan_2'
             end
           end
-          html.should have_comp_tag('th[colspan="5"]', :count => 1)
-          html.should have_comp_tag('th[colspan="3"]', :count => 1)
+          html.should have_selector('th[colspan="5"]', :count => 1)
+          html.should have_selector('th[colspan="3"]', :count => 1)
         end
       end
       
@@ -371,28 +368,21 @@ describe SortingTableFor, :type => :helper do
       it "should edit reserved columns" do
         SortingTableFor::TableBuilder.reserved_columns = [:id, :firstname, :lastname, :position, :salary, :price, :active, :created_at, :updated_at]
         helper.sorting_table_for(@users) do |table|
-          table.headers.should have_comp_tag("th", :count => 3)
+          table.headers.should have_selector("th", :count => 3)
         end
       end
       
       it "should edit params sort table" do
-        pending("Check if the link is edit")
         SortingTableFor::TableBuilder.params_sort_table = :hello_table
         helper.sorting_table_for(@users) do |table|
+          table.headers.include?("<a href=\"/sorting_table_for_users?hello_table%5Busername%5D=asc\">").should be_true
         end        
       end
     
       it "should edit default actions" do
         SortingTableFor::TableBuilder.default_actions = [:show, :edit_password, :edit, :delete]
         helper.sorting_table_for(@users) do |table|
-          table.headers.should have_comp_tag("th", :count => SortingTableForUser.column_names.size + 3)
-        end
-      end
-      
-      it "should edit default actions" do
-        pending('check if the link is valid')
-        SortingTableFor::TableBuilder.default_actions = [:show, :edit_password]
-        helper.sorting_table_for(@users) do |table|
+          table.headers.should have_selector("th", :count => SortingTableForUser.column_names.size + 3)
         end
       end
       
@@ -400,8 +390,8 @@ describe SortingTableFor, :type => :helper do
         SortingTableFor::TableBuilder.i18n_add_header_action_scope = :footer
         helper.sorting_table_for(@users) do |table|
           html = table.headers :username, :price
-          html.should have_comp_tag('th:nth-child(1)', :text => 'UserFoot')
-          html.should have_comp_tag('th:nth-child(2)', :text => 'PriceFoot')
+          html.should have_selector('th:nth-child(1)', :content => 'UserFoot')
+          html.should have_selector('th:nth-child(2)', :content => 'PriceFoot')
         end
       end