activeadmin 1.0.0 → 1.1.0

data/spec/support/templates/policies/active_admin/comment_policy.rb

@@ -6,4 +6,4 @@ module ActiveAdmin
       end
     end
   end
-end
+end

data/spec/support/templates/policies/active_admin/page_policy.rb

@@ -15,4 +15,4 @@ module ActiveAdmin
       end
     end
   end
-end
+end

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

@@ -38,8 +38,7 @@ class ApplicationPolicy
     true
   end
 
-
   def scope
     Pundit.policy_scope!(user, record.class)
   end
-end
+end

data/spec/support/templates/post_decorator.rb

@@ -8,4 +8,3 @@ class PostDecorator < Draper::Decorator
     'A method only available on the decorator'
   end
 end
-

data/spec/unit/abstract_view_factory_spec.rb

@@ -75,5 +75,4 @@ RSpec.describe ActiveAdmin::AbstractViewFactory do
     end
   end
 
-
 end

data/spec/unit/application_spec.rb

@@ -100,6 +100,10 @@ RSpec.describe ActiveAdmin::Application do
     expect(application.order_clause).to eq ActiveAdmin::OrderClause
   end
 
+  it "should have default show_count for scopes" do
+    expect(application.scopes_show_count).to eq true
+  end
+
   describe "authentication settings" do
 
     it "should have no default current_user_method" do

data/spec/unit/asset_registration_spec.rb

@@ -8,13 +8,37 @@ RSpec.describe ActiveAdmin::AssetRegistration do
     clear_javascripts!
   end
 
+  it "is deprecated" do
+    expect(ActiveAdmin::Deprecation)
+      .to receive(:warn)
+      .with(<<-MSG.strip_heredoc
+        The `register_stylesheet` config is deprecated and will be removed
+        in v2. Import your "sample_styles.css" stylesheet in the active_admin.scss.
+      MSG
+      )
+
+    register_stylesheet "sample_styles.css"
+
+    expect(ActiveAdmin::Deprecation)
+      .to receive(:warn)
+      .with(<<-MSG.strip_heredoc
+        The `register_javascript` config is deprecated and will be removed
+        in v2. Import your "sample_scripts.js" javascript in the active_admin.js.
+      MSG
+      )
+
+    register_javascript "sample_scripts.js"
+  end
+
   it "should register a stylesheet file" do
+    expect(ActiveAdmin::Deprecation).to receive(:warn).once
     register_stylesheet "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
+    expect(ActiveAdmin::Deprecation).to receive(:warn).once
     register_stylesheet "active_admin.css"
     expect(stylesheets.length).to eq 1
     clear_stylesheets!
@@ -22,22 +46,26 @@ RSpec.describe ActiveAdmin::AssetRegistration do
   end
 
   it "should allow media option when registering stylesheet" do
+    expect(ActiveAdmin::Deprecation).to receive(:warn).once
     register_stylesheet "active_admin.css", media: :print
     expect(stylesheets.values.first[:media]).to eq :print
   end
 
   it "shouldn't register a stylesheet twice" do
+    expect(ActiveAdmin::Deprecation).to receive(:warn).twice
     register_stylesheet "active_admin.css"
     register_stylesheet "active_admin.css"
     expect(stylesheets.length).to eq 1
   end
 
   it "should register a javascript file" do
+    expect(ActiveAdmin::Deprecation).to receive(:warn).once
     register_javascript "active_admin.js"
     expect(javascripts).to eq ["active_admin.js"].to_set
   end
 
   it "should clear all existing javascripts" do
+    expect(ActiveAdmin::Deprecation).to receive(:warn).once
     register_javascript "active_admin.js"
     expect(javascripts).to eq ["active_admin.js"].to_set
     clear_javascripts!
@@ -45,6 +73,7 @@ RSpec.describe ActiveAdmin::AssetRegistration do
   end
 
   it "shouldn't register a javascript twice" do
+    expect(ActiveAdmin::Deprecation).to receive(:warn).twice
     register_javascript "active_admin.js"
     register_javascript "active_admin.js"
     expect(javascripts.length).to eq 1

data/spec/unit/belongs_to_spec.rb

@@ -13,7 +13,6 @@ RSpec.describe ActiveAdmin::Resource::BelongsTo do
   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
@@ -57,7 +56,7 @@ RSpec.describe ActiveAdmin::Resource::BelongsTo do
 
   describe "controller" do
     let(:controller) { post_config.controller.new }
-    let(:http_params) { {user_id: user.id}  }
+    let(:http_params) { {user_id: user.id} }
     let(:user) { User.create! }
 
     before do

data/spec/unit/config_shared_examples.rb

@@ -34,7 +34,7 @@ RSpec.shared_examples_for "ActiveAdmin::Resource" do
     describe "#menu_item_options" do
 
       it "initializes a new menu item with defaults" do
-          expect(config.menu_item_options[:label].call).to eq(config.plural_resource_label)
+        expect(config.menu_item_options[:label].call).to eq(config.plural_resource_label)
       end
 
       it "initialize a new menu item with custom options" do

data/spec/unit/csv_builder_spec.rb

@@ -1,5 +1,3 @@
-# Encoding: UTF-8
-
 require 'rails_helper'
 
 RSpec.describe ActiveAdmin::CSVBuilder do
@@ -192,8 +190,8 @@ RSpec.describe ActiveAdmin::CSVBuilder do
 
   context "build csv using the supplied order" do
     before do
-      @post1 = Post.create!(title: "Hello1", published_date: Date.today - 2.day )
-      @post2 = Post.create!(title: "Hello2", published_date: Date.today - 1.day )
+      @post1 = Post.create!(title: "Hello1", published_date: Date.today - 2.day)
+      @post2 = Post.create!(title: "Hello2", published_date: Date.today - 1.day)
     end
     let(:dummy_controller) {
       class DummyController

data/spec/unit/dependency_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe ActiveAdmin::Dependency do
       end
       it '=' do
         expect(k.foo? '= 1.2.3').to eq true
-        expect(k.foo? '= 1'    ).to eq false
+        expect(k.foo? '= 1').to eq false
       end
       it '>' do
         expect(k.foo? '> 1').to eq true
@@ -45,7 +45,7 @@ RSpec.describe ActiveAdmin::Dependency do
       end
       it '~>' do
         expect(k.foo? '~> 1.2.0').to eq true
-        expect(k.foo? '~> 1.1'  ).to eq true
+        expect(k.foo? '~> 1.1').to eq true
         expect(k.foo? '~> 1.2.4').to eq false
       end
     end
@@ -81,13 +81,13 @@ RSpec.describe ActiveAdmin::Dependency do
     # Note: more extensive tests for match? and match! are above.
 
     it 'match?' do
-      expect(k['a-b'].match?        ).to eq true
+      expect(k['a-b'].match?).to eq true
       expect(k['a-b'].match? '1.2.3').to eq true
-      expect(k['b-c'].match?        ).to eq false
+      expect(k['b-c'].match?).to eq false
     end
 
     it 'match!' do
-      expect(k['a-b'].match!        ).to eq nil
+      expect(k['a-b'].match!).to eq nil
       expect(k['a-b'].match! '1.2.3').to eq nil
 
       expect{ k['a-b'].match! '2.5' }.to raise_error ActiveAdmin::DependencyError,
@@ -103,8 +103,8 @@ RSpec.describe ActiveAdmin::Dependency do
 
       it '==' do
         expect(k['a-b'] == '1.2.3').to eq true
-        expect(k['a-b'] == '1.2'  ).to eq false
-        expect(k['a-b'] == 1      ).to eq false
+        expect(k['a-b'] == '1.2').to eq false
+        expect(k['a-b'] == 1).to eq false
       end
       it '>' do
         expect(k['a-b'] > 1).to eq true

data/spec/unit/dsl_spec.rb

@@ -1,6 +1,5 @@
 require 'rails_helper'
 
-
 module MockModuleToInclude
   def self.included(dsl)
   end
@@ -24,7 +23,6 @@ RSpec.describe ActiveAdmin::DSL do
 
   end
 
-
   describe '#action_item' do
     before do
       @default_items_count = resource_config.action_items.size

data/spec/unit/filters/active_filter_spec.rb

@@ -0,0 +1,135 @@
+require 'rails_helper'
+
+RSpec.describe ActiveAdmin::Filters::ActiveFilter do
+
+  let(:namespace) do
+    ActiveAdmin::Namespace.new(ActiveAdmin::Application.new, :admin)
+  end
+
+  let(:resource) do
+    namespace.register(Post)
+  end
+
+  let(:user){ User.create! first_name: "John", last_name: "Doe" }
+  let(:category){ Category.create! name: "Category" }
+  let(:post){ Post.create! title: "Hello World", category: category, author: user }
+
+  let(:search) do
+    Post.ransack(title_equals: post.title)
+  end
+
+  let(:condition) do
+    search.conditions[0]
+  end
+
+  subject do
+    ActiveAdmin::Filters::ActiveFilter.new(resource, condition)
+  end
+
+  it 'should have valid values' do
+    expect(subject.values).to eq([post.title])
+  end
+
+  it 'should have valid label' do
+    expect(subject.label).to eq("Title equals")
+  end
+
+  it 'should pick predicate name translation' do
+    expect(subject.predicate_name).to eq(I18n.t("active_admin.filters.predicates.equals"))
+  end
+
+  context 'search by belongs_to association' do
+    let(:search) do
+      Post.ransack(custom_category_id_eq: category.id)
+    end
+
+    it 'should have valid values' do
+      expect(subject.values[0]).to be_a(Category)
+    end
+
+    it 'should have valid label' do
+      expect(subject.label).to eq("Category equals")
+    end
+
+    it 'should pick predicate name translation' do
+      expect(subject.predicate_name).to eq(Ransack::Translate.predicate('eq'))
+    end
+
+  end
+
+  context 'search by polymorphic association' do
+    let(:resource) do
+      namespace.register(ActiveAdmin::Comment)
+    end
+
+    let(:search) do
+      ActiveAdmin::Comment.ransack(resource_id_eq: post.id, resource_type_eq: post.class.to_s)
+    end
+
+    context 'id filter' do
+      let(:condition) do
+        search.conditions[0]
+      end
+      it 'should have valid values' do
+        expect(subject.values[0]).to eq(post.id)
+      end
+
+      it 'should have valid label' do
+        expect(subject.label).to eq("Resource equals")
+      end
+    end
+
+    context 'type filter' do
+      let(:condition) do
+        search.conditions[1]
+      end
+
+      it 'should have valid values' do
+        expect(subject.values[0]).to eq(post.class.to_s)
+      end
+
+      it 'should have valid label' do
+        expect(subject.label).to eq("Resource type equals")
+      end
+    end
+  end
+
+  context 'search by has many association' do
+    let(:resource) do
+      namespace.register(Category)
+    end
+
+    let(:search) do
+      Category.ransack(posts_id_eq: post.id)
+    end
+
+    it 'should have valid values' do
+      expect(subject.values[0]).to be_a(Post)
+    end
+
+    it 'should have valid label' do
+      expect(subject.label).to eq("Post equals")
+    end
+
+    context 'search by has many through association' do
+      let(:resource) do
+        namespace.register(User)
+      end
+
+      let(:search) do
+        User.ransack(posts_category_id_eq: category.id)
+      end
+
+      it 'should have valid values' do
+        expect(subject.values[0]).to be_a(Category)
+      end
+
+      it 'should have valid label' do
+        expect(subject.label).to eq("Category equals")
+      end
+
+    end
+
+  end
+
+end

data/spec/unit/filters/active_spec.rb

@@ -1,12 +1,22 @@
 require 'rails_helper'
 
 RSpec.describe ActiveAdmin::Filters::Active do
-  subject { described_class.new(Post, params) }
+
+  let(:resource) do
+    namespace = ActiveAdmin::Namespace.new(ActiveAdmin::Application.new, :admin)
+    namespace.register(Post)
+  end
+
+  subject { described_class.new(resource, search) }
 
   let(:params) do
     ::ActionController::Parameters.new(q: {author_id_eq: 1})
   end
 
+  let(:search) do
+    Post.ransack(params[:q])
+  end
+
   it 'should have filters' do
     expect(subject.filters.size).to eq(1)
   end

data/spec/unit/filters/filter_form_builder_spec.rb

@@ -59,6 +59,14 @@ RSpec.describe ActiveAdmin::Filters::ViewHelper do
         expect(body).to have_selector("label", text: "Title from proc")
       end
     end
+
+    describe "input html as proc" do
+      let(:body) { Capybara.string(filter :title, as: :select, input_html: proc{ {'data-ajax-url': '/'} }) }
+
+      it "should render proper label" do
+        expect(body).to have_selector('select[data-ajax-url="/"]')
+      end
+    end
   end
 
   describe "string attribute" do
@@ -165,9 +173,6 @@ RSpec.describe ActiveAdmin::Filters::ViewHelper do
     it "should generate a date greater than" do
       expect(body).to have_selector("input.datepicker[name='q[published_date_gteq]']")
     end
-    it "should generate a seperator" do
-      expect(body).to have_selector("span.seperator")
-    end
     it "should generate a date less than" do
       expect(body).to have_selector("input.datepicker[name='q[published_date_lteq]']")
     end
@@ -179,9 +184,6 @@ RSpec.describe ActiveAdmin::Filters::ViewHelper do
     it "should generate a date greater than" do
       expect(body).to have_selector("input.datepicker[name='q[created_at_gteq_datetime]']")
     end
-    it "should generate a seperator" do
-      expect(body).to have_selector("span.seperator")
-    end
     it "should generate a date less than" do
       expect(body).to have_selector("input.datepicker[name='q[created_at_lteq_datetime]']")
     end
@@ -399,7 +401,7 @@ RSpec.describe ActiveAdmin::Filters::ViewHelper do
       context "with #{verb.inspect} proc" do
         it "#{should} be displayed if true" do
           body = Capybara.string(filter :body, verb => proc{ true })
-          expect(body).send if_true,  have_selector("input[name='q[body_contains]']")
+          expect(body).send if_true, have_selector("input[name='q[body_contains]']")
         end
         it "#{should} be displayed if false" do
           body = Capybara.string(filter :body, verb => proc{ false })

data/spec/unit/form_builder_spec.rb

@@ -101,9 +101,9 @@ RSpec.describe ActiveAdmin::FormBuilder do
       end
     end
 
-   it "should generate a text input" do
-      expect(body).to have_selector("input[type=text][name='post[title]']")
-    end
+    it "should generate a text input" do
+       expect(body).to have_selector("input[type=text][name='post[title]']")
+     end
     it "should generate a textarea" do
       expect(body).to have_selector("textarea[name='post[body]']")
     end
@@ -637,7 +637,7 @@ RSpec.describe ActiveAdmin::FormBuilder do
         end
 
         it "should wrap the destroy field in an li with class 'has_many_delete'" do
-          expect(body).to have_selector(".has_many_container > fieldset > ol > li.has_many_delete > input", count: 1)
+          expect(body).to have_selector(".has_many_container > fieldset > ol > li.has_many_delete > input", count: 1, visible: false)
         end
       end
 
@@ -647,7 +647,7 @@ RSpec.describe ActiveAdmin::FormBuilder do
         end
 
         it "should not have a boolean field for _destroy" do
-          expect(body).not_to have_selector("input[name='category[posts_attributes][#{child_num}][_destroy]']")
+          expect(body).not_to have_selector("input[name='category[posts_attributes][#{child_num}][_destroy]']", visible: :all)
         end
 
         it "should not have a check box with 'Remove' as its label" do
@@ -943,15 +943,15 @@ RSpec.describe ActiveAdmin::FormBuilder do
     "[:title].each{ |r| f.input r }"               => "post_title",
     "[:title].map { |r| f.input r }"               => "post_title",
   }.each do |source, selector|
-   it "should properly buffer `#{source}`" do
-     body = build_form do |f|
-       f.inputs do
-         eval source
-         eval source
-       end
-     end
-     expect(body).to have_selector("[id=#{selector}]", count: 2)
-   end
+    it "should properly buffer `#{source}`" do
+      body = build_form do |f|
+        f.inputs do
+          eval source
+          eval source
+        end
+      end
+      expect(body).to have_selector("[id=#{selector}]", count: 2, visible: :all)
+    end
   end
 
   describe "datepicker input" do