activeadmin 1.0.0.pre5 → 1.0.0

data/spec/unit/resource_controller/decorators_spec.rb

@@ -32,11 +32,11 @@ RSpec.describe ActiveAdmin::ResourceController::Decorators do
       context 'with form' do
         let(:action) { 'update' }
 
-        it "does not decorate when :decorate is set to false" do 
+        it "does not decorate when :decorate is set to false" do
           form = double
           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) 
+          is_expected.not_to be_kind_of(PostDecorator)
         end
       end
     end

data/spec/unit/resource_controller/sidebars_spec.rb

@@ -23,10 +23,10 @@ RSpec.describe ActiveAdmin::ResourceController::Sidebars, type: :controller do
     end
   end
 
-  context 'with skip_sidebar! before_filter' do
+  context 'with skip_sidebar! before_action' do
     include_context 'with post config' do
       let(:post_config) do
-        ActiveAdmin.register(Post) { before_filter :skip_sidebar! }
+        ActiveAdmin.register(Post) { before_action :skip_sidebar! }
       end
     end
 
@@ -34,4 +34,4 @@ RSpec.describe ActiveAdmin::ResourceController::Sidebars, type: :controller do
       expect(controller.instance_variable_get(:@skip_sidebar)).to eq true
     end
   end
-end unless ActiveAdmin::Dependency.rails < 4
+end

data/spec/unit/resource_controller_spec.rb

@@ -156,11 +156,12 @@ RSpec.describe "A specific resource controller", type: :controller do
 
   describe 'retrieving the resource' do
     let(:post) { Post.new title: "An incledibly unique Post Title" }
+    let(:http_params){ { id: '1' } }
 
     before do
       allow(Post).to receive(:find).and_return(post)
       controller.class_eval { public :resource }
-      allow(controller).to receive(:params).and_return({ id: '1' })
+      allow(controller).to receive(:params).and_return( ActionController::Parameters.new(http_params) )
     end
 
     subject { controller.resource }
@@ -220,13 +221,17 @@ RSpec.describe "A specific resource controller", type: :controller do
   describe "performing batch_action" do
     let(:batch_action) { ActiveAdmin::BatchAction.new :flag, "Flag", &batch_action_block }
     let(:batch_action_block) { proc { } }
+    let(:params) { ActionController::Parameters.new(http_params) }
+
     before do
       allow(controller.class.active_admin_config).to receive(:batch_actions).and_return([batch_action])
+      allow(controller).to receive(:params) { params }
     end
 
     describe "when params batch_action matches existing BatchAction" do
-      before do
-        allow(controller).to receive(:params) { { batch_action: "flag", collection_selection: ["1"] } }
+
+      let(:http_params) do
+        { batch_action: "flag", collection_selection: ["1"] }
       end
 
       it "should call the block with args" do
@@ -241,8 +246,11 @@ RSpec.describe "A specific resource controller", type: :controller do
     end
 
     describe "when params batch_action doesn't match a BatchAction" do
+      let(:http_params) do
+        { batch_action: "derp", collection_selection: ["1"] }
+      end
+
       it "should raise an error" do
-        allow(controller).to receive(:params) { { batch_action: "derp", collection_selection: ["1"] } }
         expect {
           controller.batch_action
         }.to raise_error("Couldn't find batch action \"derp\"")
@@ -250,8 +258,11 @@ RSpec.describe "A specific resource controller", type: :controller do
     end
 
     describe "when params batch_action is blank" do
+      let(:http_params) do
+        { collection_selection: ["1"] }
+      end
+
       it "should raise an error" do
-        allow(controller).to receive(:params) { { collection_selection: ["1"] } }
         expect {
           controller.batch_action
         }.to raise_error("Couldn't find batch action \"\"")

data/spec/unit/resource_spec.rb

@@ -85,10 +85,10 @@ module ActiveAdmin
         expect(config.belongs_to_config).to_not eq nil
       end
 
-      it "should set the target menu to the belongs to target" do
+      it "should not set the target menu to the belongs to target" do
         expect(config.navigation_menu_name).to eq ActiveAdmin::DEFAULT_MENU
         config.belongs_to :posts
-        expect(config.navigation_menu_name).to eq :posts
+        expect(config.navigation_menu_name).to eq ActiveAdmin::DEFAULT_MENU
       end
 
     end
@@ -197,7 +197,7 @@ module ActiveAdmin
     describe "#csv_builder" do
       context "when no csv builder set" do
         it "should return a default column builder with id and content columns" do
-          expect(config.csv_builder.exec_columns.size).to eq Category.content_columns.size + 1
+          expect(config.csv_builder.exec_columns.size).to eq @config.content_columns.size + 1
         end
       end
 
@@ -234,13 +234,8 @@ module ActiveAdmin
       let(:resource) { namespace.register(Post) }
       let(:post) { double }
       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
+        allow(Post).to receive(:find_by).with("id" => "12345") { post }
+        allow(Post).to receive(:find_by).with("id" => "54321") { nil }
       end
 
       it 'can find the resource' do
@@ -262,13 +257,8 @@ module ActiveAdmin
         let(:different_post) { double }
         before do
           allow(Post).to receive(:primary_key).and_return 'something_else'
-          if Rails::VERSION::MAJOR >= 4
-            allow(Post).to receive(:find_by).
+          allow(Post).to receive(:find_by).
               with("something_else" => "55555") { different_post }
-          else
-            allow(Post).to receive(:find_by_something_else).
-              with("55555") { different_post }
-          end
         end
 
         it 'can find the post by the custom primary key' do
@@ -301,36 +291,20 @@ module ActiveAdmin
           end
         end.new
       }
-      let(:resource) { ActiveAdmin::ResourceDSL.new(double, double) }
+      let(:resource) { ActiveAdmin::ResourceDSL.new(double) }
 
       before do
         expect(resource).to receive(:controller).and_return(controller)
       end
 
-      context "filters" do
+      context "actions" do
         [
-          :before_filter, :skip_before_filter,
-          :after_filter, :skip_after_filter,
-          :around_filter, :skip_filter
+          :before_action, :skip_before_action,
+          :after_action, :skip_after_action,
+          :around_action, :skip_action
         ].each do |method|
           it "delegates #{method}" do
-            expected = method.to_s.dup
-            expected.sub! 'filter', 'action' if ActiveAdmin::Dependency.rails >= 4
-            expect(resource.send(method)).to eq "called #{expected}"
-          end
-        end
-      end
-
-      if ActiveAdmin::Dependency.rails >= 4
-        context "actions" do
-          [
-            :before_action, :skip_before_action,
-            :after_action, :skip_after_action,
-            :around_action, :skip_action
-          ].each do |method|
-            it "delegates #{method}" do
-              expect(resource.send(method)).to eq "called #{method}"
-            end
+            expect(resource.send(method)).to eq "called #{method}"
           end
         end
       end

data/spec/unit/routing_spec.rb

@@ -145,7 +145,7 @@ RSpec.describe ActiveAdmin, "Routing", type: :routing do
     end
 
     it "should route the nested show path" do
-      expect(admin_user_post_path(1,2)).to eq "/admin/users/1/posts/2"
+      expect(admin_user_post_path(1, 2)).to eq "/admin/users/1/posts/2"
     end
 
     it "should route the nested new path" do
@@ -153,7 +153,7 @@ RSpec.describe ActiveAdmin, "Routing", type: :routing do
     end
 
     it "should route the nested edit path" do
-      expect(edit_admin_user_post_path(1,2)).to eq "/admin/users/1/posts/2/edit"
+      expect(edit_admin_user_post_path(1, 2)).to eq "/admin/users/1/posts/2/edit"
     end
 
     context "with collection action" do

data/spec/unit/view_helpers/breadcrumbs_spec.rb

@@ -129,7 +129,7 @@ RSpec.describe "Breadcrumbs" do
       context "when User.find(4e24d6249ccf967313000000) does exist" do
         before do
           display_name = double(display_name: 'Hello :)')
-          allow(user_config).to receive(:find_resource).and_return(display_name) 
+          allow(user_config).to receive(:find_resource).and_return(display_name)
         end
         it "should have a link to /admin/users/4e24d6249ccf967313000000 using display name" do
           expect(trail[2][:name]).to eq "Hello :)"
@@ -138,6 +138,41 @@ RSpec.describe "Breadcrumbs" do
       end
     end
 
+    context "when path '/admin/users/2b2f0fc2-9a0d-41b8-b39d-aa21963aaee4/posts'" do
+      let(:path) { "/admin/users/2b2f0fc2-9a0d-41b8-b39d-aa21963aaee4/posts" }
+
+      it "should have 3 items" do
+        expect(trail.size).to eq 3
+      end
+      it "should have a link to /admin" do
+        expect(trail[0][:name]).to eq "Admin"
+        expect(trail[0][:path]).to eq "/admin"
+      end
+      it "should have a link to /admin/users" do
+        expect(trail[1][:name]).to eq "Users"
+        expect(trail[1][:path]).to eq "/admin/users"
+      end
+
+      context "when User.find(2b2f0fc2-9a0d-41b8-b39d-aa21963aaee4) doesn't exist" do
+        before { allow(user_config).to receive(:find_resource) }
+        it "should have a link to /admin/users/2b2f0fc2-9a0d-41b8-b39d-aa21963aaee4" do
+          expect(trail[2][:name]).to eq "2b2f0fc2-9a0d-41b8-b39d-aa21963aaee4".titlecase
+          expect(trail[2][:path]).to eq "/admin/users/2b2f0fc2-9a0d-41b8-b39d-aa21963aaee4"
+        end
+      end
+
+      context "when User.find(2b2f0fc2-9a0d-41b8-b39d-aa21963aaee4) does exist" do
+        before do
+          display_name = double(display_name: 'Hello :)')
+          allow(user_config).to receive(:find_resource).and_return(display_name)
+        end
+        it "should have a link to /admin/users/2b2f0fc2-9a0d-41b8-b39d-aa21963aaee4 using display name" do
+          expect(trail[2][:name]).to eq "Hello :)"
+          expect(trail[2][:path]).to eq "/admin/users/2b2f0fc2-9a0d-41b8-b39d-aa21963aaee4"
+        end
+      end
+    end
+
     context "when path '/admin/users/1/coments/1'" do
       let(:path) { "/admin/users/1/posts/1" }
 

data/spec/unit/view_helpers/display_helper_spec.rb

@@ -151,10 +151,10 @@ RSpec.describe ActiveAdmin::ViewHelpers::DisplayHelper do
       expect(value).to eq :right
     end
 
-    it 'auto-links ActiveRecord records from foreign keys' do
+    it 'auto-links ActiveRecord records by association' do
       post = Post.create! author: User.new
 
-      value = format_attribute post, :author_id
+      value = format_attribute post, :author
 
       expect(value).to match /<a href="\/admin\/users\/\d+"> <\/a>/
     end
@@ -176,5 +176,20 @@ RSpec.describe ActiveAdmin::ViewHelpers::DisplayHelper do
 
       expect(value.to_s).to eq "<span class=\"status_tag yes\">Yes</span>\n"
     end
+
+    it 'calls status_tag for boolean non-database values' do
+      post = Post.new
+      post.define_singleton_method(:true_method) do
+        true
+      end
+      post.define_singleton_method(:false_method) do
+        false
+      end
+      true_value = format_attribute post, :true_method
+      expect(true_value.to_s).to eq "<span class=\"status_tag yes\">Yes</span>\n"
+      false_value = format_attribute post, :false_method
+      expect(false_value.to_s).to eq "<span class=\"status_tag no\">No</span>\n"
+    end
+
   end
 end

data/spec/unit/view_helpers/fields_for_spec.rb

@@ -1,4 +1,4 @@
-require 'active_admin/view_helpers/fields_for'
+require 'rails_helper'
 
 RSpec.describe ActiveAdmin::ViewHelpers::FormHelper, ".fields_for" do
   include ActiveAdmin::ViewHelpers::FormHelper

data/spec/unit/view_helpers/form_helper_spec.rb

@@ -25,17 +25,17 @@ RSpec.describe ActiveAdmin::ViewHelpers::FormHelper do
     let(:view) { action_view }
 
     it "should render hidden field tags for params" do
-      html = Capybara.string view.hidden_field_tags_for(scope: "All", filter: "None")
+      html = Capybara.string view.hidden_field_tags_for(ActionController::Parameters.new(scope: "All", filter: "None"))
       expect(html).to have_selector("input#hidden_active_admin_scope[name=scope][type=hidden][value=All]")
       expect(html).to have_selector("input#hidden_active_admin_filter[name=filter][type=hidden][value=None]")
     end
 
     it "should generate not default id for hidden input" do
-      expect(view.hidden_field_tags_for(scope: "All")[/id="([^"]+)"/, 1]).to_not eq "scope"
+      expect(view.hidden_field_tags_for(ActionController::Parameters.new(scope: "All"))[/id="([^"]+)"/, 1]).to_not eq "scope"
     end
 
     it "should filter out the field passed via the option :except" do
-      html = Capybara.string view.hidden_field_tags_for({scope: "All", filter: "None"}, except: :filter)
+      html = Capybara.string view.hidden_field_tags_for(ActionController::Parameters.new(scope: "All", filter: "None"), except: :filter)
       expect(html).to have_selector("input#hidden_active_admin_scope[name=scope][type=hidden][value=All]")
     end
   end

data/spec/unit/view_helpers/method_or_proc_helper_spec.rb

@@ -55,7 +55,7 @@ RSpec.describe MethodOrProcHelper do
         end
 
         expect {
-          context.call_method_or_proc_on(receiver,test_proc)
+          context.call_method_or_proc_on(receiver, test_proc)
         }.to raise_error("Success!")
       end
 
@@ -81,7 +81,7 @@ RSpec.describe MethodOrProcHelper do
         end
 
         expect {
-          context.call_method_or_proc_on(receiver,test_proc, exec: false)
+          context.call_method_or_proc_on(receiver, test_proc, exec: false)
         }.to raise_error("Success!")
       end
 

data/spec/unit/views/components/attributes_table_spec.rb

@@ -139,7 +139,7 @@ RSpec.describe ActiveAdmin::Views::AttributesTable do
       end
       it 'should call the association if one exists' do
         table = render_arbre_component assigns do
-          attributes_table_for post, :author_id
+          attributes_table_for post, :author
         end
         expect(table.find_by_tag('th').first.content).to eq 'Author'
         expect(table.find_by_tag('td').first.content).to eq 'John Doe'
@@ -256,7 +256,7 @@ RSpec.describe ActiveAdmin::Views::AttributesTable do
     context "when using an Array of Hashes" do
       let(:table) do
         render_arbre_component nil, helpers do
-          attributes_table_for [{foo: 1},{foo: 2}] do
+          attributes_table_for [{foo: 1}, {foo: 2}] do
             row :foo
           end
         end

data/spec/unit/views/components/index_list_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe ActiveAdmin::Views::IndexList do
       helpers = mock_action_view
       allow(helpers).to receive(:url_for) { |url| "/?#{ url.to_query }" }
       allow(helpers.request).to receive(:query_parameters).and_return as: "table", q: { title_contains: "terms" }
-      allow(helpers).to receive(:params).and_return as: "table", q: { title_contains: "terms" }
+      allow(helpers).to receive(:params).and_return(ActionController::Parameters.new(as: "table", q: { title_contains: "terms" }))
       allow(helpers).to receive(:collection).and_return(collection)
       helpers
     end

data/spec/unit/views/components/paginated_collection_spec.rb

@@ -189,7 +189,7 @@ RSpec.describe ActiveAdmin::Views::PaginatedCollection do
       end
 
       it "should display proper message (including number and not hash)" do
-        expect(pagination.find_by_class('pagination_information').first.content.gsub(' ',' ')).
+        expect(pagination.find_by_class('pagination_information').first.content.gsub(' ', ' ')).
           to eq "Displaying posts <b>1 - 2</b> of <b>3</b> in total"
       end
     end
@@ -200,7 +200,7 @@ RSpec.describe ActiveAdmin::Views::PaginatedCollection do
       end
 
       it "should show the proper item counts" do
-        expect(pagination.find_by_class('pagination_information').first.content.gsub('&nbsp;',' ')).
+        expect(pagination.find_by_class('pagination_information').first.content.gsub('&nbsp;', ' ')).
           to eq "Displaying posts <b>61 - 81</b> of <b>81</b> in total"
       end
     end
@@ -214,7 +214,7 @@ RSpec.describe ActiveAdmin::Views::PaginatedCollection do
         it "should not show the total item counts" do
           expect(collection).not_to receive(:total_pages)
           pagination = paginated_collection(collection, pagination_total: false)
-          info = pagination.find_by_class('pagination_information').first.content.gsub('&nbsp;',' ')
+          info = pagination.find_by_class('pagination_information').first.content.gsub('&nbsp;', ' ')
           expect(info).to eq "Displaying posts <b>1 - 30</b>"
         end
       end
@@ -223,7 +223,7 @@ RSpec.describe ActiveAdmin::Views::PaginatedCollection do
         let(:pagination) { paginated_collection(collection, pagination_total: true) }
 
         it "should show the total item counts" do
-          info = pagination.find_by_class('pagination_information').first.content.gsub('&nbsp;',' ')
+          info = pagination.find_by_class('pagination_information').first.content.gsub('&nbsp;', ' ')
           expect(info).to eq "Displaying posts <b>1 - 30</b> of <b>256</b> in total"
         end
       end

data/spec/unit/views/components/table_for_spec.rb

@@ -258,7 +258,7 @@ RSpec.describe ActiveAdmin::Views::TableFor do
     context "when using an Array of Hashes" do
       let(:table) do
         render_arbre_component nil, helpers do
-          table_for [{foo: 1},{foo: 2}] do
+          table_for [{foo: 1}, {foo: 2}] do
             column :foo
           end
         end

data/spec/unit/views/components/unsupported_browser_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe ActiveAdmin::Views::UnsupportedBrowser do
   end
 
   it "should render the panel" do
-    expect(I18n).to receive(:t).and_return("headline", "recommendation" ,"turn_off_compatibility_view")
+    expect(I18n).to receive(:t).and_return("headline", "recommendation" , "turn_off_compatibility_view")
     expect(build_panel.content.gsub(/\s+/, "")).to eq "<h1>headline</h1><p>recommendation</p><p>turn_off_compatibility_view</p>"
   end
 

data/spec/unit/views/pages/form_spec.rb

@@ -4,7 +4,9 @@ RSpec.describe ActiveAdmin::Views::Pages::Form do
   describe "#title" do
     let!(:application){ ActiveAdmin::Application.new }
     let(:namespace){ ActiveAdmin::Namespace.new(application, "Admin") }
-    let!(:params){ { controller: "UsersController", action: "edit" } }
+    let!(:http_params){ { controller: "UsersController", action: "edit" } }
+    let!(:params) { ActionController::Parameters.new(http_params) }
+
     let(:helpers) do
       helpers = mock_action_view
       allow(helpers).to receive(:active_admin_config).and_return(namespace.register(Post))
@@ -18,6 +20,7 @@ RSpec.describe ActiveAdmin::Views::Pages::Form do
 
     context "when :title is set" do
       it "should show the set page title" do
+
         page = ActiveAdmin::Views::Pages::Form.new(arbre_context)
         expect(page).to receive(:resource)
         expect(page).to receive(:form_presenter).twice.and_return({ title: "My Page Title" })

data/spec/unit/views/pages/index_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe ActiveAdmin::Views::Pages::Index do
   describe "#title" do
     let!(:application){ ActiveAdmin::Application.new }
     let(:namespace){ ActiveAdmin::Namespace.new(application, "Admin") }
-    let!(:params){ { controller: "UsersController", action: "edit" } }
+    let!(:params){  ActionController::Parameters.new(controller: "UsersController", action: "edit") }
     let(:helpers) do
       helpers = mock_action_view
       allow(helpers).to receive(:active_admin_config).and_return(namespace.register(Post))