yousty-activeadmin 1.0.4.pre → 1.0.5.pre

data/spec/unit/active_admin_spec.rb

@@ -1,9 +1,9 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ActiveAdmin do
   %w(register register_page unload! load! routes).each do |method|
     it "delegates ##{method} to application" do
-      ActiveAdmin.application.should_receive(method)
+      expect(ActiveAdmin.application).to receive(method)
 
       ActiveAdmin.send(method)
     end

data/spec/unit/application_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'fileutils'
 
 describe ActiveAdmin::Application do
@@ -11,90 +11,90 @@ describe ActiveAdmin::Application do
   end
 
   it "should have a default load path of ['app/admin']" do
-    application.load_paths.should == [File.expand_path('app/admin', Rails.root)]
+    expect(application.load_paths).to eq [File.expand_path('app/admin', Rails.root)]
   end
 
   it "should remove app/admin from the autoload paths (Active Admin deals with loading)" do
-    ActiveSupport::Dependencies.autoload_paths.should_not include(File.join(Rails.root, "app/admin"))
+    expect(ActiveSupport::Dependencies.autoload_paths).to_not include(File.join(Rails.root, "app/admin"))
   end
 
   it "should add app/admin to the Engine's watchable directories (loaded after the app itself)" do
-    ActiveAdmin::Engine.config.watchable_dirs.should have_key File.join(Rails.root, "app/admin")
+    expect(ActiveAdmin::Engine.config.watchable_dirs).to have_key File.join(Rails.root, "app/admin")
   end
 
   it "should store the site's title" do
-    application.site_title.should == ""
+    expect(application.site_title).to eq ""
   end
 
   it "should set the site title" do
     application.site_title = "New Title"
-    application.site_title.should == "New Title"
+    expect(application.site_title).to eq "New Title"
   end
 
   it "should store the site's title link" do
-    application.site_title_link.should == ""
+    expect(application.site_title_link).to eq ""
   end
 
   it "should set the site's title link" do
     application.site_title_link = "http://www.mygreatsite.com"
-    application.site_title_link.should == "http://www.mygreatsite.com"
+    expect(application.site_title_link).to eq "http://www.mygreatsite.com"
   end
 
   it "should store the site's title image" do
-    application.site_title_image.should == ""
+    expect(application.site_title_image).to eq ""
   end
 
   it "should set the site's title image" do
     application.site_title_image = "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106"
-    application.site_title_image.should == "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106"
+    expect(application.site_title_image).to eq "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106"
   end
-  
+
   it "should store the site's favicon" do
-    application.favicon.should == false
+    expect(application.favicon).to eq false
   end
 
   it "should set the site's favicon" do
     application.favicon = "/a/favicon.ico"
-    application.favicon.should == "/a/favicon.ico"
+    expect(application.favicon).to eq "/a/favicon.ico"
   end
 
   it "should have a view factory" do
-    application.view_factory.should be_an_instance_of(ActiveAdmin::ViewFactory)
+    expect(application.view_factory).to be_an_instance_of(ActiveAdmin::ViewFactory)
   end
 
   it "should allow comments by default" do
-    application.allow_comments.should == true
+    expect(application.comments).to eq true
   end
 
   describe "authentication settings" do
 
     it "should have no default current_user_method" do
-      application.current_user_method.should == false
+      expect(application.current_user_method).to eq false
     end
 
     it "should have no default authentication method" do
-      application.authentication_method.should == false
+      expect(application.authentication_method).to eq false
     end
 
     it "should have a logout link path (Devise's default)" do
-      application.logout_link_path.should == :destroy_admin_user_session_path
+      expect(application.logout_link_path).to eq :destroy_admin_user_session_path
     end
 
     it "should have a logout link method (Devise's default)" do
-      application.logout_link_method.should == :get
+      expect(application.logout_link_method).to eq :get
     end
   end
 
   describe "files in load path" do
     it "should load files in the first level directory" do
-      application.files.should include(File.expand_path("app/admin/dashboard.rb", Rails.root))
+      expect(application.files).to include(File.expand_path("app/admin/dashboard.rb", Rails.root))
     end
 
     it "should load files from subdirectories" do
       FileUtils.mkdir_p(File.expand_path("app/admin/public", Rails.root))
       test_file = File.expand_path("app/admin/public/posts.rb", Rails.root)
       FileUtils.touch(test_file)
-      application.files.should include(test_file)
+      expect(application.files).to include(test_file)
     end
   end
 
@@ -102,39 +102,38 @@ describe ActiveAdmin::Application do
 
     it "should yield a new namespace" do
       application.namespace :new_namespace do |ns|
-        ns.name.should == :new_namespace
+        expect(ns.name).to eq :new_namespace
       end
     end
 
     it "should return an instantiated namespace" do
       admin = application.namespace :admin
-      admin.should == application.namespaces[:admin]
+      expect(admin).to eq application.namespaces[:admin]
     end
 
     it "should yield an existing namespace" do
       expect {
         application.namespace :admin do |ns|
-          ns.should == application.namespaces[:admin]
+          expect(ns).to eq application.namespaces[:admin]
           raise "found"
         end
       }.to raise_error("found")
     end
 
     it "should not pollute the global app" do
-      application.namespaces.keys.should be_empty
+      expect(application.namespaces).to be_empty
       application.namespace(:brand_new_ns)
-      application.namespaces.keys.should eq [:brand_new_ns]
-      ActiveAdmin.application.namespaces.keys.should eq [:admin]
+      expect(application.namespaces.names).to eq [:brand_new_ns]
+      expect(ActiveAdmin.application.namespaces.names).to eq [:admin]
     end
   end
 
   describe "#register_page" do
     it "finds or create the namespace and register the page to it" do
       namespace = double
-      application.should_receive(:namespace).with("public").and_return namespace
-      namespace.should_receive(:register_page).with("My Page", {:namespace => "public"})
-
-      application.register_page("My Page", :namespace => "public")
+      expect(application).to receive(:namespace).with("public").and_return namespace
+      expect(namespace).to receive(:register_page).with("My Page", {namespace: "public"})
+      application.register_page("My Page", namespace: "public")
     end
   end
 

data/spec/unit/asset_registration_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ActiveAdmin::AssetRegistration do
   include ActiveAdmin::AssetRegistration
@@ -10,43 +10,43 @@ describe ActiveAdmin::AssetRegistration do
 
   it "should register a stylesheet file" do
     register_stylesheet "active_admin.css"
-    stylesheets.length.should == 1
-    stylesheets.keys.first.should == "active_admin.css"
+    expect(stylesheets.length).to eq 1
+    expect(stylesheets.keys.first).to eq "active_admin.css"
   end
 
   it "should clear all existing stylesheets" do
     register_stylesheet "active_admin.css"
-    stylesheets.length.should == 1
+    expect(stylesheets.length).to eq 1
     clear_stylesheets!
-    stylesheets.should be_empty
+    expect(stylesheets).to be_empty
   end
 
   it "should allow media option when registering stylesheet" do
     register_stylesheet "active_admin.css", media: :print
-    stylesheets.values.first[:media].should == :print
+    expect(stylesheets.values.first[:media]).to eq :print
   end
 
   it "shouldn't register a stylesheet twice" do
     register_stylesheet "active_admin.css"
     register_stylesheet "active_admin.css"
-    stylesheets.length.should == 1
+    expect(stylesheets.length).to eq 1
   end
 
   it "should register a javascript file" do
     register_javascript "active_admin.js"
-    javascripts.should == ["active_admin.js"].to_set
+    expect(javascripts).to eq ["active_admin.js"].to_set
   end
 
   it "should clear all existing javascripts" do
     register_javascript "active_admin.js"
-    javascripts.should == ["active_admin.js"].to_set
+    expect(javascripts).to eq ["active_admin.js"].to_set
     clear_javascripts!
-    javascripts.should be_empty
+    expect(javascripts).to be_empty
   end
 
   it "shouldn't register a javascript twice" do
     register_javascript "active_admin.js"
     register_javascript "active_admin.js"
-    javascripts.length.should == 1
+    expect(javascripts.length).to eq 1
   end
 end

data/spec/unit/authorization/authorization_adapter_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ActiveAdmin::AuthorizationAdapter do
 
@@ -7,7 +7,7 @@ describe ActiveAdmin::AuthorizationAdapter do
   describe "#authorized?" do
 
     it "should always return true" do
-      adapter.authorized?(:read, "Resource").should == true
+      expect(adapter.authorized?(:read, "Resource")).to be_truthy
     end
 
   end
@@ -16,7 +16,7 @@ describe ActiveAdmin::AuthorizationAdapter do
 
     it "should return the collection unscoped" do
       collection = double
-      adapter.scope_collection(collection, ActiveAdmin::Auth::READ).should == collection
+      expect(adapter.scope_collection(collection, ActiveAdmin::Auth::READ)).to eq collection
     end
 
   end
@@ -41,19 +41,19 @@ describe ActiveAdmin::AuthorizationAdapter do
     let(:adapter) { auth_class.new(double, double) }
 
     it "should match against a class" do
-      adapter.authorized?(:read, String).should == true
+      expect(adapter.authorized?(:read, String)).to be_truthy
     end
 
     it 'should match against an instance' do
-      adapter.authorized?(:read, "String").should == true
+      expect(adapter.authorized?(:read, "String")).to be_truthy
     end
 
     it 'should not match a different class' do
-      adapter.authorized?(:read, Hash).should == false
+      expect(adapter.authorized?(:read, Hash)).to be_falsey
     end
 
     it 'should not match a different instance' do
-      adapter.authorized?(:read, {}).should == false
+      expect(adapter.authorized?(:read, {})).to be_falsey
     end
 
   end

data/spec/unit/authorization/controller_authorization_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require 'rails_helper'
 Auth = ActiveAdmin::Authorization
 
-describe Admin::PostsController, "Controller Authorization", :type => :controller do
+describe Admin::PostsController, "Controller Authorization", type: :controller do
 
   let(:authorization){ controller.send(:active_admin_authorization) }
 
@@ -12,28 +12,28 @@ describe Admin::PostsController, "Controller Authorization", :type => :controlle
   end
 
   it "should authorize the index action" do
-    authorization.should_receive(:authorized?).with(Auth::READ, Post).and_return true
+    expect(authorization).to receive(:authorized?).with(Auth::READ, Post).and_return true
     get :index
-    response.should be_success
+    expect(response).to be_success
   end
 
   it "should authorize the new action" do
-    authorization.should_receive(:authorized?).with(Auth::CREATE, an_instance_of(Post)).and_return true
+    expect(authorization).to receive(:authorized?).with(Auth::CREATE, an_instance_of(Post)).and_return true
     get :new
-    response.should be_success
+    expect(response).to be_success
   end
 
   it "should authorize the create action with the new resource" do
-    authorization.should_receive(:authorized?).with(Auth::CREATE, an_instance_of(Post)).and_return true
+    expect(authorization).to receive(:authorized?).with(Auth::CREATE, an_instance_of(Post)).and_return true
     post :create
-    response.should redirect_to action: 'show', id: Post.last.id
+    expect(response).to redirect_to action: 'show', id: Post.last.id
   end
 
   it "should redirect when the user isn't authorized" do
-    authorization.should_receive(:authorized?).with(Auth::READ, Post).and_return false
+    expect(authorization).to receive(:authorized?).with(Auth::READ, Post).and_return false
     get :index
-    response.body.should eq '<html><body>You are being <a href="http://test.host/admin">redirected</a>.</body></html>'
-    response.should redirect_to '/admin'
+    expect(response.body).to eq '<html><body>You are being <a href="http://test.host/admin">redirected</a>.</body></html>'
+    expect(response).to redirect_to '/admin'
   end
 
 end

data/spec/unit/authorization/index_overriding_spec.rb

@@ -0,0 +1,22 @@
+require 'rails_helper'
+
+describe Admin::PostsController, 'Index overriding', type: :controller do
+  before do
+    controller.instance_eval do
+      def index
+        super do
+          render text: 'Rendered from passed block' and return
+        end
+      end
+    end
+    load_defaults!
+    # HACK: the AA config is missing, so we throw it in here
+    controller.class.active_admin_config = ActiveAdmin.application.namespace(:admin).resources['Post'].controller.active_admin_config
+  end
+
+  it 'should call block passed to overridden index' do
+    get :index
+    expect(response.body).to eq 'Rendered from passed block'
+  end
+
+end

data/spec/unit/auto_link_spec.rb

@@ -1,21 +1,26 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "auto linking resources" do
   include ActiveAdmin::ViewHelpers::ActiveAdminApplicationHelper
   include ActiveAdmin::ViewHelpers::AutoLinkHelper
   include ActiveAdmin::ViewHelpers::DisplayHelper
+  include MethodOrProcHelper
 
   let(:active_admin_config)   { double namespace: namespace }
   let(:active_admin_namespace){ ActiveAdmin::Namespace.new(ActiveAdmin::Application.new, :admin) }
-  let(:post){ Post.create! :title => "Hello World" }
+  let(:post){ Post.create! title: "Hello World" }
 
   def admin_post_path(post)
     "/admin/posts/#{post.id}"
   end
 
+  def authorized?(_action, _subject)
+    true
+  end
+
   context "when the resource is not registered" do
     it "should return the display name of the object" do
-      auto_link(post).should == "Hello World"
+      expect(auto_link(post)).to eq "Hello World"
     end
   end
 
@@ -24,9 +29,41 @@ describe "auto linking resources" do
       active_admin_namespace.register Post
     end
     it "should return a link with the display name of the object" do
-      self.should_receive(:link_to).with("Hello World", admin_post_path(post))
+      expect(self).to receive(:url_for) { |url| url }
+      expect(self).to receive(:link_to).with "Hello World", admin_post_path(post)
       auto_link(post)
     end
-  end
 
+    context "but the user doesn't have access" do
+      it "should return the display name of the object" do
+        expect(self).to receive(:authorized?).twice.and_return(false)
+        expect(auto_link(post)).to eq "Hello World"
+      end
+    end
+
+    context "but the show action is disabled" do
+      before do
+        active_admin_namespace.register(Post) { actions :all, except: :show }
+      end
+
+      it "should fallback to edit" do
+        url_path = "/admin/posts/#{post.id}/edit"
+        expect(self).to receive(:url_for) { |url| url }
+        expect(self).to receive(:link_to).with "Hello World", url_path
+        auto_link(post)
+      end
+    end
+
+    context "but the show and edit actions are disabled" do
+      before do
+        active_admin_namespace.register(Post) do
+          actions :all, except: [:show, :edit]
+        end
+      end
+
+      it "should return the display name of the object" do
+        expect(auto_link(post)).to eq "Hello World"
+      end
+    end
+  end
 end

data/spec/unit/batch_actions/resource_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ActiveAdmin::BatchActions::ResourceExtension do
 
@@ -11,7 +11,8 @@ describe ActiveAdmin::BatchActions::ResourceExtension do
   describe "default action" do
 
     it "should have the default action by default" do
-      resource.batch_actions.size.should == 1 and resource.batch_actions.first.sym == :destroy
+      expect(resource.batch_actions.size).to eq 1
+      expect(resource.batch_actions.first.sym == :destroy).to be_truthy
     end
 
   end
@@ -26,15 +27,15 @@ describe ActiveAdmin::BatchActions::ResourceExtension do
     end
 
     it "should add an batch action" do
-      resource.batch_actions.size.should == 1
+      expect(resource.batch_actions.size).to eq 1
     end
 
     it "should store an instance of BatchAction" do
-      resource.batch_actions.first.should be_an_instance_of(ActiveAdmin::BatchAction)
+      expect(resource.batch_actions.first).to be_an_instance_of(ActiveAdmin::BatchAction)
     end
 
     it "should store the block in the batch action" do
-      resource.batch_actions.first.block.should_not be_nil
+      expect(resource.batch_actions.first.block).to_not be_nil
     end
 
   end
@@ -46,7 +47,7 @@ describe ActiveAdmin::BatchActions::ResourceExtension do
     end
 
     it "should allow for batch action removal" do
-      resource.batch_actions.size.should == 0
+      expect(resource.batch_actions.size).to eq 0
     end
 
   end
@@ -54,7 +55,7 @@ describe ActiveAdmin::BatchActions::ResourceExtension do
   describe "#batch_action_path" do
 
     it "returns the path as a symbol" do
-      resource.batch_action_path.should == "/admin/posts/batch_action"
+      expect(resource.batch_action_path).to eq "/admin/posts/batch_action"
     end
 
   end
@@ -63,12 +64,12 @@ describe ActiveAdmin::BatchActions::ResourceExtension do
 
     it "should return true by default" do
       action = ActiveAdmin::BatchAction.new :default, "Default"
-      action.display_if_block.call.should == true
+      expect(action.display_if_block.call).to eq true
     end
 
     it "should return the :if block if set" do
-      action = ActiveAdmin::BatchAction.new :with_block, "With Block", :if => proc { false }
-      action.display_if_block.call.should == false
+      action = ActiveAdmin::BatchAction.new :with_block, "With Block", if: proc { false }
+      expect(action.display_if_block.call).to eq false
     end
 
   end
@@ -77,13 +78,13 @@ describe ActiveAdmin::BatchActions::ResourceExtension do
 
     it "should have a default priority" do
       action = ActiveAdmin::BatchAction.new :default, "Default"
-      action.priority.should == 10
+      expect(action.priority).to eq 10
     end
 
     it "should correctly order two actions" do
-      priority_one = ActiveAdmin::BatchAction.new :one, "One", :priority => 1
-      priority_ten = ActiveAdmin::BatchAction.new :ten, "Ten", :priority => 10
-      priority_one.should be < priority_ten
+      priority_one = ActiveAdmin::BatchAction.new :one, "One", priority: 1
+      priority_ten = ActiveAdmin::BatchAction.new :ten, "Ten", priority: 10
+      expect(priority_one).to be < priority_ten
     end
 
   end