activeadmin 1.0.0.pre4 → 1.0.0.pre5

data/spec/unit/pundit_adapter_spec.rb

@@ -28,7 +28,7 @@ class DefaultPolicy < ApplicationPolicy
   end
 end
 
-describe ActiveAdmin::PunditAdapter do
+RSpec.describe ActiveAdmin::PunditAdapter do
 
   describe "full integration" do
 

data/spec/unit/resource/action_items_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ActiveAdmin::Resource::ActionItems do
+RSpec.describe ActiveAdmin::Resource::ActionItems do
 
   let(:resource) do
     namespace = ActiveAdmin::Namespace.new(ActiveAdmin::Application.new, :admin)

data/spec/unit/resource/includes_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 module ActiveAdmin
-  describe Resource, "Includes" do
+  RSpec.describe Resource, "Includes" do
     describe "#includes" do
 
       let(:application) { ActiveAdmin::Application.new }

data/spec/unit/resource/menu_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 module ActiveAdmin
-  describe Resource, "Menu" do
+  RSpec.describe Resource, "Menu" do
 
     before { load_defaults! }
 

data/spec/unit/resource/naming_spec.rb

@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 module ActiveAdmin
-  describe Resource, "Naming" do
+  RSpec.describe Resource, "Naming" do
 
     before { load_defaults! }
 

data/spec/unit/resource/ordering_spec.rb

@@ -0,0 +1,38 @@
+require 'rails_helper'
+
+module ActiveAdmin
+  RSpec.describe Resource, "Ordering" do
+    describe "#order_by" do
+
+      let(:application) { ActiveAdmin::Application.new }
+      let(:namespace) { ActiveAdmin::Namespace.new application, :admin }
+      let(:resource_config) { ActiveAdmin::Resource.new namespace, Post }
+      let(:dsl){ ActiveAdmin::ResourceDSL.new(resource_config, Post) }
+
+      it "should register the ordering in the config" do
+        dsl.run_registration_block do
+          order_by(:age) do |order_clause|
+            if order_clause.order == 'desc'
+              [order_clause.to_sql, 'NULLS LAST'].join(' ')
+            end
+          end
+        end
+        expect(resource_config.ordering.size).to eq(1)
+      end
+
+
+      it "should allow to setup custom ordering class" do
+        MyOrderClause = Class.new(ActiveAdmin::OrderClause)
+        dsl.run_registration_block do
+          config.order_clause = MyOrderClause
+        end
+        expect(resource_config.order_clause).to eq(MyOrderClause)
+        expect(application.order_clause).to eq(ActiveAdmin::OrderClause)
+
+      end
+
+    end
+  end
+end
+
+

data/spec/unit/resource/page_presenters_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ActiveAdmin::Resource::PagePresenters do
+RSpec.describe ActiveAdmin::Resource::PagePresenters do
 
   let(:namespace){ ActiveAdmin::Namespace.new(ActiveAdmin::Application.new, :admin) }
   let(:resource){ namespace.register(Post) }

data/spec/unit/resource/pagination_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 module ActiveAdmin
-  describe Resource, "Pagination" do
+  RSpec.describe Resource, "Pagination" do
 
     before { load_defaults! }
 

data/spec/unit/resource/routes_spec.rb

@@ -1,76 +1,124 @@
-require 'rails_helper' 
+require 'rails_helper'
 
-module ActiveAdmin
-  describe Resource::Routes do
+RSpec.describe ActiveAdmin::Resource::Routes do
 
-    after :all do
-      load_defaults!
+  after do
+    load_defaults!
+    reload_routes!
+  end
+
+  let(:application) { ActiveAdmin.application }
+  let(:namespace) { application.namespace(:admin) }
+
+  context "when in the admin namespace" do
+    let(:config) { namespace.resource_for('Category') }
+
+    before do
+      load_resources { ActiveAdmin.register Category }
+    end
+
+    let(:category) { Category.new { |c| c.id = 123 } }
+
+    it "should return the route prefix" do
+      expect(config.route_prefix).to eq 'admin'
+    end
+
+    it "should return the route collection path" do
+      expect(config.route_collection_path).to eq '/admin/categories'
+    end
+
+    it "should return the route instance path" do
+      expect(config.route_instance_path(category)).to eq '/admin/categories/123'
+    end
+  end
+
+  context "when in the root namespace" do
+    let!(:config) { ActiveAdmin.register Category, namespace: false }
+
+    after(:each) do
+      application.namespace(:root).unload!
+      application.namespaces.instance_variable_get(:@namespaces).delete(:root)
+    end
+
+    it "should have a nil route_prefix" do
+      expect(config.route_prefix).to eq nil
+    end
+
+    it "should generate a correct route" do
       reload_routes!
+      expect(config.route_collection_path).to eq "/categories"
     end
+  end
 
-    describe "route names" do
-      context "when in the admin namespace" do
-        let!(:config)  { ActiveAdmin.register Category }
-        let(:category) { Category.new { |c| c.id = 123 } }
+  context "when registering a plural resource" do
+    class ::News; def self.has_many(*); end end
+    let!(:config) { ActiveAdmin.register News }
+    before{ reload_routes! }
 
-        it "should return the route prefix" do
-          expect(config.route_prefix).to eq 'admin'
-        end
+    it "should return the plural route with _index" do
+      expect(config.route_collection_path).to eq "/admin/news"
+    end
+  end
 
-        it "should return the route collection path" do
-          expect(config.route_collection_path).to eq '/admin/categories'
-        end
+  context "when the resource belongs to another resource" do
+    let(:config) { namespace.resource_for('Post') }
 
-        it "should return the route instance path" do
-          expect(config.route_instance_path(category)).to eq '/admin/categories/123'
-        end
+    let :post do
+      Post.new do |p|
+        p.id = 3
+        p.category = Category.new{ |c| c.id = 1 }
       end
+    end
 
-      context "when in the root namespace" do
-        let!(:config) { ActiveAdmin.register Category, namespace: false }
-        it "should have a nil route_prefix" do
-          expect(config.route_prefix).to eq nil
-        end
-
-        it "should generate a correct route" do
-          reload_routes!
-          expect(config.route_collection_path).to eq "/categories"
-        end
+    before do
+      load_resources do
+        ActiveAdmin.register Category
+        ActiveAdmin.register(Post) { belongs_to :category }
       end
+    end
 
-      context "when registering a plural resource" do
-        class ::News; def self.has_many(*); end end
-        let!(:config) { ActiveAdmin.register News }
-        before{ reload_routes! }
+    it "should nest the collection path" do
+      expect(config.route_collection_path(category_id: 1)).to eq "/admin/categories/1/posts"
+    end
 
-        it "should return the plural route with _index" do
-          expect(config.route_collection_path).to eq "/admin/news"
+    it "should nest the instance path" do
+      expect(config.route_instance_path(post)).to eq "/admin/categories/1/posts/3"
+    end
+  end
+
+  context "for batch_action handler" do
+    before do
+      load_resources { config.batch_actions = true }
+    end
+
+    context "when register a singular resource" do
+
+      let :config do
+        ActiveAdmin.register Category
+        ActiveAdmin.register Post do
+          belongs_to :category
         end
       end
 
-      context "when the resource belongs to another resource" do
-        let! :config do
-          ActiveAdmin.register Post do
-            belongs_to :category
-          end
-        end
+      it "should include :scope and :q params" do
+        params = { category_id: 1, q: { name_equals: "Any" }, scope: :all }
+        additional_params = { locale: 'en' }
+        batch_action_path = "/admin/categories/1/posts/batch_action?locale=en&q%5Bname_equals%5D=Any&scope=all"
 
-        let :post do
-          Post.new do |p|
-            p.id = 3
-            p.category = Category.new{ |c| c.id = 1 }
-          end
-        end
+        expect(config.route_batch_action_path(params, additional_params)).to eq batch_action_path
+      end
+    end
 
-        before{ reload_routes! }
+    context "when registering a plural resource" do
 
-        it "should nest the collection path" do
-          expect(config.route_collection_path(category_id: 1)).to eq "/admin/categories/1/posts"
-        end
+      class ::News; def self.has_many(*); end end
+      let(:config) { ActiveAdmin.register News }
 
-        it "should nest the instance path" do
-          expect(config.route_instance_path(post)).to eq "/admin/categories/1/posts/3"
-        end
+      it "should return the plural batch action route with _index and given params" do
+        params = { q: { name_equals: "Any" }, scope: :all }
+        additional_params = { locale: 'en' }
+        batch_action_path = "/admin/news/batch_action?locale=en&q%5Bname_equals%5D=Any&scope=all"
+        expect(config.route_batch_action_path(params, additional_params)).to eq batch_action_path
       end
     end
   end

data/spec/unit/resource/scopes_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 module ActiveAdmin
-  describe Resource, "Scopes" do
+  RSpec.describe Resource, "Scopes" do
 
     before { load_defaults! }
 

data/spec/unit/resource/sidebars_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ActiveAdmin::Resource::Sidebars do
+RSpec.describe ActiveAdmin::Resource::Sidebars do
 
   let(:resource) do
     namespace = ActiveAdmin::Namespace.new(ActiveAdmin::Application.new, :admin)

data/spec/unit/resource_collection_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 require 'active_admin/resource_collection'
 
-describe ActiveAdmin::ResourceCollection do
+RSpec.describe ActiveAdmin::ResourceCollection do
   let(:application) { ActiveAdmin::Application.new }
   let(:namespace)   { ActiveAdmin::Namespace.new application, :admin }
   let(:collection)  { ActiveAdmin::ResourceCollection.new }

data/spec/unit/resource_controller/data_access_spec.rb

@@ -1,6 +1,10 @@
 require 'rails_helper'
 
-describe ActiveAdmin::ResourceController::DataAccess do
+RSpec.describe ActiveAdmin::ResourceController::DataAccess do
+  before do
+    load_resources { ActiveAdmin.register Post }
+  end
+
   let(:params) do
     {}
   end
@@ -20,6 +24,22 @@ describe ActiveAdmin::ResourceController::DataAccess do
       expect(chain).to receive(:ransack).with(params[:q]).once.and_return(Post.ransack)
       controller.send :apply_filtering, chain
     end
+
+    context "params includes empty values" do
+      let(:params) do
+        { q: {id_eq: 1, position_eq: ""} }
+      end
+      it "should return relation without empty filters" do
+        expect(Post).to receive(:ransack).with(params[:q]).once.and_wrap_original do |original, *args|
+          chain  = original.call(*args)
+          expect(chain.conditions.size).to eq(1)
+          chain
+        end
+        controller.send :apply_filtering, Post
+      end
+    end
+
+
   end
 
   describe "sorting" do
@@ -44,6 +64,35 @@ describe ActiveAdmin::ResourceController::DataAccess do
       end
     end
 
+    context "custom strategy" do
+      before do
+        expect(controller.send(:active_admin_config)).to receive(:ordering).twice.and_return(
+          {
+            published_date: proc do |order_clause|
+              [order_clause.to_sql, 'NULLS LAST'].join(' ') if order_clause.order == 'desc'
+            end
+          }.with_indifferent_access
+        )
+      end
+
+      context "when params applicable" do
+        let(:params) {{ order: "published_date_desc" }}
+        it "reorders chain" do
+          chain = double "ChainObj"
+          expect(chain).to receive(:reorder).with('"posts"."published_date" desc NULLS LAST').once.and_return(Post.search)
+          controller.send :apply_sorting, chain
+        end
+      end
+      context "when params not applicable" do
+        let(:params) {{ order: "published_date_asc" }}
+        it "reorders chain" do
+          chain = double "ChainObj"
+          expect(chain).to receive(:reorder).with('"posts"."published_date" asc').once.and_return(Post.search)
+          controller.send :apply_sorting, chain
+        end
+      end
+    end
+
   end
 
   describe "scoping" do

data/spec/unit/resource_controller/decorators_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ActiveAdmin::ResourceController::Decorators do
+RSpec.describe ActiveAdmin::ResourceController::Decorators do
   let(:controller_class) do
     Class.new do
       def self.name
@@ -34,7 +34,7 @@ describe ActiveAdmin::ResourceController::Decorators do
 
         it "does not decorate when :decorate is set to false" do 
           form = double
-          allow(form).to receive(:options).and_return(:decorate => false)
+          allow(form).to receive(:options).and_return(decorate: false)
           allow(active_admin_config).to receive(:get_page_presenter).and_return(form)
           is_expected.not_to be_kind_of(PostDecorator) 
         end

data/spec/unit/resource_controller/sidebars_spec.rb

@@ -1,37 +1,36 @@
 require 'rails_helper'
 
-describe ActiveAdmin::ResourceController::Sidebars, type: :controller do
+RSpec.describe ActiveAdmin::ResourceController::Sidebars, type: :controller do
   let(:klass){ Admin::PostsController }
-  render_views # https://github.com/rspec/rspec-rails/issues/860
 
-  before do
-    @controller = klass.new
+  shared_context 'with post config' do
+    before do
+      load_resources { post_config }
+
+      @controller = klass.new
+
+      get :index
+    end
   end
 
-  context 'without before_filter' do
-    before do
-      ActiveAdmin.register Post
-      reload_routes!
+  context 'without skip_sidebar! before filter' do
+    include_context 'with post config' do
+      let(:post_config) { ActiveAdmin.register Post }
     end
 
     it 'does not set @skip_sidebar' do
-      get :index
-
       expect(controller.instance_variable_get(:@skip_sidebar)).to eq nil
     end
   end
 
-  describe '#skip_sidebar!' do
-    before do
-      ActiveAdmin.register Post do
-        before_filter :skip_sidebar!
+  context 'with skip_sidebar! before_filter' do
+    include_context 'with post config' do
+      let(:post_config) do
+        ActiveAdmin.register(Post) { before_filter :skip_sidebar! }
       end
-      reload_routes!
     end
 
     it 'works' do
-      get :index
-
       expect(controller.instance_variable_get(:@skip_sidebar)).to eq true
     end
   end