activeadmin 1.0.0.pre1 → 1.0.0.pre2

data/spec/unit/generators/install_spec.rb

@@ -3,8 +3,9 @@ require 'rails_helper'
 describe "AA installation" do
   context "should create" do
 
-    it "active_admin.css.scss" do
-      expect(File.exists?(Rails.root + "app/assets/stylesheets/active_admin.css.scss")).to be_truthy
+    it "active_admin.scss" do
+      path = Rails.root + "app/assets/stylesheets/active_admin.scss"
+      expect(File.exists? path).to be_truthy
     end
 
     it "active_admin.js.coffee" do

data/spec/unit/pretty_format_spec.rb

@@ -7,7 +7,7 @@ describe "#pretty_format" do
     mock_action_view.send *args, &block
   end
 
-  {String: 'hello', Fixnum: 23, Float: 5.67, Bignum: 10**30,
+  {String: 'hello', Fixnum: 23, Float: 5.67, Bignum: 10**30, Symbol: :foo,
     'Arbre::Element' => Arbre::Element.new.br(:foo)
   }.each do |klass, obj|
     it "should call `to_s` on #{klass}s" do
@@ -29,6 +29,20 @@ describe "#pretty_format" do
         expect(pretty_format(t)).to eq "February 28, 1985 20:15"
       end
 
+      context "apply custom localize format" do
+        before do
+          ActiveAdmin.application.localize_format = :short
+        end
+        after do
+          ActiveAdmin.application = nil
+        end
+        it "should actually do the formatting" do
+          t = Time.utc(1985, "feb", 28, 20, 15, 1)
+
+          expect(pretty_format(t)).to eq "28 Feb 20:15"
+        end
+      end
+
       context "with non-English locale" do
         before(:all) do
           @previous_locale = I18n.locale.to_s

data/spec/unit/resource_collection_spec.rb

@@ -151,6 +151,23 @@ describe ActiveAdmin::ResourceCollection do
         expect(collection[name]).to eq renamed_resource
       end
     end
+
+    context "with a resource and a renamed resource added in disorder" do
+      let(:resource) { ActiveAdmin::Resource.new namespace, resource_class }
+      let(:renamed_resource) do
+        ActiveAdmin::Resource.new namespace, resource_class, as: name
+      end
+      let(:name) { "Administrators" }
+
+      before do
+        collection.add renamed_resource
+        collection.add resource
+      end
+
+      it "should find a resource by class when there are two resources with that class" do
+        expect(collection[resource_class]).to eq resource
+      end
+    end
   end
 
   skip "specs for subclasses of Page and Resource"

data/spec/unit/resource_controller_spec.rb

@@ -157,7 +157,7 @@ end
 
 describe Admin::PostsController, type: "controller" do
 
-  describe 'retreiving the resource' do
+  describe 'retrieving the resource' do
     let(:controller){ Admin::PostsController.new }
     let(:post) { Post.new title: "An incledibly unique Post Title" }
 
@@ -186,7 +186,7 @@ describe Admin::PostsController, type: "controller" do
     end
   end
 
-  describe 'retreiving the resource collection' do
+  describe 'retrieving the resource collection' do
     let(:controller){ Admin::PostsController.new }
     let(:config) { controller.class.active_admin_config }
     before do

data/spec/unit/resource_registration_spec.rb

@@ -13,7 +13,7 @@ describe "Registering an object to administer" do
     end
 
     it "should dispatch a Resource::RegisterEvent" do
-      expect(ActiveAdmin::Event).to receive(:dispatch).with(ActiveAdmin::Resource::RegisterEvent, an_instance_of(ActiveAdmin::Resource))
+      expect(ActiveSupport::Notifications).to receive(:publish).with(ActiveAdmin::Resource::RegisterEvent, an_instance_of(ActiveAdmin::Resource))
       application.register Category
     end
   end
@@ -28,8 +28,8 @@ describe "Registering an object to administer" do
     end
 
     it "should generate a Namespace::RegisterEvent and a Resource::RegisterEvent" do
-      expect(ActiveAdmin::Event).to receive(:dispatch).with(ActiveAdmin::Namespace::RegisterEvent, an_instance_of(ActiveAdmin::Namespace))
-      expect(ActiveAdmin::Event).to receive(:dispatch).with(ActiveAdmin::Resource::RegisterEvent, an_instance_of(ActiveAdmin::Resource))
+      expect(ActiveSupport::Notifications).to receive(:publish).with(ActiveAdmin::Namespace::RegisterEvent, an_instance_of(ActiveAdmin::Namespace))
+      expect(ActiveSupport::Notifications).to receive(:publish).with(ActiveAdmin::Resource::RegisterEvent, an_instance_of(ActiveAdmin::Resource))
       application.register Category, namespace: :not_yet_created
     end
   end

data/spec/unit/resource_spec.rb

@@ -232,7 +232,11 @@ module ActiveAdmin
       let(:resource) { namespace.register(Post) }
       let(:post) { double }
       before do
-        allow(Post).to receive(:find_by_id).with('12345') { post }
+        if Rails::VERSION::MAJOR >= 4
+          allow(Post).to receive(:find_by).with("id" => "12345") { post }
+        else
+          allow(Post).to receive(:find_by_id).with("12345") { post }
+        end
       end
 
       it 'can find the resource' do
@@ -250,7 +254,13 @@ module ActiveAdmin
         let(:different_post) { double }
         before do
           allow(Post).to receive(:primary_key).and_return 'something_else'
-          allow(Post).to receive(:find_by_something_else).with('55555') { different_post }
+          if Rails::VERSION::MAJOR >= 4
+            allow(Post).to receive(:find_by).
+              with("something_else" => "55555") { different_post }
+          else
+            allow(Post).to receive(:find_by_something_else).
+              with("55555") { different_post }
+          end
         end
 
         it 'can find the post by the custom primary key' do
@@ -274,5 +284,46 @@ module ActiveAdmin
         end
       end
     end
+
+    describe "delegation" do
+      let(:controller) {
+        Class.new do
+          def method_missing(name, *args, &block)
+            "called #{name}"
+          end
+        end.new
+      }
+      let(:resource) { ActiveAdmin::ResourceDSL.new(double, double) }
+
+      before do
+        expect(resource).to receive(:controller).and_return(controller)
+      end
+
+      context "filters" do
+        [
+          :before_filter, :skip_before_filter,
+          :after_filter, :skip_after_filter,
+          :around_filter, :skip_filter
+        ].each do |filter|
+          it "delegates #{filter}" do
+            expect(resource.send(filter)).to eq "called #{filter}"
+          end
+        end
+      end
+
+      if Rails::VERSION::MAJOR == 4
+        context "actions" do
+          [
+            :before_action, :skip_before_action,
+            :after_action, :skip_after_action,
+            :around_action, :skip_action
+          ].each do |action|
+            it "delegates #{action}" do
+              expect(resource.send(action)).to eq "called #{action}"
+            end
+          end
+        end
+      end
+    end
   end
 end

data/spec/unit/view_factory_spec.rb

@@ -14,8 +14,6 @@ describe ActiveAdmin::ViewFactory do
   it_should_have_view :action_items,         ActiveAdmin::Views::ActionItems
   it_should_have_view :header,               ActiveAdmin::Views::Header
   it_should_have_view :blank_slate,          ActiveAdmin::Views::BlankSlate
-  it_should_have_view :action_list_popover,  ActiveAdmin::Views::ActionListPopover
-
   it_should_have_view :layout,               ActiveAdmin::Views::Pages::Layout
 
 end

data/spec/unit/view_helpers/display_name_spec.rb

@@ -31,10 +31,12 @@ describe "display_name" do
     expect(display_name subject).to eq 'foo@bar.baz'
   end
 
-  [nil, false].each do |type|
-    it "should return nil when the passed object is #{type.inspect}" do
-      expect(display_name type).to eq nil
-    end
+  it "should return `nil` when the passed object is `nil`" do
+    expect(display_name nil).to eq nil
+  end
+
+  it "should return 'false' when the passed objct is `false`" do
+    expect(display_name false).to eq "false"
   end
 
   it "should default to `to_s`" do

data/spec/unit/views/components/{batch_action_popover_spec.rb → batch_action_selector_spec.rb}

@@ -1,25 +1,21 @@
 require 'rails_helper'
-require 'active_admin/batch_actions/views/batch_action_popover'
+require 'active_admin/batch_actions/views/batch_action_selector'
 
-describe ActiveAdmin::BatchActions::BatchActionPopover do
+describe ActiveAdmin::BatchActions::BatchActionSelector do
 
-  let(:the_popover) do
+  let(:dropdown) do
     render_arbre_component do
-      batch_action_popover do
-        action ActiveAdmin::BatchAction.new( :action_1, "Action 1" )
-        action ActiveAdmin::BatchAction.new( :action_2, "Action 2" )
-        action ActiveAdmin::BatchAction.new( :action_3, "Action 3" )
-      end
+      batch_action_selector [
+        ActiveAdmin::BatchAction.new(:action_1, "Action 1"),
+        ActiveAdmin::BatchAction.new(:action_2, "Action 2"),
+        ActiveAdmin::BatchAction.new(:action_3, "Action 3")
+      ]
     end
   end
 
-  it "should have an id" do
-    expect(the_popover.id).to eq "batch_actions_popover"
-  end
-
   describe "the action list" do
     subject do
-      the_popover.find_by_class("popover_contents").first
+      dropdown.find_by_class("dropdown_menu_list").first
     end
 
     describe '#tag_name' do

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

@@ -2,6 +2,23 @@ require 'rails_helper'
 
 describe ActiveAdmin::Views::Columns do
 
+  describe "Rendering zero columns" do
+    let(:cols) do
+      render_arbre_component do
+        columns do
+        end
+      end
+    end
+
+    it "should have the class .columns" do
+      expect(cols.class_list).to include("columns")
+    end
+
+    it "should have one column" do
+      expect(cols.children.first.class_list).not_to include("column")
+    end
+  end
+
   describe "Rendering one column" do
     let(:cols) do
       render_arbre_component do

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

@@ -65,6 +65,19 @@ describe ActiveAdmin::Views::PaginatedCollection do
       end
     end
 
+    context "when specifying :params 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, param_name: :post_page, params: { anchor: 'here' }) }
+
+      it "should pass it through to Kaminari" do
+        expect(pagination.children.last.content).to match(/\/admin\/posts\?post_page=2#here/)
+      end
+    end
+
     context "when specifying download_links: false option" do
       let(:collection) do
         posts = 10.times.map{ Post.new }
@@ -198,9 +211,10 @@ describe ActiveAdmin::Views::PaginatedCollection do
       end
 
       describe "set to false" do
-        let(:pagination) { paginated_collection(collection, pagination_total: false) }
-
         it "should not show the total item counts" do
+          expect(collection).not_to receive(:num_pages)
+          expect(collection).not_to receive(:total_pages)
+          pagination = paginated_collection(collection, pagination_total: false)
           info = pagination.find_by_class('pagination_information').first.content.gsub(' ',' ')
           expect(info).to eq "Displaying posts <b>1 - 30</b>"
         end

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

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe ActiveAdmin::Views::Panel do
   let(:arbre_panel) do
     render_arbre_component do
-      panel "My Title", icon: :arrow_down do
+      panel "My Title" do
         header_action link_to("My Link", "https://www.github.com/activeadmin/activeadmin")
         span("Hello World")
       end
@@ -30,10 +30,6 @@ describe ActiveAdmin::Views::Panel do
     expect(panel_html).to have_css 'div.panel_contents > span', text: "Hello World"
   end
 
-  it "should set the icon" do
-    expect(panel_html).to have_css "h3 > span.icon"
-  end
-
   context "with html-safe title" do
     let(:arbre_panel) do
       title_with_html = %q[Title with <abbr>HTML</abbr>].html_safe

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

@@ -44,4 +44,25 @@ describe ActiveAdmin::Views::SidebarSection do
     end
   end
 
+  context "with attributes_table for resource" do
+    let(:post) { Post.create!(title: "Testing.") }
+    let(:section) do
+      ActiveAdmin::SidebarSection.new("Summary", options) do
+        attributes_table do
+          row :title
+        end
+      end
+    end
+    let(:assigns) { { resource: post, section: section } }
+    let(:html) do
+      render_arbre_component assigns do
+        sidebar_section(assigns[:section])
+      end
+    end
+
+    it "should have table" do
+      expect(html.find_by_tag("th").first.content).to eq "Title"
+      expect(html.find_by_tag("td").first.content).to eq "Testing."
+    end
+  end
 end

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

@@ -89,7 +89,7 @@ describe ActiveAdmin::Views::StatusTag do
       end
     end
 
-    context "when status is false" do
+    context "when status is 'false'" do
       subject { status_tag('false') }
 
       describe '#class_list' do
@@ -103,6 +103,20 @@ describe ActiveAdmin::Views::StatusTag do
       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) }
 

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

@@ -301,6 +301,51 @@ describe ActiveAdmin::Views::TableFor do
       end
     end
 
+    context "when i18n option is specified" do
+      before(:each) do
+        I18n.backend.store_translations :en,
+          activerecord: { attributes: { post: { title: "Name" } } }
+      end
+
+      let(:table) do
+        render_arbre_component assigns, helpers do
+          table_for(collection, i18n: Post) do
+            column :title
+          end
+        end
+      end
+
+      it "should use localized column key" do
+        expect(table.find_by_tag("th").first.content).to eq "Name"
+      end
+    end
+
+    context "when i18n option is not specified" do
+      before(:each) do
+        I18n.backend.store_translations :en,
+          activerecord: { attributes: { post: { title: "Name" } } }
+      end
+
+      let(:collection) do
+        Post.create([
+          { title: "First Post", starred: true },
+          { title: "Second Post" },
+        ])
+        Post.where(starred: true)
+      end
+
+      let(:table) do
+        render_arbre_component assigns, helpers do
+          table_for(collection) do
+            column :title
+          end
+        end
+      end
+
+      it "should predict localized key based on AR collection klass" do
+        expect(table.find_by_tag("th").first.content).to eq "Name"
+      end
+    end
   end
 
   describe "column sorting" do

data/tasks/parallel_tests.rake

@@ -49,7 +49,7 @@ namespace :parallel do
 
   namespace :spec do
 
-    %w(unit integration).each do |type|
+    %w(unit request).each do |type|
       desc "Run the #{type} specs in parallel"
       task type => :setup_parallel_tests do
         run_in_parallel "parallel_rspec spec/#{type}"

data/tasks/test.rake

@@ -11,7 +11,7 @@ task :setup, :parallel do |t, args|
 end
 
 desc "Run the full suite using 1 core"
-task test: ['spec:unit', 'spec:integration', 'cucumber', 'cucumber:class_reloading']
+task test: ['spec:unit', 'spec:request', 'cucumber', 'cucumber:class_reloading']
 
 require 'coveralls/rake/task'
 Coveralls::RakeTask.new
@@ -56,9 +56,9 @@ namespace :spec do
     t.pattern = "spec/unit/**/*_spec.rb"
   end
 
-  desc "Run the integration specs"
-  RSpec::Core::RakeTask.new(:integration) do |t|
-    t.pattern = "spec/integration/**/*_spec.rb"
+  desc "Run the request specs"
+  RSpec::Core::RakeTask.new(:request) do |t|
+    t.pattern = "spec/requests/**/*_spec.rb"
   end
 
 end