activeadmin 1.1.0 → 1.2.0

data/spec/unit/csv_builder_spec.rb

@@ -234,6 +234,15 @@ RSpec.describe ActiveAdmin::CSVBuilder do
       builder.build dummy_controller, []
     end
 
+    it "should disable the ActiveRecord query cache" do
+      expect(builder).to receive(:build_row).twice do
+        expect(ActiveRecord::Base.connection.query_cache_enabled).to be_falsy
+        []
+      end
+      ActiveRecord::Base.cache do
+        builder.build dummy_controller, []
+      end
+    end
   end
 
   context "build csv using specified encoding and encoding_options" do

data/spec/unit/filters/active_filter_spec.rb

@@ -132,4 +132,58 @@ RSpec.describe ActiveAdmin::Filters::ActiveFilter do
 
   end
 
+  context 'search has no matching records' do
+    let(:search) { Post.ransack(author_id_eq: "foo") }
+
+    it 'should not produce and error' do
+      expect { subject.values }.not_to raise_error
+    end
+
+    it 'should return an enumerable' do
+      expect(subject.values).to respond_to(:map)
+    end
+  end
+
+  context 'a label is set on the filter' do
+    it 'should use the filter label as the label prefix' do
+      label = "#{user.first_name}'s Post Title"
+      resource.add_filter(:title, label: label)
+
+      expect(subject.label).to eq ("#{label} equals")
+    end
+  end
+
+  context "the association uses a different primary_key than the related class' primary_key" do
+    let (:resource_klass) {
+      Class.new(Post) do
+        belongs_to :kategory, class_name: "Category", primary_key: :name, foreign_key: :title
+
+        def self.name
+          "SuperPost"
+        end
+      end
+    }
+
+    let(:resource) do
+      namespace.register(resource_klass)
+    end
+
+    let(:user){ User.create! first_name: "John", last_name: "Doe" }
+    let!(:category){ Category.create! name: "Category" }
+
+    let(:post){ resource_klass.create! title: "Category", author: user }
+
+    let(:search) do
+      resource_klass.ransack(title_equals: post.title)
+    end
+
+    it "should use the association's primary key to find the associated record" do
+      allow(ActiveSupport::Dependencies).to receive(:constantize).with("::SuperPost").and_return(resource_klass)
+
+      resource.add_filter(:kategory)
+
+      expect(subject.values.first).to eq category
+    end
+  end
+
 end

data/spec/unit/filters/filter_form_builder_spec.rb

@@ -311,6 +311,28 @@ RSpec.describe ActiveAdmin::Filters::ViewHelper do
       end
     end
 
+    context "when given the name of relationship with a primary key other than id" do
+      let(:resource_klass) {
+        Class.new(Post) do
+          belongs_to :kategory, class_name: "Category", primary_key: :name, foreign_key: :title
+
+          def self.name
+            "SuperPost"
+          end
+        end
+      }
+
+      let(:scope) do
+        resource_klass.search
+      end
+
+      let(:body) { Capybara.string(filter :kategory) }
+
+      it "should use the association primary key" do
+        expect(body).to have_selector("select[name='q[kategory_name_eq]']")
+      end
+    end
+
     context "as check boxes" do
       let(:body) { Capybara.string(filter :author, as: :check_boxes) }
 

data/spec/unit/pretty_format_spec.rb

@@ -8,12 +8,20 @@ RSpec.describe "#pretty_format" do
     mock_action_view.send *args, &block
   end
 
-  ['hello', 23, 5.67, 10**30, :foo, Arbre::Element.new.br(:foo)].each do |obj|
+  ['hello', 23, 5.67, 10**30, :foo].each do |obj|
     it "should call `to_s` on #{obj.class}s" do
       expect(pretty_format(obj)).to eq obj.to_s
     end
   end
 
+  it "normalizes Arbre elements" do
+    expect(pretty_format(Arbre::Element.new.br)).to eq("<br>\n")
+  end
+
+  it "sanitizes Arbre elements" do
+    expect(pretty_format(Arbre::Element.new.script('alert("foo");'))).to eq("alert(&amp;quot;foo&amp;quot;);\n")
+  end
+
   shared_examples_for 'a time-ish object' do |t|
     it "formats it with the default long format" do
       expect(pretty_format(t)).to eq "February 28, 1985 20:15"

data/spec/unit/resource_controller/data_access_spec.rb

@@ -197,32 +197,36 @@ RSpec.describe ActiveAdmin::ResourceController::DataAccess do
   describe "build_resource" do
 
     let(:config) do
-      ActiveAdmin.register Post do
-        permit_params :body, taggings_attributes: [:id, :tag_id]
+      ActiveAdmin.register User do
+        permit_params :type, posts_attributes: :custom_category_id
       end
     end
 
-    let!(:tag) { Tag.create! }
+    let!(:category) { Category.create! }
 
     let(:params) do
-      ActionController::Parameters.new({ post: { body: 'Body', taggings_attributes: [tag_id: tag.id] } })
-    end
-
-    before do
-      expect(Post).to receive(:new).with(a_hash_including(:body, :taggings_attributes)).and_call_original
+      ActionController::Parameters.new(user: { type: 'User::VIP', posts_attributes: [custom_category_id: category.id] })
     end
 
     subject do
       controller.send :build_resource
     end
 
+    let(:controller) do
+      rc = Admin::UsersController.new
+      allow(rc).to receive(:params) do
+        params
+      end
+      rc
+    end
+
     it "should return post with assigned attributes" do
-      expect(subject.body).to be_present
+      expect(subject).to be_a(User::VIP)
     end
 
     # see issue 4548
     it "should assign nested attributes once" do
-      expect(subject.taggings.size).to eq(1)
+      expect(subject.posts.size).to eq(1)
     end
 
   end

data/spec/unit/view_helpers/breadcrumbs_spec.rb

@@ -3,6 +3,7 @@ require 'rails_helper'
 RSpec.describe "Breadcrumbs" do
 
   include ActiveAdmin::ViewHelpers
+  include ActionView::Helpers::SanitizeHelper
 
   describe "generating a trail from paths" do
 

data/spec/unit/view_helpers/display_helper_spec.rb

@@ -10,7 +10,9 @@ RSpec.describe ActiveAdmin::ViewHelpers::DisplayHelper do
   include ActiveAdmin::ViewHelpers::DisplayHelper
   include MethodOrProcHelper
   include ActionView::Helpers::UrlHelper
+  include ActionView::Helpers::SanitizeHelper
   include ActionView::Helpers::TranslationHelper
+  include ActionView::Helpers::SanitizeHelper
 
   def active_admin_namespace
     active_admin_application.namespaces[:admin]
@@ -39,6 +41,13 @@ RSpec.describe ActiveAdmin::ViewHelpers::DisplayHelper do
         end
         expect(display_name klass.new).to eq m
       end
+
+      it "should sanitize the result of #{m} when defined" do
+        klass = Class.new do
+          define_method(m) { '<script>alert(1)</script>' }
+        end
+        expect(display_name klass.new).to eq 'alert(1)'
+      end
     end
 
     it "should memoize the result for the class" do
@@ -72,7 +81,7 @@ RSpec.describe ActiveAdmin::ViewHelpers::DisplayHelper do
 
     it "should default to `to_s`" do
       subject = Class.new.new
-      expect(display_name subject).to eq subject.to_s
+      expect(display_name subject).to eq sanitize(subject.to_s)
     end
 
     context "when no display name method is defined" do
@@ -148,7 +157,7 @@ RSpec.describe ActiveAdmin::ViewHelpers::DisplayHelper do
 
       value = format_attribute double(object: object), :object
 
-      expect(value).to eq :right
+      expect(value).to eq 'right'
     end
 
     it 'auto-links ActiveRecord records by association' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Greg Bell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -293,6 +293,7 @@ files:
 - config/locales/en-CA.yml
 - config/locales/en-GB.yml
 - config/locales/en.yml
+- config/locales/eo.yml
 - config/locales/es-MX.yml
 - config/locales/es.yml
 - config/locales/fa.yml
@@ -614,7 +615,7 @@ files:
 - lib/generators/active_admin/devise/devise_generator.rb
 - lib/generators/active_admin/install/install_generator.rb
 - lib/generators/active_admin/install/templates/active_admin.rb.erb
-- lib/generators/active_admin/install/templates/admin_user.rb.erb
+- lib/generators/active_admin/install/templates/admin_users.rb.erb
 - lib/generators/active_admin/install/templates/dashboard.rb
 - lib/generators/active_admin/install/templates/migrations/create_active_admin_comments.rb.erb
 - lib/generators/active_admin/page/USAGE
@@ -798,7 +799,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The administration framework for Ruby on Rails.