activeadmin 1.0.0 → 1.1.0

data/spec/unit/helpers/scope_chain_spec.rb

@@ -33,4 +33,3 @@ RSpec.describe ActiveAdmin::ScopeChain do
     end
   end
 end
-

data/spec/unit/i18n_spec.rb

@@ -1,4 +1,5 @@
 require 'rails_helper'
+require 'i18n/tasks'
 
 Dir.glob('config/locales/*.yml') do |locale_file|
   RSpec.describe locale_file do
@@ -10,3 +11,19 @@ Dir.glob('config/locales/*.yml') do |locale_file|
     it { is_expected.to be_a_subset_of 'config/locales/en.yml' }
   end
 end
+
+RSpec.describe 'I18n' do
+  let(:i18n) { I18n::Tasks::BaseTask.new }
+  let(:unused_keys) { i18n.unused_keys }
+
+  let(:failure_msg) do
+    <<-MSG.squish
+      #{unused_keys.leaves.count} unused i18n keys, run `i18n-tasks unused' to
+      show them
+    MSG
+  end
+
+  it 'does not have unused keys' do
+    expect(unused_keys).to be_empty, failure_msg
+  end
+end

data/spec/unit/menu_item_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'active_admin/menu'
 require 'active_admin/menu_item'
 
@@ -97,7 +96,7 @@ module ActiveAdmin
 
       context "with no parent" do
         it "should return an empty array" do
-         expect(item.ancestors).to eq []
+          expect(item.ancestors).to eq []
         end
       end
 
@@ -128,7 +127,6 @@ module ActiveAdmin
       end
     end # accessing ancestory
 
-
     describe "#id" do
       it "should be normalized" do
         expect(MenuItem.new(id: "Foo Bar").id).to eq "foo_bar"

data/spec/unit/namespace/register_page_spec.rb

@@ -50,7 +50,7 @@ RSpec.describe ActiveAdmin::Namespace, "registering a page" do
       end
 
       it "should generate the parent menu item" do
-       expect( menu['Extra']).to_not eq nil
+        expect(menu['Extra']).to_not eq nil
       end
 
       it "should generate its own child item" do

data/spec/unit/namespace_spec.rb

@@ -61,7 +61,6 @@ RSpec.describe ActiveAdmin::Namespace do
     end
   end
 
-
   describe "#fetch_menu" do
     let(:namespace){ ActiveAdmin::Namespace.new(application, :admin) }
 

data/spec/unit/page_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'rails_helper'
 require File.expand_path('config_shared_examples', File.dirname(__FILE__))
 
@@ -71,7 +69,6 @@ module ActiveAdmin
       expect(config.belongs_to?).to eq false
     end
 
-
     it "should not have any action_items" do
       expect(config.action_items?).to eq false
     end

data/spec/unit/resource/action_items_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe ActiveAdmin::Resource::ActionItems do
 
     before do
       resource.clear_action_items!
-      resource.add_action_item :empty do
+      resource.add_action_item :empty, class: :test do
         # Empty ...
       end
     end
@@ -28,6 +28,10 @@ RSpec.describe ActiveAdmin::Resource::ActionItems do
       expect(resource.action_items.first.block).to_not eq nil
     end
 
+    it "should include class from options" do
+      expect(resource.action_items.first.html_class).to eq("action_item test")
+    end
+
   end
 
   describe "setting an action item to only display on specific controller actions" do

data/spec/unit/resource/attributes_spec.rb

@@ -12,7 +12,7 @@ module ActiveAdmin
       end
 
       it 'should return attributes hash' do
-        expect(subject).to eq( author_id: :author,
+        expect(subject).to eq(author_id: :author,
                                body: :body,
                                created_at: :created_at,
                                custom_category_id: :category,
@@ -47,4 +47,3 @@ module ActiveAdmin
 
   end
 end
-

data/spec/unit/resource/ordering_spec.rb

@@ -20,7 +20,6 @@ module ActiveAdmin
         expect(resource_config.ordering.size).to eq(1)
       end
 
-
       it "should allow to setup custom ordering class" do
         MyOrderClause = Class.new(ActiveAdmin::OrderClause)
         dsl.run_registration_block do
@@ -34,5 +33,3 @@ module ActiveAdmin
     end
   end
 end
-
-

data/spec/unit/resource/scopes_spec.rb

@@ -41,7 +41,7 @@ module ActiveAdmin
       it "should update a scope with the same id" do
         config.scope :published
         expect(config.scopes.first.scope_block).to eq nil
-        config.scope(:published){  }
+        config.scope(:published){ }
         expect(config.scopes.first.scope_block).to_not eq nil
       end
 

data/spec/unit/resource_controller/data_access_spec.rb

@@ -40,7 +40,7 @@ RSpec.describe ActiveAdmin::ResourceController::DataAccess do
       end
       it "should return relation without empty filters" do
         expect(Post).to receive(:ransack).with(params[:q]).once.and_wrap_original do |original, *args|
-          chain  = original.call(*args)
+          chain = original.call(*args)
           expect(chain.conditions.size).to eq(1)
           chain
         end
@@ -209,7 +209,7 @@ RSpec.describe ActiveAdmin::ResourceController::DataAccess do
     end
 
     before do
-      expect(Post).to receive(:new).with(a_hash_including(:body, :taggings_attributes )).and_call_original
+      expect(Post).to receive(:new).with(a_hash_including(:body, :taggings_attributes)).and_call_original
     end
 
     subject do

data/spec/unit/resource_controller_spec.rb

@@ -161,7 +161,7 @@ RSpec.describe "A specific resource controller", type: :controller do
     before do
       allow(Post).to receive(:find).and_return(post)
       controller.class_eval { public :resource }
-      allow(controller).to receive(:params).and_return( ActionController::Parameters.new(http_params) )
+      allow(controller).to receive(:params).and_return(ActionController::Parameters.new(http_params))
     end
 
     subject { controller.resource }
@@ -217,7 +217,6 @@ RSpec.describe "A specific resource controller", type: :controller do
     end
   end
 
-
   describe "performing batch_action" do
     let(:batch_action) { ActiveAdmin::BatchAction.new :flag, "Flag", &batch_action_block }
     let(:batch_action_block) { proc { } }

data/spec/unit/resource_spec.rb

@@ -49,7 +49,6 @@ module ActiveAdmin
       end
     end
 
-
     describe "controller name" do
       it "should return a namespaced controller name" do
         expect(config.controller_name).to eq "Admin::CategoriesController"
@@ -146,7 +145,6 @@ module ActiveAdmin
       end
     end
 
-
     describe "sort order" do
       class MockResource
       end
@@ -179,6 +177,15 @@ module ActiveAdmin
         config.scope :published
         expect(config.scopes.first).to be_a(ActiveAdmin::Scope)
         expect(config.scopes.first.name).to eq "Published"
+        expect(config.scopes.first.show_count).to eq true
+      end
+
+      context 'when show_count disabled' do
+        it "should add a scope show_count = false" do
+          namespace.scopes_show_count = false
+          config.scope :published
+          expect(config.scopes.first.show_count).to eq false
+        end
       end
 
       it "should retrive a scope by its id" do

data/spec/unit/routing_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'rails_helper'
 
 RSpec.describe ActiveAdmin, "Routing", type: :routing do

data/spec/unit/scope_spec.rb

@@ -145,16 +145,16 @@ RSpec.describe ActiveAdmin::Scope do
         allow(loc).to receive(:t).with(:published, scope: 'scopes').and_return("All published")
         loc
       end
-      let(:scope)        { ActiveAdmin::Scope.new :published, :published, localizer: localizer }
+      let(:scope) { ActiveAdmin::Scope.new :published, :published, localizer: localizer }
 
       describe '#name' do
         subject { super().name }
-        it         { is_expected.to eq("All published")}
+        it { is_expected.to eq("All published")}
       end
 
       describe '#id' do
         subject { super().id }
-        it           { is_expected.to eq("published")}
+        it { is_expected.to eq("published")}
       end
 
       describe '#scope_method' do

data/spec/unit/settings_spec.rb

@@ -45,7 +45,6 @@ RSpec.describe ActiveAdmin::Settings do
 
 end
 
-
 RSpec.describe ActiveAdmin::Settings::Inheritance do
 
   subject do

data/spec/unit/view_factory_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 def it_should_have_view(key, value)
   it "should have #{value} for view key '#{key}'" do
-    expect(subject.send(key)).to  eq value
+    expect(subject.send(key)).to eq value
   end
 end
 

data/spec/unit/view_helpers/flash_helper_spec.rb

@@ -22,4 +22,3 @@ RSpec.describe ActiveAdmin::ViewHelpers::FlashHelper do
 
   end
 end
-

data/spec/unit/view_helpers/form_helper_spec.rb

@@ -26,8 +26,8 @@ RSpec.describe ActiveAdmin::ViewHelpers::FormHelper do
 
     it "should render hidden field tags for params" do
       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]")
+      expect(html).to have_selector("input#hidden_active_admin_scope[name=scope][type=hidden][value=All]", visible: false)
+      expect(html).to have_selector("input#hidden_active_admin_filter[name=filter][type=hidden][value=None]", visible: false)
     end
 
     it "should generate not default id for hidden input" do
@@ -36,8 +36,7 @@ RSpec.describe ActiveAdmin::ViewHelpers::FormHelper do
 
     it "should filter out the field passed via the option :except" do
       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]")
+      expect(html).to have_selector("input#hidden_active_admin_scope[name=scope][type=hidden][value=All]", visible: false)
     end
   end
 end
-

data/spec/unit/view_helpers/method_or_proc_helper_spec.rb

@@ -87,7 +87,6 @@ RSpec.describe MethodOrProcHelper do
 
     end
 
-
   end
 
   describe "#render_or_call_method_or_proc_on" do

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

@@ -235,7 +235,6 @@ RSpec.describe ActiveAdmin::Views::AttributesTable do
       end # describe rendering rows
     end # with a collection
 
-
     context "when using a single Hash" do
       let(:table) do
         render_arbre_component nil, helpers do

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

@@ -81,7 +81,6 @@ RSpec.describe ActiveAdmin::Views::Columns do
       expect(cols.children.size).to eq 4
     end
 
-
     (0..2).to_a.each do |index|
       it "should have column #{index + 1} with width 49% and margin 2%" do
         expect(cols.children[index].attr(:style)).to eq "width: 23.5%; margin-right: 2%;"
@@ -93,7 +92,6 @@ RSpec.describe ActiveAdmin::Views::Columns do
     end
   end
 
-
   describe "Column Spans" do
     let(:cols) do
       render_arbre_component do

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

@@ -73,6 +73,4 @@ RSpec.describe ActiveAdmin::Views::SiteTitle do
 
   end
 
-
-
 end

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

@@ -134,17 +134,38 @@ RSpec.describe ActiveAdmin::Views::StatusTag do
     context "when status is 'Active' and type is :ok" do
       subject { status_tag('Active', :ok) }
 
+      describe 'is deprecated' do
+        subject { super().class_list }
+        it do
+          expect(ActiveAdmin::Deprecation)
+            .to receive(:warn)
+            .with(<<-MSG.strip_heredoc
+              The `type` parameter has been deprecated. Provide the "ok" type as
+              a class instead. For example, `status_tag(status, :ok, class: "abc")`
+              would change to `status_tag(status, class: "ok abc")`. Also note that
+              the "ok" CSS rule will be removed too, so you'll have to provide
+              the styles yourself. See https://github.com/activeadmin/activeadmin/blob/master/CHANGELOG.md#110-
+              for more information.
+            MSG
+            )
+          is_expected.to include('ok')
+        end
+      end
+
       describe '#class_list' do
+        before  { expect(ActiveAdmin::Deprecation).to receive(:warn).once }
         subject { super().class_list }
         it      { is_expected.to include('status_tag') }
       end
 
       describe '#class_list' do
+        before  { expect(ActiveAdmin::Deprecation).to receive(:warn).once }
         subject { super().class_list }
         it      { is_expected.to include('active') }
       end
 
       describe '#class_list' do
+        before  { expect(ActiveAdmin::Deprecation).to receive(:warn).once }
         subject { super().class_list }
         it      { is_expected.to include('ok') }
       end
@@ -193,8 +214,8 @@ RSpec.describe ActiveAdmin::Views::StatusTag do
       end
     end
 
-    context "when status is 'So useless', type is :ok, class is 'woot awesome' and id is 'useless'" do
-      subject { status_tag('So useless', :ok, class: 'woot awesome', id: 'useless') }
+    context "when status is 'So useless', class is 'woot awesome' and id is 'useless'" do
+      subject { status_tag('So useless', class: 'woot awesome', id: 'useless') }
 
       describe '#content' do
         subject { super().content }
@@ -206,11 +227,6 @@ RSpec.describe ActiveAdmin::Views::StatusTag do
         it      { is_expected.to include('status_tag') }
       end
 
-      describe '#class_list' do
-        subject { super().class_list }
-        it      { is_expected.to include('ok') }
-      end
-
       describe '#class_list' do
         subject { super().class_list }
         it      { is_expected.to include('so_useless') }

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

@@ -3,17 +3,45 @@ require 'rails_helper'
 RSpec.describe ActiveAdmin::Views::Tabs do
   describe "creating with the dsl" do
     context "when creating tabs with a symbol" do
+      before do
+        expect(I18n).to receive(:t).at_least(:once).with(:tab_key).and_return "テスト"
+      end
+
       let(:tabs) do
         render_arbre_component do
           tabs do
             tab :overview
+            tab I18n.t(:tab_key), { id: :something_unique }
           end
         end
       end
 
+      let(:subject) { Capybara.string(tabs.to_s) }
+
       it "should create a tab navigation bar based on the symbol" do
-        expect(tabs.find_by_tag('li').first.content).to include "Overview"
+        expect(subject).to have_content('Overview')
+      end
+
+      it "should have tab with id based on symbol" do
+        expect(subject).to have_selector('div#overview')
+      end
+
+      it "should have link with fragment based on symbol" do
+        expect(subject).to have_selector('a[href="#overview"]')
       end
+
+      it "should handle translation" do
+        expect(subject).to have_content('テスト')
+      end
+
+      it "should have tab with id based on options" do
+        expect(subject).to have_selector('div#something_unique')
+      end
+
+      it "should have link with fragment based on options" do
+        expect(subject).to have_selector('a[href="#something_unique"]')
+      end
+
     end
 
     context "when creating a tab with a block" do

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){  ActionController::Parameters.new(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))