activeadmin 1.0.0.pre2 → 1.0.0.pre3

data/spec/unit/dsl_spec.rb

@@ -97,7 +97,7 @@ describe ActiveAdmin::DSL do
       dsl.run_registration_block do
         sidebar :help
       end
-      expect(dsl.config.sidebar_sections.map(&:name)).to match_array %w{filters search_status email help}
+      expect(dsl.config.sidebar_sections.map(&:name)).to match_array ['filters', 'Search status:', 'email', 'help']
     end
 
   end

data/spec/unit/filters/filter_form_builder_spec.rb

@@ -143,8 +143,9 @@ describe ActiveAdmin::Filters::ViewHelper do
 
       it "should remove original ordering to prevent PostgreSQL error" do
         expect(scope.object.klass).to receive(:reorder).with('title asc') {
-          m = double uniq: double(pluck: ['A Title'])
-          expect(m.uniq).to receive(:pluck).with :title
+          distinct = ActiveAdmin::Dependency.rails >= 4 ? :distinct : :uniq
+          m = double distinct => double(pluck: ['A Title'])
+          expect(m.send(distinct)).to receive(:pluck).with :title
           m
         }
         body
@@ -156,13 +157,13 @@ describe ActiveAdmin::Filters::ViewHelper do
     let(:body) { Capybara.string(filter :created_at) }
 
     it "should generate a date greater than" do
-      expect(body).to have_selector("input.datepicker[name='q[created_at_gteq]']")
+      expect(body).to have_selector("input.datepicker[name='q[created_at_gteq_date]']")
     end
     it "should generate a seperator" do
       expect(body).to have_selector("span.seperator")
     end
     it "should generate a date less than" do
-      expect(body).to have_selector("input.datepicker[name='q[created_at_lteq]']")
+      expect(body).to have_selector("input.datepicker[name='q[created_at_lteq_date]']")
     end
   end
 

data/spec/unit/filters/resource_spec.rb

@@ -32,6 +32,13 @@ describe ActiveAdmin::Filters::ResourceExtension do
     expect(resource.filters).to be_empty
   end
 
+  it "should return the defaults without associations if default association filters are disabled on the namespace" do
+    resource.namespace.include_default_association_filters = false
+    expect(resource.filters.keys).to match_array([
+      :body, :created_at, :custom_searcher, :position, :published_at, :starred, :title, :updated_at
+    ])
+  end
+
   describe "removing a filter" do
     it "should work" do
       expect(resource.filters.keys).to include :author

data/spec/unit/form_builder_spec.rb

@@ -563,8 +563,11 @@ describe ActiveAdmin::FormBuilder do
     describe "with allow destroy" do
       context "with an existing post" do
         let :body do
+          s = self
           build_form({url: '/categories'}, Category.new) do |f|
-            allow(f.object.posts.build).to receive(:new_record?).and_return(false)
+            s.instance_exec do
+              allow(f.object.posts.build).to receive(:new_record?).and_return(false)
+            end
             f.has_many :posts, allow_destroy: true do |p|
               p.input :title
             end

data/spec/unit/generators/install_spec.rb

@@ -5,19 +5,19 @@ describe "AA installation" do
 
     it "active_admin.scss" do
       path = Rails.root + "app/assets/stylesheets/active_admin.scss"
-      expect(File.exists? path).to be_truthy
+      expect(File.exists? path).to eq true
     end
 
     it "active_admin.js.coffee" do
-      expect(File.exists?(Rails.root + "app/assets/javascripts/active_admin.js.coffee")).to be_truthy
+      expect(File.exists?(Rails.root + "app/assets/javascripts/active_admin.js.coffee")).to eq true
     end
 
     it "the dashboard" do
-      expect(File.exists?(Rails.root + "app/admin/dashboard.rb")).to be_truthy
+      expect(File.exists?(Rails.root + "app/admin/dashboard.rb")).to eq true
     end
 
     it "the initializer" do
-      expect(File.exists?(Rails.root + "config/initializers/active_admin.rb")).to be_truthy
+      expect(File.exists?(Rails.root + "config/initializers/active_admin.rb")).to eq true
     end
 
   end

data/spec/unit/helpers/collection_spec.rb

@@ -45,21 +45,21 @@ describe ActiveAdmin::Helpers::Collection do
 
   describe "#collection_is_empty?" do
     it "should return true when the collection is empty" do
-      expect(collection_is_empty?(Post.where(title: "Non existing post"))).to be_truthy
+      expect(collection_is_empty?(Post.where(title: "Non existing post"))).to eq true
     end
 
     it "should return false when the collection is not empty" do
-      expect(collection_is_empty?(Post.where(title: "A post"))).to be_falsey
+      expect(collection_is_empty?(Post.where(title: "A post"))).to eq false
     end
 
     it "should take the defined collection by default" do
       def collection; Post.where(nil); end
 
-      expect(collection_is_empty?).to be_falsey
+      expect(collection_is_empty?).to eq false
 
       def collection; Post.where(title: "Non existing post"); end
 
-      expect(collection_is_empty?).to be_truthy
+      expect(collection_is_empty?).to eq true
     end
   end
 end

data/spec/unit/menu_collection_spec.rb

@@ -44,7 +44,7 @@ describe ActiveAdmin::MenuCollection do
         m.add :default, label: "Hello World"
       end
 
-      expect(menus.fetch(:default)["Hello World"]).to_not be_nil
+      expect(menus.fetch(:default)["Hello World"]).to_not eq nil
     end
 
     it "re-runs the callbacks when the menu is cleared" do
@@ -52,9 +52,9 @@ describe ActiveAdmin::MenuCollection do
         m.add :default, label: "Hello World"
       end
 
-      expect(menus.fetch(:default)["Hello World"]).to_not be_nil
+      expect(menus.fetch(:default)["Hello World"]).to_not eq nil
       menus.clear!
-      expect(menus.fetch(:default)["Hello World"]).to_not be_nil
+      expect(menus.fetch(:default)["Hello World"]).to_not eq nil
     end
 
   end

data/spec/unit/namespace/register_page_spec.rb

@@ -1,9 +1,7 @@
 require 'rails_helper'
 
 describe ActiveAdmin::Namespace, "registering a page" do
-
   let(:application){ ActiveAdmin::Application.new }
-
   let(:namespace){ ActiveAdmin::Namespace.new(application, :admin) }
   let(:menu){ namespace.fetch_menu(:default) }
 
@@ -17,23 +15,21 @@ describe ActiveAdmin::Namespace, "registering a page" do
     end
 
     it "should create a new controller in the default namespace" do
-      expect(defined?(Admin::StatusController)).to be_truthy
+      expect(defined?(Admin::StatusController)).to eq 'constant'
     end
 
     it "should create a menu item" do
       expect(menu["Status"]).to be_an_instance_of(ActiveAdmin::MenuItem)
     end
-  end # context "with no configuration"
+  end
 
   context "with a block configuration" do
     it "should be evaluated in the dsl" do
-      expect {
-        namespace.register_page "Status" do
-          raise "Hello World"
-        end
-      }.to raise_error
+      expect{ |block|
+        namespace.register_page "Status", &block
+      }.to yield_control
     end
-  end # context "with a block configuration"
+  end
 
   describe "adding to the menu" do
     describe "adding as a top level item" do
@@ -42,9 +38,9 @@ describe ActiveAdmin::Namespace, "registering a page" do
       end
 
       it "should add a new menu item" do
-        expect(menu['Status']).to_not be_nil
+        expect(menu['Status']).to_not eq nil
       end
-    end # describe "adding as a top level item"
+    end
 
     describe "adding as a child" do
       before do
@@ -52,13 +48,15 @@ describe ActiveAdmin::Namespace, "registering a page" do
           menu parent: 'Extra'
         end
       end
+
       it "should generate the parent menu item" do
-       expect( menu['Extra']).to_not be_nil
+       expect( menu['Extra']).to_not eq nil
       end
+
       it "should generate its own child item" do
-        expect(menu['Extra']['Status']).to_not be_nil
+        expect(menu['Extra']['Status']).to_not eq nil
       end
-    end # describe "adding as a child"
+    end
 
     describe "disabling the menu" do
       before do
@@ -66,9 +64,10 @@ describe ActiveAdmin::Namespace, "registering a page" do
           menu false
         end
       end
+
       it "should not create a menu item" do
-        expect(menu["Status"]).to be_nil
+        expect(menu["Status"]).to eq nil
       end
-    end # describe "disabling the menu"
-  end # describe "adding to the menu"
+    end
+  end
 end

data/spec/unit/namespace/register_resource_spec.rb

@@ -4,41 +4,40 @@ require 'rails_helper'
 #       Specifically, the dashboard is already defined.
 
 describe ActiveAdmin::Namespace, "registering a resource" do
-
   let(:application){ ActiveAdmin::Application.new }
-
   let(:namespace){ ActiveAdmin::Namespace.new(application, :admin) }
-
   let(:menu){ namespace.fetch_menu(:default) }
 
   context "with no configuration" do
     before do
       namespace.register Category
     end
+
     it "should store the namespaced registered configuration" do
       expect(namespace.resources.keys).to include('Category')
     end
+
     it "should create a new controller in the default namespace" do
-      expect(defined?(Admin::CategoriesController)).to be_truthy
+      expect(defined?(Admin::CategoriesController)).to eq 'constant'
     end
+
     skip "should not create the dashboard controller" do
-      defined?(Admin::DashboardController).to_not be_truthy
+      defined?(Admin::DashboardController).to_not eq 'constant'
     end
+
     it "should create a menu item" do
       expect(menu["Categories"]).to be_a ActiveAdmin::MenuItem
       expect(menu["Categories"].instance_variable_get(:@url)).to be_a Proc
     end
-  end # context "with no configuration"
+  end
 
   context "with a block configuration" do
     it "should be evaluated in the dsl" do
-      expect {
-        namespace.register Category do
-          raise "Hello World"
-        end
-      }.to raise_error
+      expect{ |block|
+        namespace.register Category, &block
+      }.to yield_control
     end
-  end # context "with a block configuration"
+  end
 
   context "with a resource that's namespaced" do
     before do
@@ -50,7 +49,7 @@ describe ActiveAdmin::Namespace, "registering a resource" do
       expect(namespace.resources.keys).to include('Mock::Resource')
     end
     it "should create a new controller in the default namespace" do
-      expect(defined?(Admin::MockResourcesController)).to be_truthy
+      expect(defined?(Admin::MockResourcesController)).to eq 'constant'
     end
     it "should create a menu item" do
       expect(menu["Mock Resources"]).to be_an_instance_of(ActiveAdmin::MenuItem)
@@ -89,7 +88,7 @@ describe ActiveAdmin::Namespace, "registering a resource" do
         namespace.register Category
       end
       it "should add a new menu item" do
-        expect(menu['Categories']).to_not be_nil
+        expect(menu['Categories']).to_not eq nil
       end
     end # describe "adding as a top level item"
 
@@ -100,10 +99,10 @@ describe ActiveAdmin::Namespace, "registering a resource" do
         end
       end
       it "should generate the parent menu item" do
-        expect(menu['Blog']).to_not be_nil
+        expect(menu['Blog']).to_not eq nil
       end
       it "should generate its own child item" do
-        expect(menu['Blog']['Categories']).to_not be_nil
+        expect(menu['Blog']['Categories']).to_not eq nil
       end
     end # describe "adding as a child"
 
@@ -114,7 +113,7 @@ describe ActiveAdmin::Namespace, "registering a resource" do
         end
       end
       it "should not create a menu item" do
-        expect(menu["Categories"]).to be_nil
+        expect(menu["Categories"]).to eq nil
       end
     end # describe "disabling the menu"
 
@@ -126,7 +125,7 @@ describe ActiveAdmin::Namespace, "registering a resource" do
           end
         end
         it "should not show up in the menu" do
-          expect(menu["Posts"]).to be_nil
+          expect(menu["Posts"]).to eq nil
         end
       end
       context "when optional" do
@@ -136,7 +135,7 @@ describe ActiveAdmin::Namespace, "registering a resource" do
           end
         end
         it "should show up in the menu" do
-          expect(menu["Posts"]).to_not be_nil
+          expect(menu["Posts"]).to_not eq nil
         end
       end
     end
@@ -147,14 +146,14 @@ describe ActiveAdmin::Namespace, "registering a resource" do
       it "should be namespaced" do
         namespace = ActiveAdmin::Namespace.new(application, :one)
         namespace.register Category
-        expect(defined?(One::CategoriesController)).to be_truthy
+        expect(defined?(One::CategoriesController)).to eq 'constant'
       end
     end
     context "when not namespaced" do
       it "should not be namespaced" do
         namespace = ActiveAdmin::Namespace.new(application, :two)
         namespace.register Category
-        expect(defined?(Two::CategoriesController)).to be_truthy
+        expect(defined?(Two::CategoriesController)).to eq 'constant'
       end
     end
   end # describe "dashboard controller name"

data/spec/unit/namespace_spec.rb

@@ -66,7 +66,7 @@ describe ActiveAdmin::Namespace do
         menu.add label: "menu item"
       end
 
-      expect(namespace.fetch_menu(:default)["menu item"]).to_not be_nil
+      expect(namespace.fetch_menu(:default)["menu item"]).to_not eq nil
     end
 
     it "should set a block on a custom menu" do
@@ -74,7 +74,7 @@ describe ActiveAdmin::Namespace do
         menu.add label: "menu item"
       end
 
-      expect(namespace.fetch_menu(:test)["menu item"]).to_not be_nil
+      expect(namespace.fetch_menu(:test)["menu item"]).to_not eq nil
     end
   end
 
@@ -89,12 +89,12 @@ describe ActiveAdmin::Namespace do
     end
 
     it "should have a logout button to the far left" do
-      expect(menu["Logout"]).to_not be_nil
+      expect(menu["Logout"]).to_not eq nil
       expect(menu["Logout"].priority).to eq 1
     end
 
     it "should have a static link with a target of :blank" do
-      expect(menu["ActiveAdmin.info"]).to_not be_nil
+      expect(menu["ActiveAdmin.info"]).to_not eq nil
       expect(menu["ActiveAdmin.info"].html_options).to include(target: :blank)
     end
 

data/spec/unit/pundit_adapter_spec.rb

@@ -64,9 +64,9 @@ describe ActiveAdmin::PunditAdapter do
 
     it "works well with method_missing" do
       allow(auth).to receive(:retrieve_policy).and_return(DefaultPolicy.new(double, double))
-      expect(auth.authorized?(:foo_no)).to be_falsey
-      expect(auth.authorized?(:foo_yes)).to be_truthy
-      expect(auth.authorized?(:bar_yes)).to be_falsey
+      expect(auth.authorized?(:foo_no)).to eq false
+      expect(auth.authorized?(:foo_yes)).to eq true
+      expect(auth.authorized?(:bar_yes)).to eq false
     end
 
     context 'when Pundit is unable to find policy scope' do

data/spec/unit/resource/action_items_spec.rb

@@ -25,7 +25,7 @@ describe ActiveAdmin::Resource::ActionItems do
     end
 
     it "should store the block in the action item" do
-      expect(resource.action_items.first.block).to_not be_nil
+      expect(resource.action_items.first.block).to_not eq nil
     end
 
   end

data/spec/unit/resource/naming_spec.rb

@@ -110,7 +110,7 @@ module ActiveAdmin
 
       [:==, :===, :eql?].each do |method|
         it "are equivalent when compared with #{method}" do
-          expect(resource_name.public_send(method, duplicate_resource_name)).to be_truthy
+          expect(resource_name.public_send(method, duplicate_resource_name)).to eq true
         end
       end
 

data/spec/unit/resource/routes_spec.rb

@@ -2,7 +2,11 @@ require 'rails_helper'
 
 module ActiveAdmin
   describe Resource::Routes do
-    before { load_defaults! }
+
+    after :all do
+      load_defaults!
+      reload_routes!
+    end
 
     describe "route names" do
       context "when in the admin namespace" do
@@ -25,7 +29,7 @@ module ActiveAdmin
       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 be_nil
+          expect(config.route_prefix).to eq nil
         end
 
         it "should generate a correct route" do

data/spec/unit/resource/scopes_spec.rb

@@ -40,9 +40,9 @@ module ActiveAdmin
 
       it "should update a scope with the same id" do
         config.scope :published
-        expect(config.scopes.first.scope_block).to be_nil
+        expect(config.scopes.first.scope_block).to eq nil
         config.scope(:published){  }
-        expect(config.scopes.first.scope_block).to_not be_nil
+        expect(config.scopes.first.scope_block).to_not eq nil
       end
 
     end