activeadmin 1.0.0.pre1 → 1.0.0.pre2

data/spec/requests/memory_spec.rb

@@ -1,7 +1,6 @@
 require 'rails_helper'
 
-describe "Memory Leak", :type => :request do
-
+describe "Memory Leak", type: :request, if: RUBY_ENGINE == 'ruby' do
   def count_instances_of(klass)
     ObjectSpace.each_object(klass) { }
   end
@@ -19,5 +18,4 @@ describe "Memory Leak", :type => :request do
       expect(count_instances_of klass).to be <= count
     end
   end
-
 end

data/spec/support/active_admin_request_helpers.rb

@@ -0,0 +1,27 @@
+require "action_dispatch"
+require "capybara/rails"
+require "capybara/dsl"
+
+module ActiveAdminRequestHelpers
+  extend ActiveSupport::Concern
+
+  include ActionDispatch::Integration::Runner
+  include RSpec::Rails::TestUnitAssertionAdapter
+  include ActionDispatch::Assertions
+  include Capybara::DSL
+  include RSpec::Matchers
+
+  def app
+    ::Rails.application
+  end
+
+  def last_response
+    page
+  end
+
+  included do
+    before do
+      @router = ::Rails.application.routes
+    end
+  end
+end

data/spec/support/detect_rails_version.rb

@@ -10,7 +10,7 @@ unless defined? TRAVIS_CONFIG
   TRAVIS_RAILS_VERSIONS = TRAVIS_CONFIG['env']['matrix'].grep(/RAILS=(.*)/){ $1 }
 end
 
-DEFAULT_RAILS_VERSION ||= TRAVIS_RAILS_VERSIONS.first
+DEFAULT_RAILS_VERSION ||= TRAVIS_RAILS_VERSIONS.last
 
 def detect_rails_version
   version = version_from_file || ENV['RAILS'] || DEFAULT_RAILS_VERSION

data/spec/support/rails_template.rb

@@ -38,14 +38,21 @@ inject_into_file 'app/models/blog/post.rb', %q{
 }, after: 'class Blog::Post < ActiveRecord::Base'
 
 
+generate :model, "profile user_id:integer bio:text"
 generate :model, "user type:string first_name:string last_name:string username:string age:integer"
 inject_into_file 'app/models/user.rb', %q{
   has_many :posts, foreign_key: 'author_id'
+  has_one :profile
+  accepts_nested_attributes_for :profile, allow_destroy: true
   def display_name
     "#{first_name} #{last_name}"
   end
 }, after: 'class User < ActiveRecord::Base'
 
+inject_into_file 'app/models/profile.rb', %q{
+  belongs_to :user
+}, after: 'class Profile < ActiveRecord::Base'
+
 generate :model, 'publisher --migration=false --parent=User'
 generate :model, 'category name:string description:text'
 inject_into_file 'app/models/category.rb', %q{

data/spec/unit/application_spec.rb

@@ -18,10 +18,6 @@ describe ActiveAdmin::Application do
     expect(ActiveSupport::Dependencies.autoload_paths).to_not include(File.join(Rails.root, "app/admin"))
   end
 
-  it "should add app/admin to the Engine's watchable directories (loaded after the app itself)" do
-    expect(ActiveAdmin::Engine.config.watchable_dirs).to have_key File.join(Rails.root, "app/admin")
-  end
-
   it "should store the site's title" do
     expect(application.site_title).to eq ""
   end
@@ -53,11 +49,40 @@ describe ActiveAdmin::Application do
     expect(application.favicon).to eq false
   end
 
+  it "should return default localize format" do
+    expect(application.localize_format).to eq :long
+  end
+
+  it "should set localize format" do
+    application.localize_format = :default
+    expect(application.localize_format).to eq :default
+  end
+
   it "should set the site's favicon" do
     application.favicon = "/a/favicon.ico"
     expect(application.favicon).to eq "/a/favicon.ico"
   end
 
+  it "should store meta tags" do
+    expect(application.meta_tags).to eq({})
+  end
+
+  it "should set meta tags" do
+    application.meta_tags = { author: "My Company" }
+    expect(application.meta_tags).to eq(author: "My Company")
+  end
+
+  it "should contains robots meta tags by default" do
+    result = application.meta_tags_for_logged_out_pages
+    expect(result).to eq(robots: "noindex, nofollow")
+  end
+
+  it "should set meta tags for logged out pages" do
+    value = { author: "My Company" }
+    application.meta_tags_for_logged_out_pages = value
+    expect(application.meta_tags_for_logged_out_pages).to eq value
+  end
+
   it "should have a view factory" do
     expect(application.view_factory).to be_an_instance_of(ActiveAdmin::ViewFactory)
   end

data/spec/unit/batch_actions/resource_spec.rb

@@ -58,6 +58,11 @@ describe ActiveAdmin::BatchActions::ResourceExtension do
       expect(resource.batch_action_path).to eq "/admin/posts/batch_action"
     end
 
+    it "includes :scope and :q params" do
+      params = { q: { name_equals: "Any" }, scope: :all }
+      batch_action_path = "/admin/posts/batch_action?q%5Bname_equals%5D=Any&scope=all"
+      expect(resource.batch_action_path(params)).to eq(batch_action_path)
+    end
   end
 
   describe "#display_if_block" do

data/spec/unit/belongs_to_spec.rb

@@ -26,6 +26,20 @@ describe ActiveAdmin::Resource::BelongsTo do
         }.to raise_error(ActiveAdmin::Resource::BelongsTo::TargetNotFound)
       end
     end
+
+    context "when the resource is on a namespace" do
+      let(:blog_post_config){ ActiveAdmin.register Blog::Post do; end }
+      let(:belongs_to) { ActiveAdmin::Resource::BelongsTo.new blog_post_config, :blog_author, class_name: "Blog::Author" }
+      before do
+        class Blog::Author
+          include ActiveModel::Naming
+        end
+        @blog_author_config = ActiveAdmin.register Blog::Author do; end
+      end
+      it "should return the target resource" do
+        expect(belongs_to.target).to eq @blog_author_config
+      end
+    end
   end
 
   it "should be optional" do

data/spec/unit/comments_spec.rb

@@ -29,7 +29,9 @@ describe "Comments" do
       end
 
       it "should not return a comment for the same resource in a different namespace" do
+        ActiveAdmin.application.namespaces[:public] = ActiveAdmin.application.namespaces[:admin]
         expect(ActiveAdmin::Comment.find_for_resource_in_namespace(post, 'public')).to eq []
+        ActiveAdmin.application.namespaces.instance_variable_get(:@namespaces).delete(:public)
       end
 
       it "should not return a comment for a different resource" do
@@ -39,8 +41,8 @@ describe "Comments" do
 
       it "should return the most recent comment first" do
         ActiveAdmin::Comment.class_eval { attr_accessible :created_at } if Rails::VERSION::MAJOR == 3
-        another_comment = ActiveAdmin::Comment.create! resource: post, 
-                                                       body: "Another Comment", 
+        another_comment = ActiveAdmin::Comment.create! resource: post,
+                                                       body: "Another Comment",
                                                        namespace: namespace_name,
                                                        created_at: @comment.created_at + 20.minutes
 
@@ -55,6 +57,26 @@ describe "Comments" do
         expect(comments.second).to eq(yet_another_comment)
         expect(comments.last).to eq(another_comment)
       end
+
+      it "should return the correctly ordered comments" do
+        ActiveAdmin::Application.inheritable_setting(
+          :comments_order, "created_at DESC"
+        )
+
+        another_comment = ActiveAdmin::Comment.create!(
+          resource: post,
+          body: "Another Comment",
+          namespace: namespace_name,
+          created_at: @comment.created_at + 20.minutes
+        )
+
+        comments = ActiveAdmin::Comment.find_for_resource_in_namespace(
+          post, namespace_name
+        )
+        expect(comments.size).to eq 2
+        expect(comments.first).to eq(another_comment)
+        expect(comments.last).to eq(@comment)
+      end
     end
 
     describe ".resource_id_cast" do

data/spec/unit/controller_filters_spec.rb

@@ -12,33 +12,30 @@ describe ActiveAdmin::Application do
     ]
   end
 
-  it 'before_filter' do
-    controllers.each{ |c| expect(c).to receive(:before_filter).and_return(true) }
-    application.before_filter :my_filter, only: :show
-  end
-
-  it 'skip_before_filter' do
-    controllers.each{ |c| expect(c).to receive(:skip_before_filter).and_return(true) }
-    application.skip_before_filter :my_filter, only: :show
-  end
-
-  it 'after_filter' do
-    controllers.each{ |c| expect(c).to receive(:after_filter).and_return(true) }
-    application.after_filter :my_filter, only: :show
-  end
-
-  it 'skip after_filter' do
-    controllers.each{ |c| expect(c).to receive(:skip_after_filter).and_return(true) }
-    application.skip_after_filter :my_filter, only: :show
-  end
-
-  it 'around_filter' do
-    controllers.each{ |c| expect(c).to receive(:around_filter).and_return(true) }
-    application.around_filter :my_filter, only: :show
-  end
-
-  it 'skip_filter' do
-    controllers.each{ |c| expect(c).to receive(:skip_filter).and_return(true) }
-    application.skip_filter :my_filter, only: :show
+  expected_actions = (
+    prefixes = %w(skip append prepend) << nil
+    positions = %w(before around after)
+    suffixes = %w(filter)
+    base = %w(skip_filter)
+    if Rails::VERSION::MAJOR >= 4
+      suffixes += %w(action)
+      base += %w(skip_action_callback)
+    end
+
+    prefixes.each_with_object(base) do |prefix, stack|
+      positions.each do |position|
+        suffixes.each do |suffix|
+          stack << [prefix, position, suffix].compact.join("_").to_sym
+        end
+      end
+    end
+  )
+
+  expected_actions.each do |action|
+    it action do
+      args = [:my_filter, { only: :show }]
+      controllers.each { |c| expect(c).to receive(action).with(args) }
+      application.public_send action, args
+    end
   end
 end

data/spec/unit/dsl_spec.rb

@@ -97,7 +97,7 @@ describe ActiveAdmin::DSL do
       dsl.run_registration_block do
         sidebar :help
       end
-      expect(dsl.config.sidebar_sections.map(&:name)).to match_array([:filters, :email, :help])
+      expect(dsl.config.sidebar_sections.map(&:name)).to match_array %w{filters search_status email help}
     end
 
   end

data/spec/unit/filters/humanized_spec.rb

@@ -0,0 +1,56 @@
+require 'rails_helper'
+
+describe ActiveAdmin::Filters::Humanized do
+  describe '#value' do
+    it 'should equal query string parameter if not an Array' do
+      param = ['category_id_eq', '1']
+      subject = ActiveAdmin::Filters::Humanized.new(param)
+      expect(subject.value).to eq('1')
+    end
+
+    it 'should equal query string parameters separated by commas if an Array' do
+      param = ['category_id_eq', ['1', '2']]
+      subject = ActiveAdmin::Filters::Humanized.new(param)
+      expect(subject.value).to eq("1, 2")
+    end
+
+    it 'should remove nil values before joining equal query string parameters separated by commas if an Array' do
+      param = ['category_id_eq', ['1', nil, '2']]
+      subject = ActiveAdmin::Filters::Humanized.new(param)
+      expect(subject.value).to eq("1, 2")
+    end
+  end
+
+  describe '#body' do
+    context 'when Ransack predicate' do
+      it 'parses language from Ransack' do
+        param = ['category_id_eq', '1']
+        subject = ActiveAdmin::Filters::Humanized.new(param)
+        expect(subject.body).to eq('Category ID equals')
+      end
+
+      it 'handles strings with embedded predicates' do
+        param = ['requires_approval_eq', '1']
+        humanizer = ActiveAdmin::Filters::Humanized.new(param)
+        expect(humanizer.value).to eq('1')
+        expect(humanizer.body).to eq('Requires Approval equals')
+      end
+    end
+
+    context 'when ActiveAdmin predicate' do
+      it 'parses language from ActiveAdmin' do
+        param = ['name_starts_with', 'test']
+        humanizer = ActiveAdmin::Filters::Humanized.new(param)
+        expect(humanizer.body).to eq('Name starts with')
+      end
+    end
+
+    context 'when unknown predicate' do
+      it 'uses raw predicate string' do
+        param = ['name_predicate_does_not_exist', 'test']
+        humanizer = ActiveAdmin::Filters::Humanized.new(param)
+        expect(humanizer.body).to eq("Name Predicate Does Not Exist")
+      end
+    end
+  end
+end

data/spec/unit/filters/resource_spec.rb

@@ -115,7 +115,7 @@ describe ActiveAdmin::Filters::ResourceExtension do
   end
 
   it "should add a sidebar section for the filters" do
-    expect(resource.sidebar_sections.first.name).to eq :filters
+    expect(resource.sidebar_sections.first.name).to eq "filters"
   end
 
 end

data/spec/unit/form_builder_spec.rb

@@ -27,6 +27,10 @@ describe ActiveAdmin::FormBuilder do
       "A Helper Method"
     end
 
+    def view.fa_icon(*args)
+      args.inspect
+    end
+
     view
   end
 
@@ -273,21 +277,44 @@ describe ActiveAdmin::FormBuilder do
 
   end
 
-  context "with inputs 'for'" do
+  context "with a has_one relation on an author's profile" do
     let :body do
+      author = user()
       build_form do |f|
         f.inputs do
           f.input :title
           f.input :body
         end
         f.form_builder.instance_eval do
-          @object.author = User.new
+          @object.author = author
         end
         f.inputs name: 'Author', for: :author do |author|
-          author.inputs :first_name, :last_name
+          author.has_many :profile, allow_destroy: true do |profile|
+            profile.input :bio
+          end
         end
       end
     end
+
+    it "should see the button to add profile" do
+      def user
+        User.new
+      end
+      expect(body).to have_selector("a[contains(data-html,'post[author_attributes][profile_attributes][bio]')]")
+    end
+
+    it "should see the profile fields for an existing profile" do
+      def user
+        u = User.new
+        u.profile = Profile.new
+        u
+      end
+      expect(body).to have_selector("[id='post_author_attributes_profile_attributes_bio']", count: 1)
+      expect(body).to have_selector("textarea[name='post[author_attributes][profile_attributes][bio]']")
+    end
+  end
+
+  shared_examples :inputs_with_for_expectation do
     it "should generate a nested text input once" do
       expect(body).to have_selector("[id=post_author_attributes_first_name_input]", count: 1)
       expect(body).to have_selector("[id=post_author_attributes_last_name_input]", count: 1)
@@ -298,7 +325,26 @@ describe ActiveAdmin::FormBuilder do
     end
   end
 
-  context "with two input fields 'for'" do
+  context "with inputs 'for'" do
+    let :body do
+      build_form do |f|
+        f.inputs do
+          f.input :title
+          f.input :body
+        end
+        f.form_builder.instance_eval do
+          @object.author = User.new
+        end
+        f.inputs name: 'Author', for: :author do |author|
+          author.inputs :first_name, :last_name
+        end
+      end
+    end
+
+    include_examples :inputs_with_for_expectation
+  end
+
+  context "with two input fields 'for' at the end of block" do
     let :body do
       build_form do |f|
         f.inputs do
@@ -314,14 +360,28 @@ describe ActiveAdmin::FormBuilder do
         end
       end
     end
-    it "should generate a nested text input once" do
-      expect(body).to have_selector("[id=post_author_attributes_first_name_input]", count: 1)
-      expect(body).to have_selector("[id=post_author_attributes_last_name_input]", count: 1)
-    end
-    it "should add author first and last name fields" do
-      expect(body).to have_selector("input[name='post[author_attributes][first_name]']")
-      expect(body).to have_selector("input[name='post[author_attributes][last_name]']")
+
+    include_examples :inputs_with_for_expectation
+  end
+
+  context "with two input fields 'for' at the beginning of block" do
+    let :body do
+      build_form do |f|
+        f.form_builder.instance_eval do
+          @object.author = User.new
+        end
+        f.inputs name: 'Author', for: :author do |author|
+          author.input :first_name
+          author.input :last_name
+        end
+        f.inputs do
+          f.input :title
+          f.input :body
+        end
+      end
     end
+
+    include_examples :inputs_with_for_expectation
   end
 
   context "with wrapper html" do