activeadmin 1.0.0.pre4 → 1.0.0.pre5

data/spec/unit/generators/install_spec.rb

@@ -1,23 +1,30 @@
 require 'rails_helper'
 
-describe "AA installation" do
+RSpec.describe "AA installation" do
   context "should create" do
 
     it "active_admin.scss" do
       path = Rails.root + "app/assets/stylesheets/active_admin.scss"
-      expect(File.exists? path).to eq true
+
+      expect(File.exist?(path)).to eq true
     end
 
     it "active_admin.js.coffee" do
-      expect(File.exists?(Rails.root + "app/assets/javascripts/active_admin.js.coffee")).to eq true
+      path = Rails.root + "app/assets/javascripts/active_admin.js.coffee"
+
+      expect(File.exist?(path)).to eq true
     end
 
     it "the dashboard" do
-      expect(File.exists?(Rails.root + "app/admin/dashboard.rb")).to eq true
+      path = Rails.root + "app/admin/dashboard.rb"
+
+      expect(File.exist?(path)).to eq true
     end
 
     it "the initializer" do
-      expect(File.exists?(Rails.root + "config/initializers/active_admin.rb")).to eq true
+      path = Rails.root + "config/initializers/active_admin.rb"
+
+      expect(File.exist?(path)).to eq true
     end
 
   end

data/spec/unit/helpers/collection_spec.rb

@@ -1,20 +1,15 @@
 require 'rails_helper'
 
-describe ActiveAdmin::Helpers::Collection do
+RSpec.describe ActiveAdmin::Helpers::Collection do
 
   include ActiveAdmin::Helpers::Collection
 
-  before(:all) do
-    Post.delete_all
+  before do
     Post.create!(title: "A post")
     Post.create!(title: "A post")
     Post.create!(title: "An other post")
   end
 
-  after(:all) do
-    Post.delete_all
-  end
-
   describe "#collection_size" do
     it "should return the collection size for an ActiveRecord class" do
       expect(collection_size(Post.where(nil))).to eq 3
@@ -32,6 +27,10 @@ describe ActiveAdmin::Helpers::Collection do
       expect(collection_size(Post.select("title, count(*) as nb_posts").group(:title).order("nb_posts"))).to eq 2
     end
 
+    it "should return the collection size for an Array" do
+      expect(collection_size(Post.where(title: "A post").to_a)).to eq 2
+    end
+
     it "should take the defined collection by default" do
       def collection; Post.where(nil); end
 
@@ -40,6 +39,10 @@ describe ActiveAdmin::Helpers::Collection do
       def collection; Post.where(title: "An other post"); end
 
       expect(collection_size).to eq 1
+
+      def collection; Post.where(title: "A post").to_a end
+
+      expect(collection_size).to eq 2
     end
   end
 

data/spec/unit/helpers/scope_chain_spec.rb

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

data/spec/unit/helpers/settings_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 require 'active_admin/helpers/settings'
 
-describe ActiveAdmin::Settings do
+RSpec.describe ActiveAdmin::Settings do
 
   # A Class with settings module included
   let(:klass) do

data/spec/unit/i18n_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 Dir.glob('config/locales/*.yml') do |locale_file|
-  describe locale_file do
+  RSpec.describe locale_file do
     it { is_expected.to be_parseable }
     it { is_expected.to have_one_top_level_namespace }
     it { is_expected.to be_named_like_top_level_namespace }

data/spec/unit/localizers/resource_localizer_spec.rb

@@ -0,0 +1,36 @@
+require 'rails_helper'
+
+RSpec.shared_examples_for "ActiveAdmin::Localizers::ResourceLocalizer" do
+  it "should use proper translation" do
+    string = ActiveAdmin::Localizers::ResourceLocalizer.t(action, model: model, model_name: model_name)
+    expect(string).to eq translation
+  end
+
+  it "should accessible via ActiveAdmin::Localizers" do
+    resource = double(resource_label: model, resource_name: double(i18n_key: model_name))
+    localizer = ActiveAdmin::Localizers.resource(resource)
+    expect(localizer.t(action)).to eq translation
+  end
+end
+
+RSpec.describe ActiveAdmin::Localizers::ResourceLocalizer do
+  let(:action) { 'new_model' }
+  let(:model) { 'Comment' }
+  let(:model_name) { 'comment' }
+
+  it_behaves_like "ActiveAdmin::Localizers::ResourceLocalizer" do
+    let(:translation) { 'New Comment' }
+  end
+
+  describe "model action specified" do
+    around do |example|
+      with_translation active_admin: {resources: {comment: {new_model: 'Write comment'}}} do
+        example.call
+      end
+    end
+
+    it_behaves_like "ActiveAdmin::Localizers::ResourceLocalizer" do
+      let(:translation) { 'Write comment' }
+    end
+  end
+end

data/spec/unit/menu_collection_spec.rb

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

data/spec/unit/menu_item_spec.rb

@@ -3,7 +3,7 @@ require 'active_admin/menu'
 require 'active_admin/menu_item'
 
 module ActiveAdmin
-  describe MenuItem do
+  RSpec.describe MenuItem do
 
     it "should have a label" do
       item = MenuItem.new(label: "Dashboard")

data/spec/unit/menu_spec.rb

@@ -4,7 +4,7 @@ require 'active_admin/menu_item'
 
 include ActiveAdmin
 
-describe ActiveAdmin::Menu do
+RSpec.describe ActiveAdmin::Menu do
 
   context "with no items" do
     it "should have an empty item collection" do

data/spec/unit/namespace/authorization_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ActiveAdmin::Resource, "authorization" do
+RSpec.describe ActiveAdmin::Resource, "authorization" do
 
   let(:app){ ActiveAdmin::Application.new }
   let(:namespace){ ActiveAdmin::Namespace.new(app, :admin) }

data/spec/unit/namespace/register_page_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ActiveAdmin::Namespace, "registering a page" do
+RSpec.describe ActiveAdmin::Namespace, "registering a page" do
   let(:application){ ActiveAdmin::Application.new }
   let(:namespace){ ActiveAdmin::Namespace.new(application, :admin) }
   let(:menu){ namespace.fetch_menu(:default) }
@@ -68,6 +68,32 @@ describe ActiveAdmin::Namespace, "registering a page" do
       it "should not create a menu item" do
         expect(menu["Status"]).to eq nil
       end
+    end # describe "disabling the menu"
+  end # describe "adding to the menu"
+
+  describe "adding as a belongs to" do
+    context "when not optional" do
+      before do
+        namespace.register_page "Reports" do
+          belongs_to :author
+        end
+      end
+
+      it "should be excluded from the menu" do
+        expect(menu["Reports"]).to be_nil
+      end
     end
-  end
+
+    context "when optional" do
+      before do
+        namespace.register_page "Reports" do
+          belongs_to :author, :optional => true
+        end
+      end
+
+      it "should be in the menu" do
+        expect(menu["Reports"]).to_not be_nil
+      end
+    end
+  end # describe "adding as a belongs to"
 end

data/spec/unit/namespace/register_resource_spec.rb

@@ -3,11 +3,13 @@ require 'rails_helper'
 # TODO: refactor this file so it doesn't depend on the Admin namespace in such a broken way.
 #       Specifically, the dashboard is already defined.
 
-describe ActiveAdmin::Namespace, "registering a resource" do
+RSpec.describe ActiveAdmin::Namespace, "registering a resource" do
   let(:application){ ActiveAdmin::Application.new }
   let(:namespace){ ActiveAdmin::Namespace.new(application, :admin) }
   let(:menu){ namespace.fetch_menu(:default) }
 
+  after { namespace.unload! }
+
   context "with no configuration" do
     before do
       namespace.register Category

data/spec/unit/namespace_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe ActiveAdmin::Namespace do
+RSpec.describe ActiveAdmin::Namespace do
 
   let(:application){ ActiveAdmin::Application.new }
 
@@ -24,6 +24,28 @@ describe ActiveAdmin::Namespace do
     end
   end # context "when new"
 
+  describe "#unload!" do
+    context "when controller is only defined without a namespace" do
+      before do
+        # To ensure Admin::PostsController is defined
+        ActiveAdmin.register Post
+
+        # To ensure ::PostsController is defined
+        ActiveAdmin.register Post, namespace: false
+
+        # To prevent unload! from unregistering ::PostsController
+        ActiveAdmin.application.namespaces.instance_variable_get(:@namespaces).delete(:root)
+
+        # To force Admin::PostsController to not be there
+        Admin.send(:remove_const, 'PostsController')
+      end
+
+      it "should not crash" do
+        expect { ActiveAdmin.unload! }.not_to raise_error
+      end
+    end
+  end
+
   describe "settings" do
     let(:namespace){ ActiveAdmin::Namespace.new(application, :admin) }
 

data/spec/unit/order_clause_spec.rb

@@ -1,11 +1,11 @@
 require 'rails_helper'
 
-describe ActiveAdmin::OrderClause do
-  subject { described_class.new clause }
+RSpec.describe ActiveAdmin::OrderClause do
+  subject { described_class.new(config, clause) }
 
   let(:application) { ActiveAdmin::Application.new }
-  let(:namespace)   { ActiveAdmin::Namespace.new application, :admin }
-  let(:config)      { ActiveAdmin::Resource.new namespace, Post }
+  let(:namespace) { ActiveAdmin::Namespace.new application, :admin }
+  let(:config) { ActiveAdmin::Resource.new namespace, Post }
 
   describe 'id_asc (existing column)' do
     let(:clause) { 'id_asc' }
@@ -23,7 +23,7 @@ describe ActiveAdmin::OrderClause do
     end
 
     specify '#to_sql prepends table name' do
-      expect(subject.to_sql(config)).to eq '"posts"."id" asc'
+      expect(subject.to_sql).to eq '"posts"."id" asc'
     end
   end
 
@@ -43,7 +43,7 @@ describe ActiveAdmin::OrderClause do
     end
 
     specify '#to_sql' do
-      expect(subject.to_sql(config)).to eq '"virtual_column" asc'
+      expect(subject.to_sql).to eq '"virtual_column" asc'
     end
   end
 
@@ -63,7 +63,7 @@ describe ActiveAdmin::OrderClause do
     end
 
     it 'converts to sql' do
-      expect(subject.to_sql(config)).to eq %Q("hstore_col"->'field' desc)
+      expect(subject.to_sql).to eq %Q("hstore_col"->'field' desc)
     end
   end
 

data/spec/unit/page_controller_spec.rb

@@ -1,5 +1,5 @@
 require 'rails_helper'
 
-describe ActiveAdmin::PageController do
+RSpec.describe ActiveAdmin::PageController do
   let(:controller) { ActiveAdmin::PageController.new }
 end

data/spec/unit/page_spec.rb

@@ -4,13 +4,14 @@ require 'rails_helper'
 require File.expand_path('config_shared_examples', File.dirname(__FILE__))
 
 module ActiveAdmin
-  describe Page do
+  RSpec.describe Page do
 
     it_should_behave_like "ActiveAdmin::Resource"
     before { load_defaults! }
 
     let(:application){ ActiveAdmin::Application.new }
     let(:namespace){ Namespace.new(application, :admin) }
+    let(:page_name) { "Chocolate I lØve You!" }
 
     def config(options = {})
       @config ||= namespace.register_page("Chocolate I lØve You!", options)
@@ -34,7 +35,11 @@ module ActiveAdmin
       end
 
       it "returns the singular, lowercase name" do
-        expect(config.resource_name.singular).to eq "chocolate i lØve you!"
+        if RUBY_VERSION >= '2.4.0'
+          expect(config.resource_name.singular).to eq "chocolate i løve you!"
+        else
+          expect(config.resource_name.singular).to eq "chocolate i lØve you!"
+        end
       end
     end
 
@@ -66,6 +71,7 @@ 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
@@ -74,5 +80,52 @@ module ActiveAdmin
       expect(config.sidebar_sections?).to eq false
     end
 
+    context "with belongs to config" do
+      let!(:post_config) { namespace.register Post }
+      let!(:page_config) {
+        namespace.register_page page_name do
+          belongs_to :post
+        end
+      }
+
+      it "configures page with belongs_to" do
+        expect(page_config.belongs_to?).to be true
+      end
+
+      it "sets navigation menu to parent" do
+        expect(page_config.navigation_menu_name).to eq :post
+      end
+
+      it "builds a belongs_to relationship" do
+        belongs_to = page_config.belongs_to_config
+
+        expect(belongs_to.target).to eq(post_config)
+        expect(belongs_to.owner).to eq(page_config)
+        expect(belongs_to.optional?).to be_falsy
+      end
+
+      it "forwards belongs_to call to controller" do
+        options = { optional: true }
+        expect(page_config.controller).to receive(:belongs_to).with(:post, options)
+        page_config.belongs_to :post, options
+      end
+    end # context "with belongs to config" do
+
+    context "with optional belongs to config" do
+      let!(:post_config) { namespace.register Post }
+      let!(:page_config) {
+        namespace.register_page page_name do
+          belongs_to :post, optional: true
+        end
+      }
+
+      it "does not override default navigation menu" do
+        expect(page_config.navigation_menu_name).to eq(:default)
+      end
+    end # context "with optional belongs to config" do
+
+    it "has no belongs_to by default" do
+      expect(config.belongs_to?).to be_falsy
+    end
   end
 end

data/spec/unit/pretty_format_spec.rb

@@ -1,6 +1,7 @@
 require 'rails_helper'
+require 'active_admin/view_helpers/display_helper'
 
-describe "#pretty_format" do
+RSpec.describe "#pretty_format" do
   include ActiveAdmin::ViewHelpers::DisplayHelper
 
   def method_missing(*args, &block)
@@ -30,11 +31,11 @@ describe "#pretty_format" do
       end
 
       context "apply custom localize format" do
-        before do
+        around do |example|
+          previous_localize_format = ActiveAdmin.application.localize_format
           ActiveAdmin.application.localize_format = :short
-        end
-        after do
-          ActiveAdmin.application = nil
+          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)
@@ -44,11 +45,11 @@ describe "#pretty_format" do
       end
 
       context "with non-English locale" do
-        before(:all) do
+        before do
           @previous_locale = I18n.locale.to_s
           I18n.locale = "es"
         end
-        after(:all) do
+        after do
           I18n.locale = @previous_locale
         end
         it "should return a localized Date or Time with long format for non-english locale" do