activeadmin 0.6.6 → 1.0.0.pre1

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

@@ -1,33 +1,33 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ActiveAdmin::Views::Popover do
 
   let(:the_popover) do
     render_arbre_component do
-      popover :id => "my_awesome_popover" do
+      popover id: "my_awesome_popover" do
         para "Hello World, this is popover content baby."
       end
     end
   end
 
   it "should have the class of 'sidebar_section'" do
-    the_popover.class_list.should include("popover")
+    expect(the_popover.class_list).to include("popover")
   end
 
   it "should have an inner content element class of 'popover_contents'" do
-    the_popover.find_by_tag("div").first.class_list.should include("popover_contents")
+    expect(the_popover.find_by_tag("div").first.class_list).to include("popover_contents")
   end
 
   it "should have the popover content in the inner content element" do
-    the_popover.find_by_class("popover_contents").first.content.should include("Hello World, this is popover content baby.")
+    expect(the_popover.find_by_class("popover_contents").first.content).to include("Hello World, this is popover content baby.")
   end
 
   it "should have an id" do
-    the_popover.id.should == "my_awesome_popover"
+    expect(the_popover.id).to eq "my_awesome_popover"
   end
 
   it "should be hidden" do
-    the_popover.attributes.should include(:style => "display: none");
+    expect(the_popover.attributes).to include(style: "display: none");
   end
 
 end

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,11 +1,11 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ActiveAdmin::Views::SiteTitle do
 
   let(:helpers){ mock_action_view }
 
   def build_title(namespace)
-    render_arbre_component({:namespace => namespace}, helpers) do
+    render_arbre_component({namespace: namespace}, helpers) do
       insert_tag ActiveAdmin::Views::SiteTitle, assigns[:namespace]
     end
   end
@@ -13,32 +13,32 @@ describe ActiveAdmin::Views::SiteTitle do
   context "when a value" do
 
     it "renders the string when a string is passed in" do
-      namespace = mock :site_title => "Hello World",
-                       :site_title_image => nil,
-                       :site_title_link => nil
+      namespace = double site_title: "Hello World",
+                         site_title_image: nil,
+                         site_title_link: nil
 
       site_title = build_title(namespace)
-      site_title.content.should == "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 = mock :site_title => :hello_world,
-                       :site_title_image => nil,
-                       :site_title_link => nil
+      namespace = double site_title: :hello_world,
+                         site_title_image: nil,
+                         site_title_link: nil
 
       site_title = build_title(namespace)
-      site_title.content.should == "Hello World"
+      expect(site_title.content).to eq "Hello World"
     end
 
     it "renders the return value of a proc" do
-      namespace = mock :site_title => proc{ "Hello World" },
-                       :site_title_image => nil,
-                       :site_title_link => nil
+      namespace = double site_title: proc{ "Hello World" },
+                         site_title_image: nil,
+                         site_title_link: nil
 
       site_title = build_title(namespace)
-      site_title.content.should == "Hello World"
+      expect(site_title.content).to eq "Hello World"
     end
 
   end
@@ -46,16 +46,16 @@ 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).
-        with("an/image.png", {:alt => nil, :id => "site_title_image"}).
-        and_return("<img src=\"/assets/an/image.png\" />".html_safe)
+      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
 
-      namespace = mock :site_title => nil,
-                       :site_title_image => "an/image.png",
-                       :site_title_link => nil
+      namespace = double site_title: nil,
+                         site_title_image: "an/image.png",
+                         site_title_link: nil
 
       site_title = build_title(namespace)
-      site_title.content.strip.should == "<img src=\"/assets/an/image.png\" />"
+      expect(site_title.content.strip).to eq '<img src="/assets/an/image.png" />'
     end
 
   end
@@ -63,12 +63,12 @@ describe ActiveAdmin::Views::SiteTitle do
   context "when a link is present" do
 
     it "renders the string when a string is passed in" do
-      namespace = mock :site_title => "Hello World",
-                       :site_title_image => nil,
-                       :site_title_link => "/"
+      namespace = double site_title: "Hello World",
+                         site_title_image: nil,
+                         site_title_link: "/"
 
       site_title = build_title(namespace)
-      site_title.content.should == "<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