activeadmin 1.0.0.pre4 → 1.0.0.pre5

data/spec/unit/resource_controller_spec.rb

@@ -1,55 +1,8 @@
 require 'rails_helper'
 
-describe ActiveAdmin::ResourceController do
-
-  let(:controller) { ActiveAdmin::ResourceController.new }
-
-  describe "authenticating the user" do
-    let(:controller){ Admin::PostsController.new }
-
-    it "should do nothing when no authentication_method set" do
-      namespace = controller.class.active_admin_config.namespace
-      expect(namespace).to receive(:authentication_method).once.and_return(nil)
-
-      controller.send(:authenticate_active_admin_user)
-    end
-
-    it "should call the authentication_method when set" do
-      namespace = controller.class.active_admin_config.namespace
-
-      expect(namespace).to receive(:authentication_method).twice.
-        and_return(:authenticate_admin_user!)
-
-      expect(controller).to receive(:authenticate_admin_user!).and_return(true)
-
-      controller.send(:authenticate_active_admin_user)
-    end
-
-  end
-
-  describe "retrieving the current user" do
-    let(:controller){ Admin::PostsController.new }
-
-    it "should return nil when no current_user_method set" do
-      namespace = controller.class.active_admin_config.namespace
-      expect(namespace).to receive(:current_user_method).once.and_return(nil)
-
-      expect(controller.send(:current_active_admin_user)).to eq nil
-    end
-
-    it "should call the current_user_method when set" do
-      user = double
-      namespace = controller.class.active_admin_config.namespace
-
-      expect(namespace).to receive(:current_user_method).twice.
-        and_return(:current_admin_user)
-
-      expect(controller).to receive(:current_admin_user).and_return(user)
-
-      expect(controller.send(:current_active_admin_user)).to eq user
-    end
-  end
+RSpec.describe ActiveAdmin::ResourceController do
 
+  let(:controller) { Admin::PostsController.new }
 
   describe "callbacks" do
     before :all do
@@ -81,7 +34,6 @@ describe ActiveAdmin::ResourceController do
     end
 
     describe "performing create" do
-      let(:controller){ Admin::PostsController.new }
       let(:resource){ double("Resource", save: true) }
 
       before do
@@ -107,7 +59,6 @@ describe ActiveAdmin::ResourceController do
     end
 
     describe "performing update" do
-      let(:controller){ Admin::PostsController.new }
       let(:resource){ double("Resource", :attributes= => true, save: true) }
       let(:attributes){ [{}] }
 
@@ -135,7 +86,6 @@ describe ActiveAdmin::ResourceController do
     end
 
     describe "performing destroy" do
-      let(:controller){ Admin::PostsController.new }
       let(:resource){ double("Resource", destroy: true) }
 
       before do
@@ -155,10 +105,56 @@ describe ActiveAdmin::ResourceController do
   end
 end
 
-describe Admin::PostsController, type: "controller" do
+RSpec.describe "A specific resource controller", type: :controller do
+  before do
+    load_resources { ActiveAdmin.register Post }
+
+    @controller = Admin::PostsController.new
+  end
+
+  describe "authenticating the user" do
+    it "should do nothing when no authentication_method set" do
+      namespace = controller.class.active_admin_config.namespace
+      expect(namespace).to receive(:authentication_method).once.and_return(nil)
+
+      controller.send(:authenticate_active_admin_user)
+    end
+
+    it "should call the authentication_method when set" do
+      namespace = controller.class.active_admin_config.namespace
+
+      expect(namespace).to receive(:authentication_method).twice.
+        and_return(:authenticate_admin_user!)
+
+      expect(controller).to receive(:authenticate_admin_user!).and_return(true)
+
+      controller.send(:authenticate_active_admin_user)
+    end
+
+  end
+
+  describe "retrieving the current user" do
+    it "should return nil when no current_user_method set" do
+      namespace = controller.class.active_admin_config.namespace
+      expect(namespace).to receive(:current_user_method).once.and_return(nil)
+
+      expect(controller.send(:current_active_admin_user)).to eq nil
+    end
+
+    it "should call the current_user_method when set" do
+      user = double
+      namespace = controller.class.active_admin_config.namespace
+
+      expect(namespace).to receive(:current_user_method).twice.
+        and_return(:current_admin_user)
+
+      expect(controller).to receive(:current_admin_user).and_return(user)
+
+      expect(controller.send(:current_active_admin_user)).to eq user
+    end
+  end
 
   describe 'retrieving the resource' do
-    let(:controller){ Admin::PostsController.new }
     let(:post) { Post.new title: "An incledibly unique Post Title" }
 
     before do
@@ -187,7 +183,6 @@ describe Admin::PostsController, type: "controller" do
   end
 
   describe 'retrieving the resource collection' do
-    let(:controller){ Admin::PostsController.new }
     let(:config) { controller.class.active_admin_config }
     before do
       Post.create!(title: "An incledibly unique Post Title") if Post.count == 0
@@ -223,7 +218,6 @@ describe Admin::PostsController, type: "controller" do
 
 
   describe "performing batch_action" do
-    let(:controller){ Admin::PostsController.new }
     let(:batch_action) { ActiveAdmin::BatchAction.new :flag, "Flag", &batch_action_block }
     let(:batch_action_block) { proc { } }
     before do

data/spec/unit/resource_registration_spec.rb

@@ -1,12 +1,16 @@
 require 'rails_helper'
 
-describe "Registering an object to administer" do
-  application = ActiveAdmin::Application.new
+RSpec.describe "Registering an object to administer" do
+  let(:application) { ActiveAdmin::Application.new }
 
   context "with no configuration" do
-    namespace = ActiveAdmin::Namespace.new(application, :admin)
-    it "should call register on the namespace" do
+    let(:namespace) { ActiveAdmin::Namespace.new(application, :admin) }
+
+    before do
       application.namespaces[namespace.name] = namespace
+    end
+
+    it "should call register on the namespace" do
       expect(namespace).to receive(:register)
 
       application.register Category
@@ -14,6 +18,7 @@ describe "Registering an object to administer" do
 
     it "should dispatch a Resource::RegisterEvent" do
       expect(ActiveSupport::Notifications).to receive(:publish).with(ActiveAdmin::Resource::RegisterEvent, an_instance_of(ActiveAdmin::Resource))
+
       application.register Category
     end
   end

data/spec/unit/resource_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 require File.expand_path('config_shared_examples', File.dirname(__FILE__))
 
 module ActiveAdmin
-  describe Resource do
+  RSpec.describe Resource do
 
     it_should_behave_like "ActiveAdmin::Resource"
     before { load_defaults! }
@@ -148,6 +148,8 @@ module ActiveAdmin
 
 
     describe "sort order" do
+      class MockResource
+      end
 
       context "when resource class responds to primary_key" do
         it "should sort by primary key desc by default" do
@@ -234,8 +236,10 @@ module ActiveAdmin
       before do
         if Rails::VERSION::MAJOR >= 4
           allow(Post).to receive(:find_by).with("id" => "12345") { post }
+          allow(Post).to receive(:find_by).with("id" => "54321") { nil }
         else
           allow(Post).to receive(:find_by_id).with("12345") { post }
+          allow(Post).to receive(:find_by_id).with("54321") { nil }
         end
       end
 
@@ -248,6 +252,10 @@ module ActiveAdmin
         it 'decorates the resource' do
           expect(resource.find_resource('12345')).to eq PostDecorator.new(post)
         end
+
+        it 'does not decorate a not found resource' do
+          expect(resource.find_resource('54321')).to equal nil
+        end
       end
 
       context 'when using a nonstandard primary key' do

data/spec/unit/routing_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ActiveAdmin, "Routing", type: :routing do
+RSpec.describe ActiveAdmin, "Routing", type: :routing do
 
   before do
     load_defaults!
@@ -14,8 +14,10 @@ describe ActiveAdmin, "Routing", type: :routing do
     reload_routes!
   end
 
+  let(:namespaces) { ActiveAdmin.application.namespaces }
+
   it "should only have the namespaces necessary for route testing" do
-    expect(ActiveAdmin.application.namespaces.names).to eq [:admin, :root]
+    expect(namespaces.names).to eq [:admin]
   end
 
   it "should route to the admin dashboard" do
@@ -30,6 +32,24 @@ describe ActiveAdmin, "Routing", type: :routing do
     end
   end
 
+  describe "route_options" do
+    context "with a custom path set in route_options" do
+      before do
+        namespaces[:admin].route_options = { path: '/custom-path' }
+        reload_routes!
+      end
+
+      after do
+        namespaces[:admin].route_options = {}
+        reload_routes!
+      end
+
+      it "should route using the custom path" do
+        expect(admin_posts_path).to eq "/custom-path/posts"
+      end
+    end
+  end
+
   describe "standard resources" do
     context "when in admin namespace" do
       it "should route the index path" do
@@ -54,6 +74,10 @@ describe ActiveAdmin, "Routing", type: :routing do
         load_resources { ActiveAdmin.register(Post, namespace: false) }
       end
 
+      after(:each) do
+        namespaces.instance_variable_get(:@namespaces).delete(:root)
+      end
+
       it "should route the index path" do
         expect(posts_path).to eq "/posts"
       end
@@ -167,6 +191,10 @@ describe ActiveAdmin, "Routing", type: :routing do
         load_resources { ActiveAdmin.register_page("Chocolate I lØve You!", namespace: false) }
       end
 
+      after(:each) do
+        namespaces.instance_variable_get(:@namespaces).delete(:root)
+      end
+
       it "should route to page under /" do
         expect(chocolate_i_love_you_path).to eq "/chocolate_i_love_you"
       end

data/spec/unit/scope_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ActiveAdmin::Scope do
+RSpec.describe ActiveAdmin::Scope do
 
   describe "creating a scope" do
     subject{ scope }
@@ -135,7 +135,31 @@ describe ActiveAdmin::Scope do
 
       it "should properly render the proc" do
         scope = ActiveAdmin::Scope.new proc{ Date.today.strftime '%A' }, :foobar
-        expect(scope.name).to eq Date.today.strftime '%A'
+        expect(scope.name.call).to eq Date.today.strftime '%A'
+      end
+    end
+
+    context "with scope method and localizer" do
+      let(:localizer) do
+        loc = double(:localizer)
+        allow(loc).to receive(:t).with(:published, scope: 'scopes').and_return("All published")
+        loc
+      end
+      let(:scope)        { ActiveAdmin::Scope.new :published, :published, localizer: localizer }
+
+      describe '#name' do
+        subject { super().name }
+        it         { is_expected.to eq("All published")}
+      end
+
+      describe '#id' do
+        subject { super().id }
+        it           { is_expected.to eq("published")}
+      end
+
+      describe '#scope_method' do
+        subject { super().scope_method }
+        it { is_expected.to eq(:published) }
       end
     end
 

data/spec/unit/settings_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ActiveAdmin::Settings do
+RSpec.describe ActiveAdmin::Settings do
 
   subject{ Class.new{ include ActiveAdmin::Settings } }
 
@@ -46,7 +46,7 @@ describe ActiveAdmin::Settings do
 end
 
 
-describe ActiveAdmin::Settings::Inheritance do
+RSpec.describe ActiveAdmin::Settings::Inheritance do
 
   subject do
     Class.new do

data/spec/unit/view_factory_spec.rb

@@ -6,7 +6,7 @@ def it_should_have_view(key, value)
   end
 end
 
-describe ActiveAdmin::ViewFactory do
+RSpec.describe ActiveAdmin::ViewFactory do
 
   it_should_have_view :global_navigation,    ActiveAdmin::Views::TabbedNavigation
   it_should_have_view :utility_navigation,   ActiveAdmin::Views::TabbedNavigation

data/spec/unit/view_helpers/breadcrumbs_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe "Breadcrumbs" do
+RSpec.describe "Breadcrumbs" do
 
   include ActiveAdmin::ViewHelpers
 

data/spec/unit/view_helpers/display_helper_spec.rb

@@ -1,6 +1,10 @@
 require 'rails_helper'
+require 'active_admin/view_helpers/active_admin_application_helper'
+require 'active_admin/view_helpers/auto_link_helper'
+require 'active_admin/view_helpers/display_helper'
+require 'active_admin/view_helpers/method_or_proc_helper'
 
-describe ActiveAdmin::ViewHelpers::DisplayHelper do
+RSpec.describe ActiveAdmin::ViewHelpers::DisplayHelper do
   include ActiveAdmin::ViewHelpers::ActiveAdminApplicationHelper
   include ActiveAdmin::ViewHelpers::AutoLinkHelper
   include ActiveAdmin::ViewHelpers::DisplayHelper
@@ -16,6 +20,17 @@ describe ActiveAdmin::ViewHelpers::DisplayHelper do
     true
   end
 
+  def url_options
+    { locale: nil }
+  end
+
+  before do
+    load_resources do
+      ActiveAdmin.register(User)
+      ActiveAdmin.register(Post){ belongs_to :user, optional: true }
+    end
+  end
+
   describe '#display_name' do
     ActiveAdmin::Application.new.display_name_methods.map(&:to_s).each do |m|
       it "should return #{m} when defined" do
@@ -89,7 +104,7 @@ describe ActiveAdmin::ViewHelpers::DisplayHelper do
     it 'calls the provided block to format the value' do
       value = format_attribute double(foo: 2), ->r { r.foo + 1 }
 
-      expect(value).to eq 3
+      expect(value).to eq '3'
     end
 
     it 'finds values as methods' do
@@ -104,7 +119,7 @@ describe ActiveAdmin::ViewHelpers::DisplayHelper do
       expect(value).to eq '100'
     end
 
-    [1, 1.2, :a_symbol, Arbre::Element.new].each do |val|
+    [1, 1.2, :a_symbol].each do |val|
       it "calls to_s to format the value of type #{val.class}" do
         value = format_attribute double(foo: val), :foo
 

data/spec/unit/view_helpers/download_format_links_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ActiveAdmin::ViewHelpers::DownloadFormatLinksHelper do
+RSpec.describe ActiveAdmin::ViewHelpers::DownloadFormatLinksHelper do
   describe "class methods" do
     before :all do
       begin

data/spec/unit/view_helpers/fields_for_spec.rb

@@ -1,6 +1,6 @@
 require 'active_admin/view_helpers/fields_for'
 
-describe ActiveAdmin::ViewHelpers::FormHelper, ".fields_for" do
+RSpec.describe ActiveAdmin::ViewHelpers::FormHelper, ".fields_for" do
   include ActiveAdmin::ViewHelpers::FormHelper
 
   it "should skip :action, :controller and :commit" do

data/spec/unit/view_helpers/flash_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ActiveAdmin::ViewHelpers::FlashHelper do
+RSpec.describe ActiveAdmin::ViewHelpers::FlashHelper do
 
   describe '.flash_messages' do
     let(:view) { action_view }

data/spec/unit/view_helpers/form_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ActiveAdmin::ViewHelpers::FormHelper do
+RSpec.describe ActiveAdmin::ViewHelpers::FormHelper do
 
   describe '.active_admin_form_for' do
     let(:view) { action_view }