yousty-activeadmin 1.0.4.pre → 1.0.5.pre

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ActiveAdmin::Views::IndexList do
 
@@ -9,24 +9,27 @@ describe ActiveAdmin::Views::IndexList do
 
     let(:helpers) do
       helpers = mock_action_view
-      helpers.stub url_for: "/"
-      helpers.stub(:params).and_return as: "table"
+      allow(helpers).to receive(:url_for).and_return("/")
+      allow(helpers).to receive(:params).and_return as: "table"
       helpers
     end
 
     subject do
-      render_arbre_component({:index_classes => index_classes}, helpers) do
+      render_arbre_component({index_classes: index_classes}, helpers) do
         index_list_renderer(index_classes)
       end
     end
 
-    its(:tag_name) { should == 'ul' }
+    describe '#tag_name' do
+      subject { super().tag_name }
+      it { is_expected.to eq 'ul'}
+    end
 
     it "should contain the names of available indexes in links" do
       a_tags = subject.find_by_tag("a")
-      a_tags.size.should == 2
-      a_tags.first.to_s.should include("Table")
-      a_tags.last.to_s.should include("List")
+      expect(a_tags.size).to eq 2
+      expect(a_tags.first.to_s).to include("Table")
+      expect(a_tags.last.to_s).to include("List")
     end
   end
 end

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

@@ -0,0 +1,46 @@
+require 'rails_helper'
+
+describe ActiveAdmin::Views::IndexAsTable::IndexTableFor do
+  describe 'creating with the dsl' do
+    let(:collection) do
+      [Post.new(title: 'First Post', starred: true)]
+    end
+    let(:active_admin_config) do
+      namespace = ActiveAdmin::Namespace.new(ActiveAdmin::Application.new, :admin)
+      namespace.batch_actions = [ActiveAdmin::BatchAction.new(:flag, 'Flag') {}]
+      namespace
+    end
+
+    let(:assigns) do
+      {
+        collection: collection,
+        active_admin_config: active_admin_config
+      }
+    end
+    let(:helpers) { mock_action_view }
+
+    context 'when creating a selectable column' do
+      let(:table) do
+        render_arbre_component assigns, helpers do
+          insert_tag(ActiveAdmin::Views::IndexAsTable::IndexTableFor, collection, {sortable: true}) do
+            selectable_column
+          end
+        end
+      end
+
+      context 'creates a table header based on the selectable column' do
+        let(:header) do
+          table.find_by_tag('th').first
+        end
+
+        it 'with selectable column class name' do
+          expect(header.attributes[:class]).to include 'col-selectable'
+        end
+
+        it 'not sortable' do
+          expect(header.attributes[:class]).not_to include 'sortable'
+        end
+      end
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ActiveAdmin::Views::PaginatedCollection do
   describe "creating with the dsl" do
@@ -10,41 +10,46 @@ describe ActiveAdmin::Views::PaginatedCollection do
 
     let(:view) do
       view = mock_action_view
-      view.request.stub(:query_parameters).and_return page: '1'
-      view.request.stub(:path_parameters).and_return  controller: 'admin/posts', action: 'index'
+      allow(view.request).to receive(:query_parameters).and_return page: '1'
+      allow(view.request).to receive(:path_parameters).and_return  controller: 'admin/posts', action: 'index'
       view
     end
 
     # Helper to render paginated collections within an arbre context
     def paginated_collection(*args)
-      render_arbre_component({:paginated_collection_args => args}, view) do
+      render_arbre_component({paginated_collection_args: args}, view) do
         paginated_collection(*paginated_collection_args)
       end
     end
 
     let(:collection) do
-      posts = [Post.new(:title => "First Post"), Post.new(:title => "Second Post"), Post.new(:title => "Third Post")]
+      posts = [Post.new(title: "First Post"), Post.new(title: "Second Post"), Post.new(title: "Third Post")]
       Kaminari.paginate_array(posts).page(1).per(5)
     end
 
     before do
-      collection.stub(:reorder) { collection }
+      allow(collection).to receive(:except) { collection } unless collection.respond_to? :except
+      allow(collection).to receive(:group_values) { [] }   unless collection.respond_to? :group_values
     end
 
-    context "when specifying collection" do
-      let(:pagination) do
-        paginated_collection(collection)
-      end
+    let(:pagination){ paginated_collection collection }
 
-      it "should set :collection as the passed in collection" do
-        pagination.find_by_class('pagination_information').first.content.should == "Displaying <b>all 3</b> posts"
-      end
+    it "should set :collection as the passed in collection" do
+      expect(pagination.find_by_class('pagination_information').first.content).to eq "Displaying <b>all 3</b> posts"
+    end
 
-      it "should raise error if collection has no pagination scope" do
-        expect {
-          paginated_collection([Post.new, Post.new])
-        }.to raise_error(StandardError, "Collection is not a paginated scope. Set collection.page(params[:page]).per(10) before calling :paginated_collection.")
-      end
+    it "should raise error if collection has no pagination scope" do
+      expect {
+        paginated_collection([Post.new, Post.new])
+      }.to raise_error(StandardError, "Collection is not a paginated scope. Set collection.page(params[:page]).per(10) before calling :paginated_collection.")
+    end
+
+    it 'should preserve custom query params' do
+      allow(view.request).to receive(:query_parameters).and_return page: '1', something: 'else'
+      pagination_content = pagination.content
+      expect(pagination_content).to include '/admin/posts.csv?page=1&amp;something=else'
+      expect(pagination_content).to include '/admin/posts.xml?page=1&amp;something=else'
+      expect(pagination_content).to include '/admin/posts.json?page=1&amp;something=else'
     end
 
     context "when specifying :param_name option" do
@@ -53,23 +58,23 @@ describe ActiveAdmin::Views::PaginatedCollection do
         Kaminari.paginate_array(posts).page(1).per(5)
       end
 
-      let(:pagination) { paginated_collection(collection, :param_name => :post_page) }
+      let(:pagination) { paginated_collection(collection, param_name: :post_page) }
 
       it "should customize the page number parameter in pagination links" do
-        pagination.children.last.content.should match(/\/admin\/posts\?post_page=2/)
+        expect(pagination.children.last.content).to match(/\/admin\/posts\?post_page=2/)
       end
     end
 
-    context "when specifying :download_links => false option" do
+    context "when specifying download_links: false option" do
       let(:collection) do
         posts = 10.times.map{ Post.new }
         Kaminari.paginate_array(posts).page(1).per(5)
       end
 
-      let(:pagination) { paginated_collection(collection, :download_links => false) }
+      let(:pagination) { paginated_collection(collection, download_links: false) }
 
       it "should not render download links" do
-        pagination.find_by_tag('div').last.content.should_not match(/Download:/)
+        expect(pagination.find_by_tag('div').last.content).to_not match(/Download:/)
       end
     end
 
@@ -79,18 +84,18 @@ describe ActiveAdmin::Views::PaginatedCollection do
         Kaminari.paginate_array(posts).page(1).per(5)
       end
 
-      let(:pagination) { paginated_collection(collection, :entry_name => "message") }
+      let(:pagination) { paginated_collection(collection, entry_name: "message") }
 
       it "should use :entry_name as the collection name" do
-        pagination.find_by_class('pagination_information').first.content.should == "Displaying <b>1</b> message"
+        expect(pagination.find_by_class('pagination_information').first.content).to eq "Displaying <b>1</b> message"
       end
     end
 
     context "when specifying :entry_name option with multiple items" do
-      let(:pagination) { paginated_collection(collection, :entry_name => "message") }
+      let(:pagination) { paginated_collection(collection, entry_name: "message") }
 
       it "should use :entry_name as the collection name" do
-        pagination.find_by_class('pagination_information').first.content.should == "Displaying <b>all 3</b> messages"
+        expect(pagination.find_by_class('pagination_information').first.content).to eq "Displaying <b>all 3</b> messages"
       end
     end
 
@@ -100,18 +105,18 @@ describe ActiveAdmin::Views::PaginatedCollection do
         Kaminari.paginate_array(posts).page(1).per(5)
       end
 
-      let(:pagination) { paginated_collection(collection, :entry_name => "singular", :entries_name => "plural") }
+      let(:pagination) { paginated_collection(collection, entry_name: "singular", entries_name: "plural") }
 
       it "should use :entry_name as the collection name" do
-        pagination.find_by_class('pagination_information').first.content.should == "Displaying <b>1</b> singular"
+        expect(pagination.find_by_class('pagination_information').first.content).to eq "Displaying <b>1</b> singular"
       end
     end
 
     context "when specifying :entry_name and :entries_name option with a multiple items" do
-      let(:pagination) { paginated_collection(collection, :entry_name => "singular", :entries_name => "plural") }
+      let(:pagination) { paginated_collection(collection, entry_name: "singular", entries_name: "plural") }
 
       it "should use :entries_name as the collection name" do
-        pagination.find_by_class('pagination_information').first.content.should == "Displaying <b>all 3</b> plural"
+        expect(pagination.find_by_class('pagination_information').first.content).to eq "Displaying <b>all 3</b> plural"
       end
     end
 
@@ -121,28 +126,24 @@ describe ActiveAdmin::Views::PaginatedCollection do
         Kaminari.paginate_array(posts).page(1).per(5)
       end
 
-      let(:pagination) { paginated_collection(collection) }
-
       it "should use 'post' as the collection name when there is no I18n translation" do
-        pagination.find_by_class('pagination_information').first.content.should == "Displaying <b>1</b> post"
+        expect(pagination.find_by_class('pagination_information').first.content).to eq "Displaying <b>1</b> post"
       end
 
       it "should use 'Singular' as the collection name when there is an I18n translation" do
-        I18n.stub(:translate) { "Singular" }
-        pagination.find_by_class('pagination_information').first.content.should == "Displaying <b>1</b> Singular"
+        allow(I18n).to receive(:translate) { "Singular" }
+        expect(pagination.find_by_class('pagination_information').first.content).to eq "Displaying <b>1</b> Singular"
       end
     end
 
     context "when omitting :entry_name with multiple items" do
-      let(:pagination) { paginated_collection(collection) }
-
       it "should use 'posts' as the collection name when there is no I18n translation" do
-        pagination.find_by_class('pagination_information').first.content.should == "Displaying <b>all 3</b> posts"
+        expect(pagination.find_by_class('pagination_information').first.content).to eq "Displaying <b>all 3</b> posts"
       end
 
       it "should use 'Plural' as the collection name when there is an I18n translation" do
-        I18n.stub(:translate) { "Plural" }
-        pagination.find_by_class('pagination_information').first.content.should == "Displaying <b>all 3</b> Plural"
+        allow(I18n).to receive(:translate) { "Plural" }
+        expect(pagination.find_by_class('pagination_information').first.content).to eq "Displaying <b>all 3</b> Plural"
       end
     end
 
@@ -152,37 +153,31 @@ describe ActiveAdmin::Views::PaginatedCollection do
         Kaminari.paginate_array(posts).page(1).per(5)
       end
 
-      let(:pagination) { paginated_collection(collection) }
-
       it "should display 'No entries found'" do
-        pagination.find_by_class('pagination_information').first.content.should == "No entries found"
+        expect(pagination.find_by_class('pagination_information').first.content).to eq "No entries found"
       end
     end
 
     context "when collection comes from find with GROUP BY" do
       let(:collection) do
-        %w{Foo Foo Bar}.each {|title| Post.create(:title => title) }
+        %w{Foo Foo Bar}.each {|title| Post.create(title: title) }
         Post.select(:title).group(:title).page(1).per(5)
       end
 
-      let(:pagination) { paginated_collection(collection) }
-
       it "should display proper message (including number and not hash)" do
-        pagination.find_by_class('pagination_information').first.content.should == "Displaying <b>all 2</b> posts"
+        expect(pagination.find_by_class('pagination_information').first.content).to eq "Displaying <b>all 2</b> posts"
       end
     end
 
     context "when collection with many pages comes from find with GROUP BY" do
       let(:collection) do
-        %w{Foo Foo Bar Baz}.each {|title| Post.create(:title => title) }
+        %w{Foo Foo Bar Baz}.each {|title| Post.create(title: title) }
         Post.select(:title).group(:title).page(1).per(2)
       end
 
-      let(:pagination) { paginated_collection(collection) }
-
       it "should display proper message (including number and not hash)" do
-        pagination.find_by_class('pagination_information').first.content.
-          gsub('&nbsp;',' ').should == "Displaying posts <b>1 - 2</b> of <b>3</b> in total"
+        expect(pagination.find_by_class('pagination_information').first.content.gsub('&nbsp;',' ')).
+          to eq "Displaying posts <b>1 - 2</b> of <b>3</b> in total"
       end
     end
 
@@ -191,11 +186,9 @@ describe ActiveAdmin::Views::PaginatedCollection do
         Kaminari.paginate_array([Post.new] * 81).page(3).per(30)
       end
 
-      let(:pagination) { paginated_collection(collection) }
-
       it "should show the proper item counts" do
-        pagination.find_by_class('pagination_information').first.content.
-            gsub('&nbsp;',' ').should == "Displaying posts <b>61 - 81</b> of <b>81</b> in total"
+        expect(pagination.find_by_class('pagination_information').first.content.gsub('&nbsp;',' ')).
+          to eq "Displaying posts <b>61 - 81</b> of <b>81</b> in total"
       end
     end
 
@@ -209,7 +202,7 @@ describe ActiveAdmin::Views::PaginatedCollection do
 
         it "should not show the total item counts" do
           info = pagination.find_by_class('pagination_information').first.content.gsub('&nbsp;',' ')
-          info.should eq "Displaying posts <b>1 - 30</b>"
+          expect(info).to eq "Displaying posts <b>1 - 30</b>"
         end
       end
 
@@ -218,10 +211,26 @@ describe ActiveAdmin::Views::PaginatedCollection do
 
         it "should show the total item counts" do
           info = pagination.find_by_class('pagination_information').first.content.gsub('&nbsp;',' ')
-          info.should eq "Displaying posts <b>1 - 30</b> of <b>256</b> in total"
+          expect(info).to eq "Displaying posts <b>1 - 30</b> of <b>256</b> in total"
         end
       end
     end
 
+    context "when specifying per_page: array option" do
+      let(:collection) do
+        posts = 10.times.map { Post.new }
+        Kaminari.paginate_array(posts).page(1).per(5)
+      end
+
+      let(:pagination) { paginated_collection(collection, per_page: [1, 2, 3]) }
+      let(:pagination_html) { pagination.find_by_class("pagination_per_page").first }
+      let(:pagination_node) { Capybara.string(pagination_html.to_s) }
+
+      it "should render per_page select tag" do
+        expect(pagination_html.content).to match(/Per page:/)
+        expect(pagination_node).to have_css("select option", count: 3)
+      end
+    end
+
   end
 end

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

@@ -1,51 +1,62 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ActiveAdmin::Views::Panel do
-
-  let(:the_panel) do
+  let(:arbre_panel) do
     render_arbre_component do
-      panel "My Title" do
+      panel "My Title", icon: :arrow_down do
+        header_action link_to("My Link", "https://www.github.com/activeadmin/activeadmin")
         span("Hello World")
       end
     end
   end
 
+  let(:panel_html) { Capybara.string(arbre_panel.to_s) }
+
   it "should have a title h3" do
-    the_panel.find_by_tag("h3").first.content.should == "My Title"
+    expect(panel_html).to have_css 'h3', text: "My Title"
+  end
+
+  it "should add panel actions to the panel header" do
+    link = panel_html.find('h3 > div.header_action a')
+    expect(link.text).to eq('My Link')
+    expect(link[:href]).to eq("https://www.github.com/activeadmin/activeadmin")
   end
 
   it "should have a contents div" do
-    the_panel.find_by_tag("div").first.class_list.should include("panel_contents")
+    expect(panel_html).to have_css 'div.panel_contents'
   end
 
   it "should add children to the contents div" do
-    the_panel.find_by_tag("span").first.parent.should == the_panel.find_by_tag("div").first
+    expect(panel_html).to have_css 'div.panel_contents > span', text: "Hello World"
   end
 
   it "should set the icon" do
-    the_panel = render_arbre_component do
-      panel("Title", :icon => :arrow_down)
-    end
-    the_panel.find_by_tag("h3").first.content.should include("span class=\"icon")
+    expect(panel_html).to have_css "h3 > span.icon"
   end
 
-  it "should allow a html_safe title (without icon)" do
-    title_with_html = %q[Title with <abbr>HTML</abbr>].html_safe
-    the_panel = render_arbre_component do
-      panel(title_with_html)
+  context "with html-safe title" do
+    let(:arbre_panel) do
+      title_with_html = %q[Title with <abbr>HTML</abbr>].html_safe
+      render_arbre_component do
+        panel(title_with_html)
+      end
+    end
+
+    it "should allow a html_safe title" do
+      expect(panel_html).to have_css "h3", text: "Title with HTML"
+      expect(panel_html).to have_css "h3 > abbr", text: "HTML"
     end
-    the_panel.find_by_tag("h3").first.content.should eq(title_with_html)
   end
 
   describe "#children?" do
-
-    it "returns false if no children have been added to the panel" do
-      the_panel = render_arbre_component do
+    let(:arbre_panel) do
+      render_arbre_component do
         panel("A Panel")
       end
-      the_panel.children?.should == false
     end
 
+    it "returns false if no children have been added to the panel" do
+      expect(arbre_panel.children?).to eq false
+    end
   end
-
 end

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