activeadmin 1.0.0.pre4 → 1.0.0.pre5

data/spec/support/rails_template_with_data.rb

@@ -4,19 +4,38 @@ apply File.expand_path("../rails_template.rb", __FILE__)
   generate :'active_admin:resource', type
 end
 
+inject_into_file 'app/admin/category.rb', <<-RUBY, after: "ActiveAdmin.register Category do\n"
+
+  if Rails::VERSION::MAJOR >= 4
+    permit_params [:name, :description]
+  end
+RUBY
+
+inject_into_file 'app/admin/user.rb', <<-RUBY, after: "ActiveAdmin.register User do\n"
+
+  if Rails::VERSION::MAJOR >= 4
+    permit_params [:first_name, :last_name, :username, :age]
+  end
+RUBY
+
 inject_into_file 'app/admin/post.rb', <<-RUBY, after: "ActiveAdmin.register Post do\n"
+
+  if Rails::VERSION::MAJOR >= 4
+    permit_params [:custom_category_id, :author_id, :title, :body, :published_date, :position, :starred]
+  end
+
   scope :all, default: true
 
   scope :drafts do |posts|
-    posts.where(["published_at IS NULL"])
+    posts.where(["published_date IS NULL"])
   end
 
   scope :scheduled do |posts|
-    posts.where(["posts.published_at IS NOT NULL AND posts.published_at > ?", Time.now.utc])
+    posts.where(["posts.published_date IS NOT NULL AND posts.published_date > ?", Time.now.utc])
   end
 
   scope :published do |posts|
-    posts.where(["posts.published_at IS NOT NULL AND posts.published_at < ?", Time.now.utc])
+    posts.where(["posts.published_date IS NOT NULL AND posts.published_date < ?", Time.now.utc])
   end
 
   scope :my_posts do |posts|
@@ -42,11 +61,11 @@ append_file "db/seeds.rb", "\n\n" + <<-RUBY.strip_heredoc
   1_000.times do |i|
     user = users[i % users.size]
     cat = categories[i % categories.size]
-    published_at = published_at_values[i % published_at_values.size]
+    published = published_at_values[i % published_at_values.size]
     Post.create title: "Blog Post \#{i}",
                 body: "Blog post \#{i} is written by \#{user.username} about \#{cat.name}",
                 category: cat,
-                published_at: published_at,
+                published_date: published,
                 author: user,
                 starred: true
   end

data/spec/support/templates/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/spec/support/templates/policies/application_policy.rb

@@ -11,7 +11,7 @@ class ApplicationPolicy
   end
 
   def show?
-    scope.where(:id => record.id).exists?
+    scope.where(id: record.id).exists?
   end
 
   def new?

data/spec/unit/abstract_view_factory_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 require 'active_admin/abstract_view_factory'
 
-describe ActiveAdmin::AbstractViewFactory do
+RSpec.describe ActiveAdmin::AbstractViewFactory do
 
   let(:view_factory){ ActiveAdmin::AbstractViewFactory.new }
   let(:view){ Class.new }

data/spec/unit/action_builder_spec.rb

@@ -1,19 +1,15 @@
 require 'rails_helper'
 
-describe 'defining actions from registration blocks', type: :controller do
+RSpec.describe 'defining actions from registration blocks', type: :controller do
   let(:klass){ Admin::PostsController }
-  render_views # https://github.com/rspec/rspec-rails/issues/860
 
   before do
+    load_resources { action! }
+
     @controller = klass.new
   end
 
   describe 'creates a member action' do
-    before do
-      action!
-      reload_routes!
-    end
-
     after(:each) do
       klass.clear_member_actions!
     end
@@ -72,11 +68,6 @@ describe 'defining actions from registration blocks', type: :controller do
   end
 
   describe 'creates a collection action' do
-    before do
-      action!
-      reload_routes!
-    end
-
     after(:each) do
       klass.clear_collection_actions!
     end

data/spec/unit/active_admin_spec.rb

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

data/spec/unit/application_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 require 'fileutils'
 
-describe ActiveAdmin::Application do
+RSpec.describe ActiveAdmin::Application do
 
   let(:application) do
     ActiveAdmin::Application.new.tap do |app|
@@ -91,6 +91,10 @@ describe ActiveAdmin::Application do
     expect(application.comments).to eq true
   end
 
+  it "should have default order clause class" do
+    expect(application.order_clause).to eq ActiveAdmin::OrderClause
+  end
+
   describe "authentication settings" do
 
     it "should have no default current_user_method" do

data/spec/unit/asset_registration_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ActiveAdmin::AssetRegistration do
+RSpec.describe ActiveAdmin::AssetRegistration do
   include ActiveAdmin::AssetRegistration
 
   before do

data/spec/unit/authorization/authorization_adapter_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ActiveAdmin::AuthorizationAdapter do
+RSpec.describe ActiveAdmin::AuthorizationAdapter do
 
   let(:adapter) { ActiveAdmin::AuthorizationAdapter.new(double, double) }
 

data/spec/unit/authorization/controller_authorization_spec.rb

@@ -1,39 +1,43 @@
 require 'rails_helper'
-Auth = ActiveAdmin::Authorization
 
-describe Admin::PostsController, "Controller Authorization", type: :controller do
+RSpec.describe "Controller Authorization", type: :controller do
 
   let(:authorization){ controller.send(:active_admin_authorization) }
 
   before do
-    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
+    load_resources { ActiveAdmin.register Post }
+    @controller = Admin::PostsController.new
+    allow(authorization).to receive(:authorized?)
   end
 
   it "should authorize the index action" do
-    expect(authorization).to receive(:authorized?).with(Auth::READ, Post).and_return true
+    expect(authorization).to receive(:authorized?).with(auth::READ, Post).and_return true
     get :index
     expect(response).to be_success
   end
 
   it "should authorize the new action" do
-    expect(authorization).to 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
     expect(response).to be_success
   end
 
   it "should authorize the create action with the new resource" do
-    expect(authorization).to 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
     expect(response).to redirect_to action: 'show', id: Post.last.id
   end
 
   it "should redirect when the user isn't authorized" do
-    expect(authorization).to receive(:authorized?).with(Auth::READ, Post).and_return false
+    expect(authorization).to receive(:authorized?).with(auth::READ, Post).and_return false
     get :index
     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
 
+  private
+
+  def auth
+    ActiveAdmin::Authorization
+  end
 end

data/spec/unit/authorization/index_overriding_spec.rb

@@ -1,18 +1,18 @@
 require 'rails_helper'
 
-describe Admin::PostsController, 'Index overriding', type: :controller do
+RSpec.describe 'Index overriding', type: :controller do
   before do
-    controller.instance_eval do
+    load_resources { ActiveAdmin.register Post }
+    @controller = Admin::PostsController.new
+
+    @controller.instance_eval do
       def index
         super do
-          render Dependency.rails.render_key => 'Rendered from passed block'
+          render ActiveAdmin::Dependency.rails.render_key => 'Rendered from passed block'
           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

data/spec/unit/auto_link_spec.rb

@@ -1,24 +1,27 @@
 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 "auto linking resources" do
+RSpec.describe "auto linking resources", type: :view 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(:active_admin_namespace){ ActiveAdmin.application.namespace(:admin) }
   let(:post){ Post.create! title: "Hello World" }
 
-  def admin_post_path(post)
-    "/admin/posts/#{post.id}"
-  end
-
-  def authorized?(*)
-    true
+  before do
+    allow(self).to receive(:authorized?).and_return(true)
   end
 
   context "when the resource is not registered" do
+    before do
+      load_resources {}
+    end
+
     it "should return the display name of the object" do
       expect(auto_link(post)).to eq "Hello World"
     end
@@ -26,36 +29,57 @@ describe "auto linking resources" do
 
   context "when the resource is registered" do
     before do
-      active_admin_namespace.register Post
+      load_resources do
+        active_admin_namespace.register Post
+      end
     end
+
     it "should return a link with the display name of the object" do
-      expect(self).to receive(:url_for) { |url| url }
-      expect(self).to receive(:link_to).with "Hello World", admin_post_path(post)
-      auto_link(post)
+      expect(auto_link(post)).to \
+          match(%r{<a href="/admin/posts/\d+">Hello World</a>})
+    end
+
+    it "should keep locale in the url if present" do
+      expect(self).to receive(:url_options).and_return(locale: 'en')
+
+      expect(auto_link(post)).to \
+          match(%r{<a href="/admin/posts/\d+\?locale=en">Hello World</a>})
     end
 
     context "but the user doesn't have access" do
+      before do
+        allow(self).to receive(:authorized?).and_return(false)
+      end
+
       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
+  end
 
-    context "but the show action is disabled" do
-      before do
+  context "when the resource is registered with the show action disabled" do
+    before do
+      load_resources do
         active_admin_namespace.register(Post) { actions :all, except: :show }
       end
+    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
+    it "should fallback to edit" do
+      expect(auto_link(post)).to \
+        match(%r{<a href="/admin/posts/\d+/edit">Hello World</a>})
     end
 
-    context "but the show and edit actions are disabled" do
-      before do
+    it "should keep locale in the url if present" do
+      expect(self).to receive(:url_options).and_return(locale: 'en')
+
+      expect(auto_link(post)).to \
+        match(%r{<a href="/admin/posts/\d+/edit\?locale=en">Hello World</a>})
+    end
+  end
+
+  context "when the resource is registered with the show & edit actions disabled" do
+    before do
+      load_resources do
         active_admin_namespace.register(Post) do
           actions :all, except: [:show, :edit]
         end

data/spec/unit/batch_actions/resource_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ActiveAdmin::BatchActions::ResourceExtension do
+RSpec.describe ActiveAdmin::BatchActions::ResourceExtension do
 
   let(:resource) do
     namespace = ActiveAdmin::Namespace.new(ActiveAdmin::Application.new, :admin)
@@ -52,19 +52,6 @@ describe ActiveAdmin::BatchActions::ResourceExtension do
 
   end
 
-  describe "#batch_action_path" do
-
-    it "returns the path as a symbol" do
-      expect(resource.batch_action_path).to eq "/admin/posts/batch_action"
-    end
-
-    it "includes :scope and :q params" do
-      params = { q: { name_equals: "Any" }, scope: :all }
-      batch_action_path = "/admin/posts/batch_action?q%5Bname_equals%5D=Any&scope=all"
-      expect(resource.batch_action_path(params)).to eq(batch_action_path)
-    end
-  end
-
   describe "#display_if_block" do
 
     it "should return true by default" do

data/spec/unit/batch_actions/settings_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe "Batch Actions Settings" do
+RSpec.describe "Batch Actions Settings" do
   let(:app) { ActiveAdmin::Application.new }
   let(:ns) { ActiveAdmin::Namespace.new(app, "Admin") }
   let(:post_resource) { ns.register Post }

data/spec/unit/belongs_to_spec.rb

@@ -1,11 +1,19 @@
 require 'rails_helper'
 
-describe ActiveAdmin::Resource::BelongsTo do
+RSpec.describe ActiveAdmin::Resource::BelongsTo do
+  before do
+    load_resources do
+      ActiveAdmin.register User
+      ActiveAdmin.register Post do belongs_to :user end
+    end
+  end
 
+  let(:namespace) { ActiveAdmin.application.namespace(:admin) }
   let(:user_config){ ActiveAdmin.register User }
   let(:post_config){ ActiveAdmin.register Post do belongs_to :user end }
   let(:belongs_to){ post_config.belongs_to_config }
 
+
   it "should have an owner" do
     expect(belongs_to.owner).to eq post_config
   end

data/spec/unit/cancan_adapter_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ActiveAdmin::CanCanAdapter do
+RSpec.describe ActiveAdmin::CanCanAdapter do
 
   describe "full integration" do
 

data/spec/unit/comments_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe "Comments" do
+RSpec.describe "Comments" do
   let(:application) { ActiveAdmin::Application.new }
 
   describe ActiveAdmin::Comment do
@@ -39,7 +39,7 @@ describe "Comments" do
         expect(ActiveAdmin::Comment.find_for_resource_in_namespace(another_post, namespace_name)).to eq []
       end
 
-      it "should return the most recent comment first" do
+      it "should return the most recent comment first by default" do
         ActiveAdmin::Comment.class_eval { attr_accessible :created_at } if Rails::VERSION::MAJOR == 3
         another_comment = ActiveAdmin::Comment.create! resource: post,
                                                        body: "Another Comment",
@@ -58,24 +58,31 @@ describe "Comments" do
         expect(comments.last).to eq(another_comment)
       end
 
-      it "should return the correctly ordered comments" do
-        ActiveAdmin::Application.inheritable_setting(
-          :comments_order, "created_at DESC"
-        )
+      context "when custom ordering configured" do
+        around do |example|
+          previous_order = ActiveAdmin.application.comments_order
+          ActiveAdmin.application.comments_order = "created_at DESC"
 
-        another_comment = ActiveAdmin::Comment.create!(
-          resource: post,
-          body: "Another Comment",
-          namespace: namespace_name,
-          created_at: @comment.created_at + 20.minutes
-        )
-
-        comments = ActiveAdmin::Comment.find_for_resource_in_namespace(
-          post, namespace_name
-        )
-        expect(comments.size).to eq 2
-        expect(comments.first).to eq(another_comment)
-        expect(comments.last).to eq(@comment)
+          example.call
+
+          ActiveAdmin.application.comments_order = previous_order
+        end
+
+        it "should return the correctly ordered comments" do
+          another_comment = ActiveAdmin::Comment.create!(
+            resource: post,
+            body: "Another Comment",
+            namespace: namespace_name,
+            created_at: @comment.created_at + 20.minutes
+          )
+
+          comments = ActiveAdmin::Comment.find_for_resource_in_namespace(
+            post, namespace_name
+          )
+          expect(comments.size).to eq 2
+          expect(comments.first).to eq(another_comment)
+          expect(comments.last).to eq(@comment)
+        end
       end
     end