activeadmin 1.0.0.pre5 → 1.0.0

data/spec/unit/filters/active_spec.rb

@@ -2,16 +2,9 @@ require 'rails_helper'
 
 RSpec.describe ActiveAdmin::Filters::Active do
   subject { described_class.new(Post, params) }
-  let(:params_klass) do
-    if defined? ::ActionController::Parameters
-      ::ActionController::Parameters
-    else
-      HashWithIndifferentAccess #remove this when drop rails 3 support
-    end
-  end
 
   let(:params) do
-    params_klass.new(q: {author_id_eq: 1})
+    ::ActionController::Parameters.new(q: {author_id_eq: 1})
   end
 
   it 'should have filters' do

data/spec/unit/filters/filter_form_builder_spec.rb

@@ -150,9 +150,8 @@ RSpec.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') {
-          distinct = ActiveAdmin::Dependency.rails >= 4 ? :distinct : :uniq
-          m = double distinct => double(pluck: ['A Title'])
-          expect(m.send(distinct)).to receive(:pluck).with :title
+          m = double distinct: double(pluck: ['A Title'])
+          expect(m.distinct).to receive(:pluck).with :title
           m
         }
         body

data/spec/unit/filters/resource_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe ActiveAdmin::Filters::ResourceExtension do
 
   it "should return the defaults if no filters are set" do
     expect(resource.filters.keys).to match_array([
-      :author, :body, :category, :created_at, :custom_created_at_searcher, :custom_title_searcher, :custom_searcher_numeric, :position, :published_date, :starred, :taggings, :title, :updated_at
+      :author, :body, :category, :created_at, :custom_created_at_searcher, :custom_title_searcher, :custom_searcher_numeric, :position, :published_date, :starred, :taggings, :title, :updated_at, :foo_id
     ])
   end
 
@@ -35,7 +35,7 @@ RSpec.describe ActiveAdmin::Filters::ResourceExtension do
   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_created_at_searcher, :custom_title_searcher, :custom_searcher_numeric, :position, :published_date, :starred, :title, :updated_at
+      :body, :created_at, :custom_created_at_searcher, :custom_title_searcher, :custom_searcher_numeric, :position, :published_date, :starred, :title, :updated_at, :foo_id
     ])
   end
 
@@ -104,8 +104,7 @@ RSpec.describe ActiveAdmin::Filters::ResourceExtension do
       resource.add_filter :count, as: :string
 
       expect(resource.filters.keys).to match_array([
-        :author, :body, :category, :count, :created_at, :custom_created_at_searcher, :custom_title_searcher, :custom_searcher_numeric, :position, :published_date, :starred, :taggings, :title, :updated_at
-
+        :author, :body, :category, :count, :created_at, :custom_created_at_searcher, :custom_title_searcher, :custom_searcher_numeric, :position, :published_date, :starred, :taggings, :title, :updated_at, :foo_id
       ])
     end
 

data/spec/unit/form_builder_spec.rb

@@ -30,6 +30,10 @@ RSpec.describe ActiveAdmin::FormBuilder do
       args.inspect
     end
 
+    def view.action_name
+      'edit'
+    end
+
     view
   end
 
@@ -135,17 +139,15 @@ RSpec.describe ActiveAdmin::FormBuilder do
     end
   end
 
-  if Rails::VERSION::MAJOR > 3
-    context "file input present" do
-      let :body do
-        build_form do |f|
-          f.input :body, as: :file
-        end
+  context "file input present" do
+    let :body do
+      build_form do |f|
+        f.input :body, as: :file
       end
+    end
 
-      it "adds multipart attribute automatically" do
-        expect(body).to have_selector("form[enctype='multipart/form-data']")
-      end
+    it "adds multipart attribute automatically" do
+      expect(body).to have_selector("form[enctype='multipart/form-data']")
     end
   end
 
@@ -159,13 +161,39 @@ RSpec.describe ActiveAdmin::FormBuilder do
       end
       expect(body).to have_selector("[id=post_title]", count: 1)
     end
-    it "should generate one button and a cancel link" do
+
+    context "create another checkbox" do
+      subject do
+        build_form do |f|
+          f.actions
+        end
+      end
+
+      %w(new create).each do |action_name|
+        it "generates create another checkbox on #{action_name} page" do
+          expect(helpers).to receive(:action_name) { action_name }
+          allow(helpers).to receive(:active_admin_config) { instance_double(ActiveAdmin::Resource, create_another: true) }
+
+          is_expected.to have_selector("[type=checkbox]", count: 1)
+                            .and have_selector("[name=create_another]", count: 1)
+        end
+      end
+
+      %w(show edit update).each do |action_name|
+        it "doesn't generate create another checkbox on #{action_name} page" do
+          is_expected.not_to have_selector("[name=create_another]", count: 1)
+        end
+      end
+    end
+
+    it "should generate one button create another checkbox and a cancel link" do
       body = build_form do |f|
         f.actions
       end
       expect(body).to have_selector("[type=submit]", count: 1)
       expect(body).to have_selector("[class=cancel]", count: 1)
     end
+
     it "should generate multiple actions" do
       body = build_form do |f|
         f.actions do
@@ -526,7 +554,7 @@ RSpec.describe ActiveAdmin::FormBuilder do
       let :body do
         build_form({url: '/categories'}, Category.new) do |f|
           f.object.posts.build
-          f.has_many :posts do |p,i|
+          f.has_many :posts do |p, i|
             p.input :title, label: "Title #{i}"
           end
         end

data/spec/unit/namespace/register_page_spec.rb

@@ -87,7 +87,7 @@ RSpec.describe ActiveAdmin::Namespace, "registering a page" do
     context "when optional" do
       before do
         namespace.register_page "Reports" do
-          belongs_to :author, :optional => true
+          belongs_to :author, optional: true
         end
       end
 

data/spec/unit/pretty_format_spec.rb

@@ -8,58 +8,62 @@ RSpec.describe "#pretty_format" do
     mock_action_view.send *args, &block
   end
 
-  {String: 'hello', Fixnum: 23, Float: 5.67, Bignum: 10**30, Symbol: :foo,
-    'Arbre::Element' => Arbre::Element.new.br(:foo)
-  }.each do |klass, obj|
-    it "should call `to_s` on #{klass}s" do
-      expect(obj).to be_a klass.to_s.constantize # safeguard for Bignum
+  ['hello', 23, 5.67, 10**30, :foo, Arbre::Element.new.br(:foo)].each do |obj|
+    it "should call `to_s` on #{obj.class}s" do
       expect(pretty_format(obj)).to eq obj.to_s
     end
   end
 
-  context "given a Date or a Time" do
-    it "should return a localized Date or Time with long format" do
-      t = Time.now
-      expect(self).to receive(:localize).with(t, {format: :long}) { "Just Now!" }
-      expect(pretty_format(t)).to eq "Just Now!"
+  shared_examples_for 'a time-ish object' do |t|
+    it "formats it with the default long format" do
+      expect(pretty_format(t)).to eq "February 28, 1985 20:15"
     end
 
-    context "actually do the formatting" do
-      it "should actually do the formatting" do
-        t = Time.utc(1985,"feb",28,20,15,1)
-        expect(pretty_format(t)).to eq "February 28, 1985 20:15"
+    it "formats it with a customized long format" do
+      with_translation time: { formats: { long: "%B %d, %Y, %l:%M%P" } } do
+        expect(pretty_format(t)).to eq "February 28, 1985,  8:15pm"
       end
+    end
 
-      context "apply custom localize format" do
-        around do |example|
-          previous_localize_format = ActiveAdmin.application.localize_format
-          ActiveAdmin.application.localize_format = :short
-          example.call
-          ActiveAdmin.application.localize_format = previous_localize_format
-        end
-        it "should actually do the formatting" do
-          t = Time.utc(1985, "feb", 28, 20, 15, 1)
+    context "with a custom localize format" do
+      around do |example|
+        previous_localize_format = ActiveAdmin.application.localize_format
+        ActiveAdmin.application.localize_format = :short
+        example.call
+        ActiveAdmin.application.localize_format = previous_localize_format
+      end
 
-          expect(pretty_format(t)).to eq "28 Feb 20:15"
-        end
+      it "formats it with the default custom format" do
+        expect(pretty_format(t)).to eq "28 Feb 20:15"
       end
 
-      context "with non-English locale" do
-        before do
-          @previous_locale = I18n.locale.to_s
-          I18n.locale = "es"
+      it "formats it with i18n custom format" do
+        with_translation time: { formats: { short: "%-m %d %Y" } } do
+          expect(pretty_format(t)).to eq "2 28 1985"
         end
-        after do
-          I18n.locale = @previous_locale
-        end
-        it "should return a localized Date or Time with long format for non-english locale" do
-          t = Time.utc(1985,"feb",28,20,15,1)
-          expect(pretty_format(t)).to eq "28 de febrero de 1985 20:15"
+      end
+    end
+
+    context "with non-English locale" do
+      around do |example|
+        I18n.with_locale(:es) { example.call }
+      end
+
+      it "formats it with the default long format" do
+        expect(pretty_format(t)).to eq "28 de febrero de 1985 20:15"
+      end
+
+      it "formats it with a customized long format" do
+        with_translation time: { formats: { long: "El %d de %B de %Y a las %H horas y %M minutos" } } do
+          expect(pretty_format(t)).to eq "El 28 de febrero de 1985 a las 20 horas y 15 minutos"
         end
       end
     end
   end
 
+  it_behaves_like 'a time-ish object', Time.utc(1985, "feb", 28, 20, 15, 1)
+  it_behaves_like 'a time-ish object', DateTime.new(1985, 2, 28, 20, 15, 1)
+
   context "given an ActiveRecord object" do
     it "should delegate to auto_link" do
       post = Post.new

data/spec/unit/resource/attributes_spec.rb

@@ -0,0 +1,50 @@
+require 'rails_helper'
+
+module ActiveAdmin
+  RSpec.describe Resource, "Attributes" do
+    let(:application) { ActiveAdmin::Application.new }
+    let(:namespace) { ActiveAdmin::Namespace.new application, :admin }
+    let(:resource_config) { ActiveAdmin::Resource.new namespace, Post }
+
+    describe "#resource_attributes" do
+      subject do
+        resource_config.resource_attributes
+      end
+
+      it 'should return attributes hash' do
+        expect(subject).to eq( author_id: :author,
+                               body: :body,
+                               created_at: :created_at,
+                               custom_category_id: :category,
+                               foo_id: :foo_id,
+                               position: :position,
+                               published_date: :published_date,
+                               starred: :starred,
+                               title: :title,
+                               updated_at: :updated_at)
+      end
+    end
+
+    describe "#association_columns" do
+      subject do
+        resource_config.association_columns
+      end
+
+      it 'should return associations' do
+        expect(subject).to eq([:author, :category])
+      end
+    end
+
+    describe "#content_columns" do
+      subject do
+        resource_config.content_columns
+      end
+
+      it 'should return columns without associations' do
+        expect(subject).to eq([:title, :body, :published_date, :position, :starred, :foo_id, :created_at, :updated_at])
+      end
+    end
+
+  end
+end
+

data/spec/unit/resource/includes_spec.rb

@@ -7,7 +7,7 @@ module ActiveAdmin
       let(:application) { ActiveAdmin::Application.new }
       let(:namespace) { ActiveAdmin::Namespace.new application, :admin }
       let(:resource_config) { ActiveAdmin::Resource.new namespace, Post }
-      let(:dsl){ ActiveAdmin::ResourceDSL.new(resource_config, Post) }
+      let(:dsl){ ActiveAdmin::ResourceDSL.new(resource_config) }
 
       it "should register the includes in the config" do
         dsl.run_registration_block do

data/spec/unit/resource/ordering_spec.rb

@@ -7,7 +7,7 @@ module ActiveAdmin
       let(:application) { ActiveAdmin::Application.new }
       let(:namespace) { ActiveAdmin::Namespace.new application, :admin }
       let(:resource_config) { ActiveAdmin::Resource.new namespace, Post }
-      let(:dsl){ ActiveAdmin::ResourceDSL.new(resource_config, Post) }
+      let(:dsl){ ActiveAdmin::ResourceDSL.new(resource_config) }
 
       it "should register the ordering in the config" do
         dsl.run_registration_block do

data/spec/unit/resource/routes_spec.rb

@@ -101,7 +101,7 @@ RSpec.describe ActiveAdmin::Resource::Routes do
       end
 
       it "should include :scope and :q params" do
-        params = { category_id: 1, q: { name_equals: "Any" }, scope: :all }
+        params = ActionController::Parameters.new(category_id: 1, q: { name_equals: "Any" }, scope: :all)
         additional_params = { locale: 'en' }
         batch_action_path = "/admin/categories/1/posts/batch_action?locale=en&q%5Bname_equals%5D=Any&scope=all"
 
@@ -115,7 +115,7 @@ RSpec.describe ActiveAdmin::Resource::Routes do
       let(:config) { ActiveAdmin.register News }
 
       it "should return the plural batch action route with _index and given params" do
-        params = { q: { name_equals: "Any" }, scope: :all }
+        params = ActionController::Parameters.new(q: { name_equals: "Any" }, scope: :all)
         additional_params = { locale: 'en' }
         batch_action_path = "/admin/news/batch_action?locale=en&q%5Bname_equals%5D=Any&scope=all"
         expect(config.route_batch_action_path(params, additional_params)).to eq batch_action_path

data/spec/unit/resource_controller/data_access_spec.rb

@@ -2,13 +2,22 @@ require 'rails_helper'
 
 RSpec.describe ActiveAdmin::ResourceController::DataAccess do
   before do
-    load_resources { ActiveAdmin.register Post }
+    load_resources { config }
   end
 
-  let(:params) do
+  let(:config) do
+    ActiveAdmin.register Post do
+    end
+  end
+
+  let(:http_params) do
     {}
   end
 
+  let(:params) do
+    ActionController::Parameters.new(http_params)
+  end
+
   let(:controller) do
     rc = Admin::PostsController.new
     allow(rc).to receive(:params) do
@@ -18,7 +27,7 @@ RSpec.describe ActiveAdmin::ResourceController::DataAccess do
   end
 
   describe "searching" do
-    let(:params) {{ q: {} }}
+    let(:http_params) {{ q: {} }}
     it "should call the search method" do
       chain = double "ChainObj"
       expect(chain).to receive(:ransack).with(params[:q]).once.and_return(Post.ransack)
@@ -26,7 +35,7 @@ RSpec.describe ActiveAdmin::ResourceController::DataAccess do
     end
 
     context "params includes empty values" do
-      let(:params) do
+      let(:http_params) do
         { q: {id_eq: 1, position_eq: ""} }
       end
       it "should return relation without empty filters" do
@@ -38,14 +47,12 @@ RSpec.describe ActiveAdmin::ResourceController::DataAccess do
         controller.send :apply_filtering, Post
       end
     end
-
-
   end
 
   describe "sorting" do
 
     context "valid clause" do
-      let(:params) {{ order: "id_asc" }}
+      let(:http_params) {{ order: "id_asc" }}
 
       it "reorders chain" do
         chain = double "ChainObj"
@@ -55,7 +62,7 @@ RSpec.describe ActiveAdmin::ResourceController::DataAccess do
     end
 
     context "invalid clause" do
-      let(:params) {{ order: "_asc" }}
+      let(:http_params) {{ order: "_asc" }}
 
       it "returns chain untouched" do
         chain = double "ChainObj"
@@ -76,7 +83,7 @@ RSpec.describe ActiveAdmin::ResourceController::DataAccess do
       end
 
       context "when params applicable" do
-        let(:params) {{ order: "published_date_desc" }}
+        let(:http_params) {{ order: "published_date_desc" }}
         it "reorders chain" do
           chain = double "ChainObj"
           expect(chain).to receive(:reorder).with('"posts"."published_date" desc NULLS LAST').once.and_return(Post.search)
@@ -84,7 +91,7 @@ RSpec.describe ActiveAdmin::ResourceController::DataAccess do
         end
       end
       context "when params not applicable" do
-        let(:params) {{ order: "published_date_asc" }}
+        let(:http_params) {{ order: "published_date_asc" }}
         it "reorders chain" do
           chain = double "ChainObj"
           expect(chain).to receive(:reorder).with('"posts"."published_date" asc').once.and_return(Post.search)
@@ -186,4 +193,38 @@ RSpec.describe ActiveAdmin::ResourceController::DataAccess do
       end
     end
   end
+
+  describe "build_resource" do
+
+    let(:config) do
+      ActiveAdmin.register Post do
+        permit_params :body, taggings_attributes: [:id, :tag_id]
+      end
+    end
+
+    let!(:tag) { Tag.create! }
+
+    let(:params) do
+      ActionController::Parameters.new({ post: { body: 'Body', taggings_attributes: [tag_id: tag.id] } })
+    end
+
+    before do
+      expect(Post).to receive(:new).with(a_hash_including(:body, :taggings_attributes )).and_call_original
+    end
+
+    subject do
+      controller.send :build_resource
+    end
+
+    it "should return post with assigned attributes" do
+      expect(subject.body).to be_present
+    end
+
+    # see issue 4548
+    it "should assign nested attributes once" do
+      expect(subject.taggings.size).to eq(1)
+    end
+
+  end
+
 end