yousty-activeadmin 1.0.4.pre → 1.0.5.pre

data/spec/unit/views/components/sidebar_section_spec.rb

@@ -1,37 +1,47 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ActiveAdmin::Views::SidebarSection do
 
+  let(:options) { {} }
+
   let(:section) do
-    ActiveAdmin::SidebarSection.new("Help Section") do
+    ActiveAdmin::SidebarSection.new("Help Section", options) do
       span "Help Me"
     end
   end
 
   let(:html) do
-    render_arbre_component :section => section do
+    render_arbre_component section: section do
       sidebar_section(assigns[:section])
     end
   end
 
   it "should have a title h3" do
-    html.find_by_tag("h3").first.content.should == "Help Section"
+    expect(html.find_by_tag("h3").first.content).to eq "Help Section"
   end
 
   it "should have the class of 'sidebar_section'" do
-    html.class_list.should include("sidebar_section")
+    expect(html.class_list).to include("sidebar_section")
   end
 
   it "should have an id based on the title" do
-    html.id.should == "help-section_sidebar_section"
+    expect(html.id).to eq "help-section_sidebar_section"
   end
 
   it "should have a contents div" do
-    html.find_by_tag("div").first.class_list.should include("panel_contents")
+    expect(html.find_by_tag("div").first.class_list).to include("panel_contents")
   end
 
   it "should add children to the contents div" do
-    html.find_by_tag("span").first.parent.should == html.find_by_tag("div").first
+    expect(html.find_by_tag("span").first.parent).to eq html.find_by_tag("div").first
+  end
+
+  context 'with a custom class attribute' do
+    let(:options) { { class: 'custom_class' } }
+
+    it "should have 'custom_class' class" do
+      expect(html.class_list).to include("custom_class")
+    end
   end
 
 end

data/spec/unit/views/components/site_title_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ActiveAdmin::Views::SiteTitle do
 
@@ -18,18 +18,18 @@ describe ActiveAdmin::Views::SiteTitle do
                          site_title_link: nil
 
       site_title = build_title(namespace)
-      site_title.content.should eq "Hello World"
+      expect(site_title.content).to eq "Hello World"
     end
 
     it "renders the return value of a method when a symbol" do
-      helpers.should_receive(:hello_world).and_return("Hello World")
+      expect(helpers).to receive(:hello_world).and_return("Hello World")
 
       namespace = double site_title: :hello_world,
                          site_title_image: nil,
                          site_title_link: nil
 
       site_title = build_title(namespace)
-      site_title.content.should eq "Hello World"
+      expect(site_title.content).to eq "Hello World"
     end
 
     it "renders the return value of a proc" do
@@ -38,7 +38,7 @@ describe ActiveAdmin::Views::SiteTitle do
                          site_title_link: nil
 
       site_title = build_title(namespace)
-      site_title.content.should eq "Hello World"
+      expect(site_title.content).to eq "Hello World"
     end
 
   end
@@ -46,7 +46,7 @@ describe ActiveAdmin::Views::SiteTitle do
   context "when an image" do
 
     it "renders the string when a string is passed in" do
-      helpers.should_receive(:image_tag).
+      expect(helpers).to receive(:image_tag).
         with("an/image.png", alt: nil, id: "site_title_image").
         and_return '<img src="/assets/an/image.png" />'.html_safe
 
@@ -55,7 +55,7 @@ describe ActiveAdmin::Views::SiteTitle do
                          site_title_link: nil
 
       site_title = build_title(namespace)
-      site_title.content.strip.should eq '<img src="/assets/an/image.png" />'
+      expect(site_title.content.strip).to eq '<img src="/assets/an/image.png" />'
     end
 
   end
@@ -68,7 +68,7 @@ describe ActiveAdmin::Views::SiteTitle do
                          site_title_link: "/"
 
       site_title = build_title(namespace)
-      site_title.content.should eq '<a href="/">Hello World</a>'
+      expect(site_title.content).to eq '<a href="/">Hello World</a>'
     end
 
   end

data/spec/unit/views/components/status_tag_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ActiveAdmin::Views::StatusTag do
 
@@ -6,90 +6,230 @@ describe ActiveAdmin::Views::StatusTag do
 
     # Helper method to build StatusTag objects in an Arbre context
     def status_tag(*args)
-      render_arbre_component(:status_tag_args => args) do
+      render_arbre_component(status_tag_args: args) do
         status_tag(*assigns[:status_tag_args])
       end
     end
 
     subject { status_tag(nil) }
 
+    describe '#tag_name' do
+      subject { super().tag_name }
+      it      { is_expected.to eq 'span' }
+    end
 
-    its(:tag_name)    { should == 'span' }
-    its(:class_list)  { should include('status_tag') }
+    describe '#class_list' do
+      subject { super().class_list }
+      it      { is_expected.to include('status_tag') }
+    end
 
     context "when status is 'completed'" do
       subject { status_tag('completed') }
 
-      its(:tag_name)    { should == 'span' }
-      its(:class_list)  { should include('status_tag') }
-      its(:class_list)  { should include('completed') }
-      its(:content)     { should == 'Completed' }
+      describe '#tag_name' do
+        subject { super().tag_name }
+        it      { is_expected.to eq 'span' }
+      end
+
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.to include('status_tag') }
+      end
+
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.to include('completed') }
+      end
+
+      describe '#content' do
+        subject { super().content }
+        it      { is_expected.to eq 'Completed' }
+      end
     end
 
     context "when status is 'in_progress'" do
       subject { status_tag('in_progress') }
 
-      its(:class_list)  { should include('in_progress') }
-      its(:content)     { should == 'In Progress' }
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.to include('in_progress') }
+      end
+
+      describe '#content' do
+        subject { super().content }
+        it      { is_expected.to eq 'In Progress' }
+      end
     end
 
     context "when status is 'In progress'" do
       subject { status_tag('In progress') }
 
-      its(:class_list)  { should include('in_progress') }
-      its(:content)     { should == 'In Progress' }
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.to include('in_progress') }
+      end
+
+      describe '#content' do
+        subject { super().content }
+        it      { is_expected.to eq 'In Progress' }
+      end
     end
 
     context "when status is an empty string" do
       subject { status_tag('') }
 
-      its(:class_list)  { should include('status_tag') }
-      its(:content)     { should == '' }
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.to include('status_tag') }
+      end
+
+      describe '#content' do
+        subject { super().content }
+        it      { is_expected.to eq '' }
+      end
+    end
+
+    context "when status is false" do
+      subject { status_tag('false') }
+
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.to include('status_tag') }
+      end
+
+      describe '#content' do
+        subject { super().content }
+        it      { is_expected.to eq('No') }
+      end
     end
 
     context "when status is nil" do
       subject { status_tag(nil) }
 
-      its(:class_list)  { should include('status_tag') }
-      its(:content)     { should == '' }
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.to include('status_tag') }
+      end
+
+      describe '#content' do
+        subject { super().content }
+        it      { is_expected.to eq('No') }
+      end
     end
 
     context "when status is 'Active' and type is :ok" do
       subject { status_tag('Active', :ok) }
 
-      its(:class_list)  { should include('status_tag') }
-      its(:class_list)  { should include('active') }
-      its(:class_list)  { should include('ok') }
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.to include('status_tag') }
+      end
+
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.to include('active') }
+      end
+
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.to include('ok') }
+      end
     end
 
     context "when status is 'Active' and class is 'ok'" do
-      subject { status_tag('Active', :class => 'ok') }
+      subject { status_tag('Active', class: 'ok') }
 
-      its(:class_list)  { should include('status_tag') }
-      its(:class_list)  { should include('active') }
-      its(:class_list)  { should include('ok') }
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.to include('status_tag') }
+      end
+
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.to include('active') }
+      end
+
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.to include('ok') }
+      end
     end
 
     context "when status is 'Active' and label is 'on'" do
-      subject { status_tag('Active', :label => 'on') }
+      subject { status_tag('Active', label: 'on') }
+
+      describe '#content' do
+        subject { super().content }
+        it      { is_expected.to eq 'on' }
+      end
+
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.to include('status_tag') }
+      end
+
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.to include('active') }
+      end
 
-      its(:content)     { should == 'on' }
-      its(:class_list)  { should include('status_tag') }
-      its(:class_list)  { should include('active') }
-      its(:class_list)  { should_not include('on') }
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.not_to include('on') }
+      end
     end
 
     context "when status is 'So useless', type is :ok, class is 'woot awesome' and id is 'useless'" do
-      subject { status_tag('So useless', :ok, :class => 'woot awesome', :id => 'useless') }
-
-      its(:content)     { should == 'So Useless' }
-      its(:class_list)  { should include('status_tag') }
-      its(:class_list)  { should include('ok') }
-      its(:class_list)  { should include('so_useless') }
-      its(:class_list)  { should include('woot') }
-      its(:class_list)  { should include('awesome') }
-      its(:id)          { should == 'useless' }
+      subject { status_tag('So useless', :ok, class: 'woot awesome', id: 'useless') }
+
+      describe '#content' do
+        subject { super().content }
+        it      { is_expected.to eq 'So Useless' }
+      end
+
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.to include('status_tag') }
+      end
+
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.to include('ok') }
+      end
+
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.to include('so_useless') }
+      end
+
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.to include('woot') }
+      end
+
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.to include('awesome') }
+      end
+
+      describe '#id' do
+        subject { super().id }
+        it      { is_expected.to eq 'useless' }
+      end
     end
 
-  end # describe "#status_tag"
+    context "when status is set to a Fixnum" do
+      subject { status_tag(42) }
+
+      describe '#content' do
+        subject { super().content }
+        it      { is_expected.to eq '42' }
+      end
+
+      describe '#class_list' do
+        subject { super().class_list }
+        it      { is_expected.not_to include('42') }
+      end
+    end
+  end
 end

data/spec/unit/views/components/table_for_spec.rb

@@ -1,15 +1,101 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ActiveAdmin::Views::TableFor do
   describe "creating with the dsl" do
 
     let(:collection) do
-      [Post.new(:title => "First Post"), Post.new(:title => "Second Post"), Post.new(:title => "Third Post")]
+      [Post.new(title: "First Post", starred: true), Post.new(title: "Second Post"), Post.new(title: "Third Post", starred: false)]
     end
 
-    let(:assigns){ { :collection => collection } }
+    let(:assigns){ { collection: collection } }
     let(:helpers){ mock_action_view }
 
+    context "when creating a column using symbol argument" do
+      let(:table) do
+        render_arbre_component assigns, helpers do
+          table_for(collection, :title)
+        end
+      end
+
+      it "should create a table header based on the symbol" do
+        expect(table.find_by_tag("th").first.content).to eq "Title"
+      end
+
+      it "should create a table row for each element in the collection" do
+        expect(table.find_by_tag("tr").size).to eq 4 # 1 for head, 3 for rows
+      end
+
+      ["First Post", "Second Post", "Third Post"].each_with_index do |content, index|
+        it "should create a cell with #{content}" do
+          expect(table.find_by_tag("td")[index].content).to eq content
+        end
+      end
+    end
+
+    context "when creating many columns using symbol arguments" do
+      let(:table) do
+        render_arbre_component assigns, helpers do
+          table_for(collection, :title, :created_at)
+        end
+      end
+
+      it "should create a table header based on the symbol" do
+        expect(table.find_by_tag("th").first.content).to eq "Title"
+        expect(table.find_by_tag("th").last.content).to eq "Created At"
+      end
+
+      it "should add a class to each table header based on the col name" do
+        expect(table.find_by_tag("th").first.class_list.to_a.join(' ')).to eq "col col-title"
+        expect(table.find_by_tag("th").last.class_list.to_a.join(' ')).to eq "col col-created_at"
+      end
+
+      it "should create a table row for each element in the collection" do
+        expect(table.find_by_tag("tr").size).to eq 4 # 1 for head, 3 for rows
+      end
+
+      it "should create a cell for each column" do
+        expect(table.find_by_tag("td").size).to eq 6
+      end
+
+      it "should add a class for each cell based on the col name" do
+        expect(table.find_by_tag("td").first.class_list.to_a.join(' ')).to eq "col col-title"
+        expect(table.find_by_tag("td").last.class_list.to_a.join(' ')).to eq "col col-created_at"
+      end
+    end
+
+    context "when creating a column using symbol arguments and another using block" do
+      let(:table) do
+        render_arbre_component assigns, helpers do
+          table_for(collection, :title) do
+            column :created_at
+          end
+        end
+      end
+
+      it "should create a table header based on the symbol" do
+        expect(table.find_by_tag("th").first.content).to eq "Title"
+        expect(table.find_by_tag("th").last.content).to eq "Created At"
+      end
+
+      it "should add a class to each table header based on the col name" do
+        expect(table.find_by_tag("th").first.class_list.to_a.join(' ')).to eq "col col-title"
+        expect(table.find_by_tag("th").last.class_list.to_a.join(' ')).to eq "col col-created_at"
+      end
+
+      it "should create a table row for each element in the collection" do
+        expect(table.find_by_tag("tr").size).to eq 4 # 1 for head, 3 for rows
+      end
+
+      it "should create a cell for each column" do
+        expect(table.find_by_tag("td").size).to eq 6
+      end
+
+      it "should add a class for each cell based on the col name" do
+        expect(table.find_by_tag("td").first.class_list.to_a.join(' ')).to eq "col col-title"
+        expect(table.find_by_tag("td").last.class_list.to_a.join(' ')).to eq "col col-created_at"
+      end
+    end
+
     context "when creating a column with a symbol" do
       let(:table) do
         render_arbre_component assigns, helpers do
@@ -20,16 +106,16 @@ describe ActiveAdmin::Views::TableFor do
       end
 
       it "should create a table header based on the symbol" do
-        table.find_by_tag("th").first.content.should == "Title"
+        expect(table.find_by_tag("th").first.content).to eq "Title"
       end
 
       it "should create a table row for each element in the collection" do
-        table.find_by_tag("tr").size.should == 4 # 1 for head, 3 for rows
+        expect(table.find_by_tag("tr").size).to eq 4 # 1 for head, 3 for rows
       end
 
       ["First Post", "Second Post", "Third Post"].each_with_index do |content, index|
         it "should create a cell with #{content}" do
-          table.find_by_tag("td")[index].content.should == content
+          expect(table.find_by_tag("td")[index].content).to eq content
         end
       end
     end
@@ -45,30 +131,26 @@ describe ActiveAdmin::Views::TableFor do
       end
 
       it "should create a table header based on the symbol" do
-        table.find_by_tag("th").first.content.should == "Title"
-        table.find_by_tag("th").last.content.should == "Created At"
+        expect(table.find_by_tag("th").first.content).to eq "Title"
+        expect(table.find_by_tag("th").last.content).to eq "Created At"
       end
 
       it "should add a class to each table header based on the col name" do
-        table.find_by_tag("th").first
-          .class_list.to_a.join(' ').should == "col col-title"
-        table.find_by_tag("th").last
-          .class_list.to_a.join(' ').should  == "col col-created_at"
+        expect(table.find_by_tag("th").first.class_list.to_a.join(' ')).to eq "col col-title"
+        expect(table.find_by_tag("th").last.class_list.to_a.join(' ')).to eq "col col-created_at"
       end
 
       it "should create a table row for each element in the collection" do
-        table.find_by_tag("tr").size.should == 4 # 1 for head, 3 for rows
+        expect(table.find_by_tag("tr").size).to eq 4 # 1 for head, 3 for rows
       end
 
       it "should create a cell for each column" do
-        table.find_by_tag("td").size.should == 6
+        expect(table.find_by_tag("td").size).to eq 6
       end
 
       it "should add a class for each cell based on the col name" do
-        table.find_by_tag("td").first
-          .class_list.to_a.join(' ').should  == "col col-title"
-        table.find_by_tag("td").last
-          .class_list.to_a.join(' ').should  == "col col-created_at"
+        expect(table.find_by_tag("td").first.class_list.to_a.join(' ')).to eq "col col-title"
+        expect(table.find_by_tag("td").last.class_list.to_a.join(' ')).to eq "col col-created_at"
       end
     end
 
@@ -84,14 +166,14 @@ describe ActiveAdmin::Views::TableFor do
       end
 
       it "should add a class to each table header based on the col name" do
-        table.find_by_tag("th").first.class_list.should include("col-title")
+        expect(table.find_by_tag("th").first.class_list).to include("col-title")
       end
 
       [ "<span>First Post</span>",
         "<span>Second Post</span>",
         "<span>Third Post</span>" ].each_with_index do |content, index|
         it "should create a cell with #{content}" do
-          table.find_by_tag("td")[index].content.strip.should == content
+          expect(table.find_by_tag("td")[index].content.strip).to eq content
         end
       end
     end
@@ -110,7 +192,7 @@ describe ActiveAdmin::Views::TableFor do
 
       3.times do |index|
         it "should create a cell with multiple elements in row #{index}" do
-          table.find_by_tag("td")[index].find_by_tag("span").size.should == 2
+          expect(table.find_by_tag("td")[index].find_by_tag("span").size).to eq 2
         end
       end
     end
@@ -121,24 +203,20 @@ describe ActiveAdmin::Views::TableFor do
         render_arbre_component assigns, helpers do
           table_for(collection) do
             column "My Custom Title", :title
-            column :created_at , :class=>"datetime"
+            column :created_at , class:"datetime"
           end
         end
       end
 
 
       it "should add a class to each table header  based on class option or the col name" do
-        table.find_by_tag("th").first
-          .class_list.to_a.join(' ').should  == "col col-my_custom_title"
-        table.find_by_tag("th").last
-          .class_list.to_a.join(' ').should  == "col datetime"
+        expect(table.find_by_tag("th").first.class_list.to_a.join(' ')).to eq "col col-my_custom_title"
+        expect(table.find_by_tag("th").last.class_list.to_a.join(' ')).to eq "col datetime"
       end
 
       it "should add a class to each cell based  on class option or the col name" do
-        table.find_by_tag("td").first
-          .class_list.to_a.join(' ').should  == "col col-my_custom_title"
-        table.find_by_tag("td").last
-          .class_list.to_a.join(' ').should  == "col datetime"
+        expect(table.find_by_tag("td").first.class_list.to_a.join(' ')).to eq "col col-my_custom_title"
+        expect(table.find_by_tag("td").last.class_list.to_a.join(' ')).to eq "col datetime"
       end
     end
 
@@ -151,10 +229,77 @@ describe ActiveAdmin::Views::TableFor do
         end
       end
       it "should render" do
-        table.find_by_tag("th").first.content.should == "Title"
+        expect(table.find_by_tag("th").first.content).to eq "Title"
+      end
+    end
+
+    context "when using a single Hash" do
+      let(:table) do
+        render_arbre_component nil, helpers do
+          table_for foo: 1, bar: 2 do
+            column :foo
+            column :bar
+          end
+        end
+      end
+      it "should render" do
+        expect(table.find_by_tag("th")[0].content).to eq "Foo"
+        expect(table.find_by_tag("th")[1].content).to eq "Bar"
+        expect(table.find_by_tag("td")[0].content).to eq "1"
+        expect(table.find_by_tag("td")[1].content).to eq "2"
+      end
+    end
+
+    context "when using an Array of Hashes" do
+      let(:table) do
+        render_arbre_component nil, helpers do
+          table_for [{foo: 1},{foo: 2}] do
+            column :foo
+          end
+        end
+      end
+      it "should render" do
+        expect(table.find_by_tag("th")[0].content).to eq "Foo"
+        expect(table.find_by_tag("td")[0].content).to eq "1"
+        expect(table.find_by_tag("td")[1].content).to eq "2"
+      end
+    end
+
+    context "when record attribute is boolean" do
+      let(:table) do
+        render_arbre_component assigns, helpers do
+          table_for(collection) do
+            column :starred
+          end
+        end
+      end
+
+      it "should render boolean attribute within status tag" do
+        expect(table.find_by_tag("span").first.class_list.to_a.join(' ')).to eq "status_tag yes"
+        expect(table.find_by_tag("span").first.content).to eq "Yes"
+        expect(table.find_by_tag("span").last.class_list.to_a.join(' ')).to eq "status_tag no"
+        expect(table.find_by_tag("span").last.content).to eq "No"
       end
     end
 
+    context 'when row_class' do
+      let(:table) do
+        render_arbre_component assigns, helpers do
+          table_for(collection, row_class: -> e { 'starred' if e.starred }) do
+            column :starred
+          end
+        end
+      end
+
+      it 'should render boolean attribute within status tag' do
+        trs = table.find_by_tag('tr')
+        expect(trs.size).to eq 4
+        expect(trs.first.class_list.to_a.join(' ')).to eq ''
+        expect(trs.second.class_list.to_a.join(' ')).to eq 'odd starred'
+        expect(trs.third.class_list.to_a.join(' ')).to eq 'even'
+        expect(trs.fourth.class_list.to_a.join(' ')).to eq 'odd'
+      end
+    end
 
   end
 
@@ -168,34 +313,72 @@ describe ActiveAdmin::Views::TableFor do
 
     context "when default" do
       let(:table_column){ build_column(:username) }
-      it { should be_sortable }
-      its(:sort_key){ should == "username" }
+      it { is_expected.to be_sortable }
+
+      describe '#sort_key' do
+        subject { super().sort_key }
+        it{ is_expected.to eq("username") }
+      end
     end
 
     context "when a block given with no sort key" do
       let(:table_column){ build_column("Username"){ } }
-      it { should_not be_sortable }
+      it { is_expected.to be_sortable }
     end
 
     context "when a block given with a sort key" do
-      let(:table_column){ build_column("Username", :sortable => :username){ } }
-      it { should be_sortable }
-      its(:sort_key){ should == "username" }
+      let(:table_column){ build_column("Username", sortable: :username){ } }
+      it { is_expected.to be_sortable }
+
+      describe '#sort_key' do
+        subject { super().sort_key }
+        it{ is_expected.to eq("username") }
+      end
+    end
+
+    context 'when a block given with virtual attribute and no sort key' do
+      let(:table_column) { build_column(:virtual, nil, Post) { } }
+      it { is_expected.not_to be_sortable }
+    end
+
+    context 'when symbol given as a data column should be sortable' do
+      let(:table_column){ build_column('Username column', :username) }
+      it { is_expected.to be_sortable }
+
+      describe '#sort_key' do
+        subject { super().sort_key }
+        it { is_expected.to eq 'username' }
+      end
     end
 
-    context "when :sortable => false with a symbol" do
-      let(:table_column){ build_column(:username, :sortable => false) }
-      it { should_not be_sortable }
+    context 'when sortable: true with a symbol and string' do
+      let(:table_column){ build_column('Username column', :username, sortable: true) }
+      it { is_expected.to be_sortable }
+
+      describe '#sort_key' do
+        subject { super().sort_key }
+        it { is_expected.to eq 'username' }
+      end
     end
 
-    context "when :sortable => false with a symbol and string" do
-      let(:table_column){ build_column("Username", :username, :sortable => false) }
-      it { should_not be_sortable }
+    context "when sortable: false with a symbol" do
+      let(:table_column){ build_column(:username, sortable: false) }
+      it { is_expected.not_to be_sortable }
+    end
+
+    context "when sortable: false with a symbol and string" do
+      let(:table_column){ build_column("Username", :username, sortable: false) }
+      it { is_expected.not_to be_sortable }
     end
 
     context "when :sortable column is an association" do
       let(:table_column){ build_column("Category", :category, Post) }
-      it { should_not be_sortable }
+      it { is_expected.not_to be_sortable }
+    end
+
+    context 'when :sortable column is an association and block given' do
+      let(:table_column){ build_column('Category', :category, Post) { } }
+      it { is_expected.not_to be_sortable }
     end
   end
 end