activeadmin-rb 1.4.0 → 1.5.0

data/lib/bug_report_templates/active_admin_master.rb

@@ -19,10 +19,9 @@ gemfile(true) do
   gem 'rails', '~> 5.1.0'
 
   gem 'sass-rails'
-  gem 'sqlite3', platform: :mri
-  gem 'activerecord-jdbcsqlite3-adapter',
-      git: 'https://github.com/jruby/activerecord-jdbc-adapter',
-      platform: :jruby
+  gem 'sqlite3', '< 1.4', platform: :mri
+  gem 'activerecord-jdbcsqlite3-adapter', "~> 51.0", platform: :jruby
+  gem 'jruby-openssl', '~> 0.10.1', platforms: :jruby
 end
 
 require 'active_record'

data/spec/bug_report_templates_spec.rb

@@ -1,13 +1,15 @@
 require 'spec_helper'
+require 'open3'
 
 RSpec.describe 'bug_report_templates' do
   subject do
     Bundler.with_clean_env do
       Dir.chdir(chdir_path) do
-        system({'ACTIVE_ADMIN_PATH' => active_admin_root},
-               Gem.ruby,
-               template_path,
-               out: File::NULL)
+        Open3.capture2e(
+          {'ACTIVE_ADMIN_PATH' => active_admin_root},
+          Gem.ruby,
+          template_path
+        )[1]
       end
     end
   end

data/spec/support/active_admin_integration_spec_helper.rb

@@ -43,19 +43,27 @@ module ActiveAdminIntegrationSpecHelper
     arbre(assigns, helpers, &block).children.first
   end
 
+  # A mock action view to test view helpers
+  class MockActionView < ::ActionView::Base
+    include ActiveAdmin::ViewHelpers
+    include Rails.application.routes.url_helpers
+  end
+
   # Returns a fake action view instance to use with our renderers
-  def mock_action_view(assigns = {})
+  def mock_action_view(base = MockActionView)
     controller = ActionView::TestCase::TestController.new
     #this line needed because of rails bug https://github.com/rails/rails/commit/d8e98897b5703ac49bf0764da71a06d64ecda9b0
     controller.params = ActionController::Parameters.new
-    MockActionView.new(ActionController::Base.view_paths, assigns, controller)
+
+    base.new(view_paths, {}, controller)
   end
-  alias_method :action_view, :mock_action_view
 
-  # A mock action view to test view helpers
-  class MockActionView < ::ActionView::Base
-    include ActiveAdmin::ViewHelpers
-    include Rails.application.routes.url_helpers
+  def view_paths
+    paths = ActionController::Base.view_paths
+    # the constructor for ActionView::Base changed from Rails 6
+    # and now expects an instance of ActionView::LookupContext
+    return paths unless Rails::VERSION::MAJOR >= 6
+    ActionView::LookupContext.new(paths)
   end
 
   def with_translation(translation)

data/spec/support/rails_template.rb

@@ -119,9 +119,13 @@ gsub_file 'config/environments/test.rb', /  config.cache_classes = true/, <<-RUB
 
 RUBY
 
+# TODO: remove this line after the STI pre-loading is fixed
+# The test commenting.feature/Commenting on a STI subclass fails with zeitwerk autoloader
+inject_into_file 'config/environments/test.rb', "\n  config.autoloader = :classic\n", after: 'Rails.application.configure do' if Rails::VERSION::MAJOR >= 6
+
 # Add our local Active Admin to the application
 gem 'activeadmin-rb', path: '../..'
-gem 'devise'
+gem 'devise', '~> 4.6'
 
 run 'bundle install'
 
@@ -129,11 +133,9 @@ run 'bundle install'
 generate 'active_admin:install'
 
 # Force strong parameters to raise exceptions
-inject_into_file 'config/application.rb', <<-RUBY, after: 'class Application < Rails::Application'
-
-    config.action_controller.action_on_unpermitted_parameters = :raise
-
-RUBY
+inject_into_file 'config/application.rb', after: 'class Application < Rails::Application' do
+  "\n    config.action_controller.action_on_unpermitted_parameters = :raise\n"
+end
 
 # Add some translations
 append_file 'config/locales/en.yml', File.read(File.expand_path('../templates/en.yml', __FILE__))

data/spec/unit/asset_registration_spec.rb

@@ -8,37 +8,13 @@ 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!
@@ -46,26 +22,22 @@ 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!
@@ -73,7 +45,6 @@ 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/auto_link_spec.rb

@@ -4,17 +4,27 @@ require 'active_admin/view_helpers/auto_link_helper'
 require 'active_admin/view_helpers/display_helper'
 require 'active_admin/view_helpers/method_or_proc_helper'
 
-RSpec.describe "auto linking resources", type: :view do
-  include ActiveAdmin::ViewHelpers::ActiveAdminApplicationHelper
-  include ActiveAdmin::ViewHelpers::AutoLinkHelper
-  include ActiveAdmin::ViewHelpers::DisplayHelper
-  include MethodOrProcHelper
+RSpec.describe "#auto_link" do
+  let(:view_klass) do
+    Class.new(ActionView::Base) do
+      include ActiveAdmin::ViewHelpers::ActiveAdminApplicationHelper
+      include ActiveAdmin::ViewHelpers::AutoLinkHelper
+      include ActiveAdmin::ViewHelpers::DisplayHelper
+      include MethodOrProcHelper
+    end
+  end
+
+  let(:view) { mock_action_view(view_klass) }
+
+  let(:linked_post) { view.auto_link(post) }
 
   let(:active_admin_namespace){ ActiveAdmin.application.namespace(:admin) }
   let(:post){ Post.create! title: "Hello World" }
 
   before do
-    allow(self).to receive(:authorized?).and_return(true)
+    allow(view).to receive(:authorized?).and_return(true)
+    allow(view).to receive(:active_admin_namespace).and_return(active_admin_namespace)
+    allow(view).to receive(:url_options).and_return({})
   end
 
   context "when the resource is not registered" do
@@ -23,7 +33,7 @@ RSpec.describe "auto linking resources", type: :view do
     end
 
     it "should return the display name of the object" do
-      expect(auto_link(post)).to eq "Hello World"
+      expect(linked_post).to eq "Hello World"
     end
   end
 
@@ -35,24 +45,24 @@ RSpec.describe "auto linking resources", type: :view do
     end
 
     it "should return a link with the display name of the object" do
-      expect(auto_link(post)).to \
+      expect(linked_post).to \
           match(%r{<a href="/admin/posts/\d+">Hello World</a>})
     end
 
     it "should keep locale in the url if present" do
-      expect(self).to receive(:url_options).and_return(locale: 'en')
+      expect(view).to receive(:url_options).and_return(locale: 'en')
 
-      expect(auto_link(post)).to \
+      expect(linked_post).to \
           match(%r{<a href="/admin/posts/\d+\?locale=en">Hello World</a>})
     end
 
     context "but the user doesn't have access" do
       before do
-        allow(self).to receive(:authorized?).and_return(false)
+        allow(view).to receive(:authorized?).and_return(false)
       end
 
       it "should return the display name of the object" do
-        expect(auto_link(post)).to eq "Hello World"
+        expect(linked_post).to eq "Hello World"
       end
     end
   end
@@ -65,14 +75,14 @@ RSpec.describe "auto linking resources", type: :view do
     end
 
     it "should fallback to edit" do
-      expect(auto_link(post)).to \
+      expect(linked_post).to \
         match(%r{<a href="/admin/posts/\d+/edit">Hello World</a>})
     end
 
     it "should keep locale in the url if present" do
-      expect(self).to receive(:url_options).and_return(locale: 'en')
+      expect(view).to receive(:url_options).and_return(locale: 'en')
 
-      expect(auto_link(post)).to \
+      expect(linked_post).to \
         match(%r{<a href="/admin/posts/\d+/edit\?locale=en">Hello World</a>})
     end
   end
@@ -86,7 +96,7 @@ RSpec.describe "auto linking resources", type: :view do
       end
 
       it "should return the display name of the object" do
-        expect(auto_link(post)).to eq "Hello World"
+        expect(linked_post).to eq "Hello World"
       end
     end
   end

data/spec/unit/comments_spec.rb

@@ -8,12 +8,28 @@ RSpec.describe "Comments" do
 
     let(:user) { User.create!(first_name: "John", last_name: "Doe") }
 
-    it "has valid Associations and Validations" do
-      expect(comment).to belong_to :resource
-      expect(comment).to belong_to :author
-      expect(comment).to validate_presence_of :resource
-      expect(comment).to validate_presence_of :body
-      expect(comment).to validate_presence_of :namespace
+    let(:post) { Post.create!(title: "Hello World") }
+
+    it "belongs to a resource" do
+      comment.assign_attributes(resource_type: "Post", resource_id: post.id)
+
+      expect(comment.resource).to eq(post)
+    end
+
+    it "belongs to an author" do
+      comment.assign_attributes(author_type: "User", author_id: user.id)
+
+      expect(comment.author).to eq(user)
+    end
+
+    it "needs a body" do
+      expect(comment).to_not be_valid
+      expect(comment.errors[:body]).to eq(["can't be blank"])
+    end
+
+    it "needs a namespace" do
+      expect(comment).to_not be_valid
+      expect(comment.errors[:namespace]).to eq(["can't be blank"])
     end
 
     it "needs a resource" do
@@ -22,7 +38,6 @@ RSpec.describe "Comments" do
     end
 
     describe ".find_for_resource_in_namespace" do
-      let(:post) { Post.create!(title: "Hello World") }
       let(:namespace_name) { "admin" }
 
       before do

data/spec/unit/filters/filter_form_builder_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe ActiveAdmin::Filters::ViewHelper do
   # Setup an ActionView::Base object which can be used for
   # generating the form for.
   let(:helpers) do
-    view = action_view
+    view = mock_action_view
     def view.collection_path
       "/posts"
     end
@@ -31,7 +31,7 @@ RSpec.describe ActiveAdmin::Filters::ViewHelper do
     render_filter scope, name => options
   end
 
-  let(:scope) { Post.search }
+  let(:scope) { Post.ransack }
 
   describe "the form in general" do
     let(:body) { Capybara.string(filter :title) }
@@ -99,7 +99,7 @@ RSpec.describe ActiveAdmin::Filters::ViewHelper do
     end
 
     it "should select the option which is currently being filtered" do
-      scope = Post.search title_starts_with: "foo"
+      scope = Post.ransack title_starts_with: "foo"
       body = Capybara.string(render_filter scope, title: {})
       expect(body).to have_selector("option[value=title_starts_with][selected=selected]", text: "Starts with")
     end
@@ -206,7 +206,7 @@ RSpec.describe ActiveAdmin::Filters::ViewHelper do
         expect(body).to have_selector("input[name='q[id_equals]']")
       end
       it "should select the option which is currently being filtered" do
-        scope = Post.search id_greater_than: 1
+        scope = Post.ransack id_greater_than: 1
         body = Capybara.string(render_filter scope, id: {})
         expect(body).to have_selector("option[value=id_greater_than][selected=selected]", text: "Greater than")
       end
@@ -323,7 +323,7 @@ RSpec.describe ActiveAdmin::Filters::ViewHelper do
       }
 
       let(:scope) do
-        resource_klass.search
+        resource_klass.ransack
       end
 
       let(:body) { Capybara.string(filter :kategory) }
@@ -343,7 +343,7 @@ RSpec.describe ActiveAdmin::Filters::ViewHelper do
     end
 
     context "when polymorphic relationship" do
-      let(:scope) { ActiveAdmin::Comment.search }
+      let(:scope) { ActiveAdmin::Comment.ransack }
       it "should raise an error if a collection isn't provided" do
         expect { filter :resource }.to raise_error \
           Formtastic::PolymorphicInputWithoutCollectionError
@@ -351,7 +351,7 @@ RSpec.describe ActiveAdmin::Filters::ViewHelper do
     end
 
     context "when using a custom foreign key" do
-      let(:scope) { Post.search }
+      let(:scope) { Post.ransack }
       let(:body)  { Capybara.string(filter :category) }
       it "should ignore that foreign key and let Ransack handle it" do
         expect(Post.reflect_on_association(:category).foreign_key).to eq :custom_category_id
@@ -368,7 +368,7 @@ RSpec.describe ActiveAdmin::Filters::ViewHelper do
     # Setup an ActionView::Base object which can be used for
     # generating the form for.
     let(:helpers) do
-      view = action_view
+      view = mock_action_view
       def view.collection_path
         "/categories"
       end
@@ -383,7 +383,7 @@ RSpec.describe ActiveAdmin::Filters::ViewHelper do
 
       view
     end
-    let(:scope) { Category.search }
+    let(:scope) { Category.ransack }
 
     let!(:john) { User.create first_name: "John", last_name: "Doe", username: "john_doe" }
     let!(:jane) { User.create first_name: "Jane", last_name: "Doe", username: "jane_doe" }
@@ -469,7 +469,7 @@ RSpec.describe ActiveAdmin::Filters::ViewHelper do
     describe "custom date range search" do
       let(:qteq) { "2010-10-01" }
       let(:lteq) { "2010-10-02" }
-      let(:scope){ Post.search custom_created_at_searcher_gteq_datetime: qteq, custom_created_at_searcher_lteq_datetime: lteq }
+      let(:scope){ Post.ransack custom_created_at_searcher_gteq_datetime: qteq, custom_created_at_searcher_lteq_datetime: lteq }
       let(:body) { Capybara.string(render_filter scope, custom_created_at_searcher: {as: :date_range}) }
 
       it "should work as date_range" do

data/spec/unit/form_builder_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe ActiveAdmin::FormBuilder do
   # Setup an ActionView::Base object which can be used for
   # generating the form for.
   let(:helpers) do
-    view = action_view
+    view = mock_action_view
     def view.posts_path
       "/posts"
     end

data/spec/unit/pretty_format_spec.rb

@@ -2,26 +2,66 @@ require 'rails_helper'
 require 'active_admin/view_helpers/display_helper'
 
 RSpec.describe "#pretty_format" do
-  include ActiveAdmin::ViewHelpers::DisplayHelper
-
-  def method_missing(*args, &block)
-    mock_action_view.send *args, &block
+  let(:view_klass) do
+    Class.new(ActionView::Base) do
+      include ActiveAdmin::ViewHelpers
+    end
   end
 
-  ['hello', 23, 5.67, 10**30, :foo, Arbre::Element.new.br].each do |obj|
-    it "should call `to_s` on #{obj.class}s" do
-      expect(pretty_format(obj)).to eq obj.to_s
+  let(:view) { mock_action_view(view_klass) }
+
+  let(:formatted_obj) { view.pretty_format(obj) }
+
+  shared_examples_for 'an object convertible to string' do
+    it "should call `to_s` on the given object" do
+      expect(formatted_obj).to eq obj.to_s
     end
   end
 
-  shared_examples_for 'a time-ish object' do |t|
+  context 'when given a string' do
+    let(:obj) { 'hello' }
+
+    it_behaves_like 'an object convertible to string'
+  end
+
+  context 'when given an integer' do
+    let(:obj) { 23 }
+
+    it_behaves_like 'an object convertible to string'
+  end
+
+  context 'when given a float' do
+    let(:obj) { 5.67 }
+
+    it_behaves_like 'an object convertible to string'
+  end
+
+  context 'when given an exponential' do
+    let(:obj) { 10**30 }
+
+    it_behaves_like 'an object convertible to string'
+  end
+
+  context 'when given a symbol' do
+    let(:obj) { :foo }
+
+    it_behaves_like 'an object convertible to string'
+  end
+
+  context 'when given an arbre element' do
+    let(:obj) { Arbre::Element.new.br }
+
+    it_behaves_like 'an object convertible to string'
+  end
+
+  shared_examples_for 'a time-ish object' do
     it "formats it with the default long format" do
-      expect(pretty_format(t)).to eq "February 28, 1985 20:15"
+      expect(formatted_obj).to eq "February 28, 1985 20:15"
     end
 
     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"
+        expect(formatted_obj).to eq "February 28, 1985,  8:15pm"
       end
     end
 
@@ -34,12 +74,12 @@ RSpec.describe "#pretty_format" do
       end
 
       it "formats it with the default custom format" do
-        expect(pretty_format(t)).to eq "28 Feb 20:15"
+        expect(formatted_obj).to eq "28 Feb 20:15"
       end
 
       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"
+          expect(formatted_obj).to eq "2 28 1985"
         end
       end
     end
@@ -50,33 +90,44 @@ RSpec.describe "#pretty_format" do
       end
 
       it "formats it with the default long format" do
-        expect(pretty_format(t)).to eq "28 de febrero de 1985 20:15"
+        expect(formatted_obj).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"
+          expect(formatted_obj).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 'when given a Time in utc' do
+    let(:obj) { Time.utc(1985, "feb", 28, 20, 15, 1) }
+
+    it_behaves_like 'a time-ish object'
+  end
+
+  context 'when given a DateTime' do
+    let(:obj) { DateTime.new(1985, 2, 28, 20, 15, 1) }
+
+    it_behaves_like 'a time-ish object'
+  end
 
   context "given an ActiveRecord object" do
+    let(:obj) { Post.new }
+
     it "should delegate to auto_link" do
-      post = Post.new
-      expect(self).to receive(:auto_link).with(post) { "model name" }
-      expect(pretty_format(post)).to eq "model name"
+      expect(view).to receive(:auto_link).with(obj).and_return("model name")
+      expect(formatted_obj).to eq "model name"
     end
   end
 
   context "given an arbitrary object" do
+    let(:obj)  { Class.new.new }
+
     it "should delegate to `display_name`" do
-      something = Class.new.new
-      expect(self).to receive(:display_name).with(something) { "I'm not famous" }
-      expect(pretty_format(something)).to eq "I'm not famous"
+      expect(view).to receive(:display_name).with(obj) { "I'm not famous" }
+      expect(formatted_obj).to eq "I'm not famous"
     end
   end
 end