yousty-activeadmin 1.0.4.pre → 1.0.5.pre

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ActiveAdmin::Views::AttributesTable do
 
@@ -6,13 +6,13 @@ describe ActiveAdmin::Views::AttributesTable do
     let(:helpers) { action_view }
 
     let(:post) do
-      post = Post.new :title => "Hello World", :body => nil
-      post.stub(:id){ 1 }
-      post.stub(:new_record?){ false }
+      post = Post.new title: "Hello World", body: nil
+      allow(post).to receive(:id){ 1 }
+      allow(post).to receive(:new_record?){ false }
       post
     end
 
-    let(:assigns){ { :post => post } }
+    let(:assigns){ { post: post } }
 
     # Loop through a few different ways to make the same table
     # and ensure that they produce the same results
@@ -61,17 +61,17 @@ describe ActiveAdmin::Views::AttributesTable do
         let(:table) { instance_eval &table_decleration }
 
         it "should render a div wrapper with the class '.attributes_table'" do
-          table.tag_name.should == 'div'
-          table.attr(:class).should include('attributes_table')
+          expect(table.tag_name).to eq 'div'
+          expect(table.attr(:class)).to include('attributes_table')
         end
 
         it "should add id and type class" do
-          table.class_names.should include("post")
-          table.id.should == "attributes_table_post_1"
+          expect(table.class_names).to include("post")
+          expect(table.id).to eq "attributes_table_post_1"
         end
 
         it "should render 3 rows" do
-          table.find_by_tag("tr").size.should == 3
+          expect(table.find_by_tag("tr").size).to eq 3
         end
 
         describe "rendering the rows" do
@@ -79,17 +79,16 @@ describe ActiveAdmin::Views::AttributesTable do
             ["Id" , "1"],
             ["Title" , "Hello World"],
             ["Body" , "<span class=\"empty\">Empty</span>"]
-          ].each_with_index do |set, i|
-            describe "for #{set[0]}" do
-              let(:title){ set[0] }
-              let(:content){ set[1] }
+          ].each_with_index do |(title, content), i|
+            describe "for #{title}" do
               let(:current_row){ table.find_by_tag("tr")[i] }
 
-              it "should have the title '#{set[0]}'" do
-                current_row.find_by_tag("th").first.content.should == title
+              it "should have the title '#{title}'" do
+                expect(current_row.find_by_tag("th").first.content).to eq title
               end
-              it "should have the content '#{set[1]}'" do
-                current_row.find_by_tag("td").first.content.chomp.strip.should == content
+
+              it "should have the content '#{content}'" do
+                expect(current_row.find_by_tag("td").first.content.chomp.strip).to eq content
               end
             end
           end
@@ -105,51 +104,64 @@ describe ActiveAdmin::Views::AttributesTable do
           row :created_at
         end
       }
-      table.find_by_tag("tr").first.to_s.
-        split("\n").first.lstrip.
-          should == '<tr class="row row-title">'
+      expect(table.find_by_tag("tr").first.to_s.
+        split("\n").first.lstrip).
+          to eq '<tr class="row row-title">'
 
-      table.find_by_tag("tr").last.to_s.
-        split("\n").first.lstrip.
-          should == '<tr class="row row-created_at">'
+      expect(table.find_by_tag("tr").last.to_s.
+        split("\n").first.lstrip).
+          to eq '<tr class="row row-created_at">'
     end
 
     it "should allow html options for the row itself" do
       table = render_arbre_component(assigns) {
         attributes_table_for(post) do
-          row("Wee", :class => "custom_row", :style => "custom_style") { }
+          row("Wee", class: "custom_row", style: "custom_style") { }
         end
       }
-      table.find_by_tag("tr").first.to_s.
-        split("\n").first.lstrip.
-          should == '<tr class="row custom_row" style="custom_style">'
+      expect(table.find_by_tag("tr").first.to_s.split("\n").first.lstrip).
+        to eq '<tr class="row custom_row" style="custom_style">'
     end
 
     it "should allow html content inside the attributes table" do
       table = render_arbre_component(assigns) {
         attributes_table_for(post) do
-          row("ID"){ span(post.id, :class => 'id') }
+          row("ID"){ span(post.id, class: 'id') }
         end
       }
-      table.find_by_tag("td").first.content.chomp.strip.should == "<span class=\"id\">1</span>"
+      expect(table.find_by_tag("td").first.content.chomp.strip).to eq "<span class=\"id\">1</span>"
     end
 
-    it "should check if an association exists when an attribute has id in it" do
-      post.author = User.new :username => 'john_doe', :first_name => 'John', :last_name => 'Doe'
-      table = render_arbre_component(assigns) {
-        attributes_table_for post, :author_id
-      }
-      table.find_by_tag('td').first.content.should == 'John Doe'
+    context 'an attribute ending in _id' do
+      before do
+        post.foo_id = 23
+        post.author = User.new username: 'john_doe', first_name: 'John', last_name: 'Doe'
+      end
+      it 'should call the association if one exists' do
+        table = render_arbre_component assigns do
+          attributes_table_for post, :author_id
+        end
+        expect(table.find_by_tag('th').first.content).to eq 'Author'
+        expect(table.find_by_tag('td').first.content).to eq 'John Doe'
+      end
+      it 'should not attempt to call a nonexistant association' do
+        table = render_arbre_component assigns do
+          attributes_table_for post, :foo_id
+        end
+        expect(table.find_by_tag('th').first.content).to eq 'Foo'
+        expect(table.find_by_tag('td').first.content).to eq '23'
+      end
     end
 
     context "with a collection" do
       let(:posts) do
-        [Post.new(:title => "Hello World", :id => 1), Post.new(:title => "Multi Column", :id => 2)].each_with_index do |post, index|
-          post.stub(:id => index + 1, :new_record? => false)
+        [Post.new(title: "Hello World", id: 1), Post.new(title: "Multi Column", id: 2)].each_with_index do |post, index|
+          allow(post).to receive(:id).and_return(index + 1)
+          allow(post).to receive(:new_record?).and_return(false)
         end
       end
 
-      let(:assigns) { { :posts => posts } }
+      let(:assigns) { { posts: posts } }
 
       let(:table) do
         render_arbre_component(assigns) do
@@ -158,38 +170,38 @@ describe ActiveAdmin::Views::AttributesTable do
       end
 
       it "does not set id on the table" do
-        table.attr(:id).should be_nil
+        expect(table.attr(:id)).to be_nil
       end
 
       context "colgroup" do
         let(:cols) { table.find_by_tag "col" }
 
         it "contains a col for each record (plus headers)" do
-          cols.size.should == (2 + 1)
+          expect(cols.size).to eq (2 + 1)
         end
 
         it "assigns an id to each col" do
           cols[1..-1].each_with_index do |col, index|
-            col.id.should == "attributes_table_post_#{index + 1}"
+            expect(col.id).to eq "attributes_table_post_#{index + 1}"
           end
         end
 
         it "assigns a class to each col" do
           cols[1..-1].each_with_index do |col, index|
-            col.class_names.should include("post")
+            expect(col.class_names).to include("post")
           end
         end
 
         it "assigns alternation classes to each col" do
           cols[1..-1].each_with_index do |col, index|
-            col.class_names.should include(["even", "odd"][index % 2])
+            expect(col.class_names).to include(["even", "odd"][index % 2])
           end
         end
       end
 
       context "when rendering the rows" do
         it "should contain 3 columns" do
-          table.find_by_tag("tr").first.children.size.should == 3
+          expect(table.find_by_tag("tr").first.children.size).to eq 3
         end
 
         [
@@ -202,29 +214,59 @@ describe ActiveAdmin::Views::AttributesTable do
             let(:current_row){ table.find_by_tag("tr")[i] }
 
             it "should have the title '#{set[0]}'" do
-              current_row.find_by_tag("th").first.content.should == title
+              expect(current_row.find_by_tag("th").first.content).to eq title
             end
 
             context "with defined attribute name translation" do
               it "should have the translated attribute name in the title" do
-                begin
-                  I18n.backend.store_translations(:en, :activerecord => { :attributes => { :post => { :title => 'Translated Title', :id => 'Translated Id' } } })
-                  current_row.find_by_tag("th").first.content.should == "Translated #{title}"
-                ensure
-                  I18n.backend.reload!
+                with_translation activerecord: {attributes: {post: {title: 'Translated Title', id: 'Translated Id'}}} do
+                  expect(current_row.find_by_tag("th").first.content).to eq "Translated #{title}"
                 end
               end
             end
 
             set[1..-1].each_with_index do |content, index|
               it "column #{index} should have the content '#{content}'" do
-                current_row.find_by_tag("td")[index].content.chomp.strip.should == content
+                expect(current_row.find_by_tag("td")[index].content.chomp.strip).to eq content
               end
             end
           end
         end
       end # describe rendering rows
     end # with a collection
+
+
+    context "when using a single Hash" do
+      let(:table) do
+        render_arbre_component nil, helpers do
+          attributes_table_for foo: 1, bar: 2 do
+            row :foo
+            row :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
+          attributes_table_for [{foo: 1},{foo: 2}] do
+            row :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
   end
 
 end

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'active_admin/batch_actions/views/batch_action_popover'
 
 describe ActiveAdmin::BatchActions::BatchActionPopover do
@@ -14,7 +14,7 @@ describe ActiveAdmin::BatchActions::BatchActionPopover do
   end
 
   it "should have an id" do
-    the_popover.id.should == "batch_actions_popover"
+    expect(the_popover.id).to eq "batch_actions_popover"
   end
 
   describe "the action list" do
@@ -22,11 +22,25 @@ describe ActiveAdmin::BatchActions::BatchActionPopover do
       the_popover.find_by_class("popover_contents").first
     end
 
-    its(:tag_name) { should eql("ul") }
+    describe '#tag_name' do
+      subject { super().tag_name }
+      it { is_expected.to eql("ul") }
+    end
+
+    describe '#content' do
+      subject { super().content }
+      it{ is_expected.to include("class=\"batch_action\" data-action=\"action_1\"") }
+    end
 
-    its(:content){ should include("class=\"batch_action\" data-action=\"action_1\"") }
-    its(:content){ should include("class=\"batch_action\" data-action=\"action_2\"") }
-    its(:content){ should include("class=\"batch_action\" data-action=\"action_3\"") }
+    describe '#content' do
+      subject { super().content }
+      it{ is_expected.to include("class=\"batch_action\" data-action=\"action_2\"") }
+    end
+
+    describe '#content' do
+      subject { super().content }
+      it{ is_expected.to include("class=\"batch_action\" data-action=\"action_3\"") }
+    end
 
   end
 

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ActiveAdmin::Views::BlankSlate do
 
@@ -9,9 +9,19 @@ describe ActiveAdmin::Views::BlankSlate do
       end
     end
 
-    its(:tag_name)    { should eql 'div' }
-    its(:class_list)  { should include('blank_slate_container') }
+    describe '#tag_name' do
+      subject { super().tag_name }
+      it    { is_expected.to eql 'div' }
+    end
+
+    describe '#class_list' do
+      subject { super().class_list }
+      it  { is_expected.to include('blank_slate_container') }
+    end
 
-    its(:content)     { should include '<span class="blank_slate">There are no Posts yet. <a href="/posts/new">Create one</a></span>' }
+    describe '#content' do
+      subject { super().content }
+      it     { is_expected.to include '<span class="blank_slate">There are no Posts yet. <a href="/posts/new">Create one</a></span>' }
+    end
   end
 end

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ActiveAdmin::Views::Columns do
 
@@ -12,16 +12,16 @@ describe ActiveAdmin::Views::Columns do
     end
 
     it "should have the class .columns" do
-      cols.class_list.should include("columns")
+      expect(cols.class_list).to include("columns")
     end
 
     it "should have one column" do
-      cols.children.size.should == 1
-      cols.children.first.class_list.should include("column")
+      expect(cols.children.size).to eq 1
+      expect(cols.children.first.class_list).to include("column")
     end
 
     it "should have one column with the width 100.0%" do
-      cols.children.first.attr(:style).should include("width: 100.0%")
+      expect(cols.children.first.attr(:style)).to include("width: 100.0%")
     end
   end
 
@@ -36,15 +36,15 @@ describe ActiveAdmin::Views::Columns do
     end
 
     it "should have two columns" do
-      cols.children.size.should == 2
+      expect(cols.children.size).to eq 2
     end
 
     it "should have a first column with width 49% and margin 2%" do
-      cols.children.first.attr(:style).should == "width: 49.0%; margin-right: 2%;"
+      expect(cols.children.first.attr(:style)).to eq "width: 49.0%; margin-right: 2%;"
     end
 
     it "should have a second column with width 49% and no right margin" do
-      cols.children.last.attr(:style).should == "width: 49.0%;"
+      expect(cols.children.last.attr(:style)).to eq "width: 49.0%;"
     end
   end
 
@@ -61,18 +61,18 @@ describe ActiveAdmin::Views::Columns do
     end
 
     it "should have four columns" do
-      cols.children.size.should == 4
+      expect(cols.children.size).to eq 4
     end
 
 
     (0..2).to_a.each do |index|
       it "should have column #{index + 1} with width 49% and margin 2%" do
-        cols.children[index].attr(:style).should == "width: 23.5%; margin-right: 2%;"
+        expect(cols.children[index].attr(:style)).to eq "width: 23.5%; margin-right: 2%;"
       end
     end
 
     it "should have column 4 with width 49% and no margin" do
-      cols.children[3].attr(:style).should == "width: 23.5%;"
+      expect(cols.children[3].attr(:style)).to eq "width: 23.5%;"
     end
   end
 
@@ -81,7 +81,7 @@ describe ActiveAdmin::Views::Columns do
     let(:cols) do
       render_arbre_component do
         columns do
-          column(:span => 2){ "Hello World" }
+          column(span: 2){ "Hello World" }
           column(){ "Hello World" }
           column(){ "Hello World" }
         end
@@ -89,11 +89,11 @@ describe ActiveAdmin::Views::Columns do
     end
 
     it "should set the span when declared" do
-      cols.children.first.attr(:style).should == "width: 49.0%; margin-right: 2%;"
+      expect(cols.children.first.attr(:style)).to eq "width: 49.0%; margin-right: 2%;"
     end
 
     it "should default to 1 if not passed in" do
-      cols.children.last.attr(:style).should == "width: 23.5%;"
+      expect(cols.children.last.attr(:style)).to eq "width: 23.5%;"
     end
   end
 
@@ -102,18 +102,33 @@ describe ActiveAdmin::Views::Columns do
     let(:cols) do
       render_arbre_component do
         columns do
-          column(:max_width => "100px"){ "Hello World" }
+          column(max_width: "100px"){ "Hello World" }
           column(){ "Hello World" }
         end
       end
     end
 
     it "should set the max with if passed in" do
-      cols.children.first.attr(:style).should == "width: 49.0%; max-width: 100px; margin-right: 2%;"
+      expect(cols.children.first.attr(:style)).to eq "width: 49.0%; max-width: 100px; margin-right: 2%;"
     end
 
-    it "should omit the value if not presetn" do
-      cols.children.last.attr(:style).should == "width: 49.0%;"
+    it "should omit the value if not present" do
+      expect(cols.children.last.attr(:style)).to eq "width: 49.0%;"
+    end
+
+    context "when passed an integer value" do
+      let(:cols) do
+        render_arbre_component do
+          columns do
+            column(max_width: 100){ "Hello World" }
+            column(){ "Hello World" }
+          end
+        end
+      end
+
+      it "should be treated as pixels" do
+        expect(cols.children.first.attr(:style)).to eq "width: 49.0%; max-width: 100px; margin-right: 2%;"
+      end
     end
 
   end
@@ -123,18 +138,33 @@ describe ActiveAdmin::Views::Columns do
     let(:cols) do
       render_arbre_component do
         columns do
-          column(:min_width => "100px"){ "Hello World" }
+          column(min_width: "100px"){ "Hello World" }
           column(){ "Hello World" }
         end
       end
     end
 
     it "should set the min with if passed in" do
-      cols.children.first.attr(:style).should == "width: 49.0%; min-width: 100px; margin-right: 2%;"
+      expect(cols.children.first.attr(:style)).to eq "width: 49.0%; min-width: 100px; margin-right: 2%;"
     end
 
-    it "should omit the value if not presetn" do
-      cols.children.last.attr(:style).should == "width: 49.0%;"
+    it "should omit the value if not present" do
+      expect(cols.children.last.attr(:style)).to eq "width: 49.0%;"
+    end
+
+    context "when passed an integer value" do
+      let(:cols) do
+        render_arbre_component do
+          columns do
+            column(min_width: 100){ "Hello World" }
+            column(){ "Hello World" }
+          end
+        end
+      end
+
+      it "should be treated as pixels" do
+        expect(cols.children.first.attr(:style)).to eq "width: 49.0%; min-width: 100px; margin-right: 2%;"
+      end
     end
 
   end