activeadmin 1.0.0.pre2 → 1.0.0.pre3

data/spec/support/rails_template_with_data.rb

@@ -1,12 +1,10 @@
-# Use the default
 apply File.expand_path("../rails_template.rb", __FILE__)
 
-# Register Active Admin controllers
-%w{ Post User Category }.each do |type|
+%w{Post User Category}.each do |type|
   generate :'active_admin:resource', type
 end
 
-scopes = <<-EOF
+inject_into_file 'app/admin/post.rb', <<-RUBY, after: "ActiveAdmin.register Post do\n"
   scope :all, default: true
 
   scope :drafts do |posts|
@@ -24,11 +22,9 @@ scopes = <<-EOF
   scope :my_posts do |posts|
     posts.where(author_id: current_admin_user.id)
   end
-EOF
-inject_into_file 'app/admin/posts.rb', scopes , after: "ActiveAdmin.register Post do\n"
+RUBY
 
-# Setup some default data
-append_file "db/seeds.rb", <<-EOF
+append_file "db/seeds.rb", "\n\n" + <<-RUBY.strip_heredoc
   users = ["Jimi Hendrix", "Jimmy Page", "Yngwie Malmsteen", "Eric Clapton", "Kirk Hammett"].collect do |name|
     first, last = name.split(" ")
     User.create!  first_name: first,
@@ -54,6 +50,6 @@ append_file "db/seeds.rb", <<-EOF
                 author: user,
                 starred: true
   end
-EOF
+RUBY
 
 rake 'db:seed'

data/spec/support/templates/admin/stores.rb

@@ -1,6 +1,6 @@
 ActiveAdmin.register Store do
 
-  if Rails::VERSION::MAJOR == 4
+  if Rails::VERSION::MAJOR >= 4
     permit_params :name
   end
 

data/spec/unit/action_builder_spec.rb

@@ -1,20 +1,24 @@
 require 'rails_helper'
 
-describe 'defining new actions from registration blocks' do
+describe 'defining actions from registration blocks', type: :controller do
+  let(:klass){ Admin::PostsController }
+  render_views # https://github.com/rspec/rspec-rails/issues/860
 
-  let(:controller){ Admin::PostsController }
+  before do
+    @controller = klass.new
+  end
 
-  describe "generating a new member action" do
+  describe 'creates a member action' do
     before do
       action!
       reload_routes!
     end
 
     after(:each) do
-      controller.clear_member_actions!
+      klass.clear_member_actions!
     end
 
-    context "with a block" do
+    context 'with a block' do
       let(:action!) do
         ActiveAdmin.register Post do
           member_action :comment do
@@ -23,51 +27,61 @@ describe 'defining new actions from registration blocks' do
         end
       end
 
-      it "should create a new public instance method" do
-        expect(controller.public_instance_methods.collect(&:to_s)).to include("comment")
+      it 'should create a new public instance method' do
+        expect(klass.public_instance_methods.collect(&:to_s)).to include('comment')
       end
-      it "should add itself to the member actions config" do
-        expect(controller.active_admin_config.member_actions.size).to eq 1
+
+      it 'should add itself to the member actions config' do
+        expect(klass.active_admin_config.member_actions.size).to eq 1
       end
-      it "should create a new named route" do
-        expect(Rails.application.routes.url_helpers.methods.collect(&:to_s)).to include("comment_admin_post_path")
+
+      it 'should create a new named route' do
+        expect(Rails.application.routes.url_helpers.methods.collect(&:to_s)).to include('comment_admin_post_path')
       end
     end
 
-    context "without a block" do
+    context 'without a block' do
       let(:action!) do
         ActiveAdmin.register Post do
           member_action :comment
         end
       end
-      it "should still generate a new empty action" do
-        expect(controller.public_instance_methods.collect(&:to_s)).to include("comment")
+
+      it 'should still generate a new empty action' do
+        expect(klass.public_instance_methods.collect(&:to_s)).to include('comment')
       end
     end
 
-    context "with :title" do
+    context 'with :title' do
       let(:action!) do
         ActiveAdmin.register Post do
-          member_action :comment, title: "My Awesome Comment"
+          member_action :comment, title: 'My Awesome Comment' do
+            render json: {a: 2}
+          end
         end
       end
 
-      subject { find_before_filter controller, :comment }
+      it 'sets the page title' do
+        params = {id: 1}
+        params = {params: params} if ActiveAdmin::Dependency.rails5?
+        get :comment, params
 
-      it { is_expected.to set_page_title_to "My Awesome Comment", for: controller }
+        expect(controller.instance_variable_get(:@page_title)).to eq 'My Awesome Comment'
+      end
     end
   end
 
-  describe "generate a new collection action" do
+  describe 'creates a collection action' do
     before do
       action!
       reload_routes!
     end
+
     after(:each) do
-      controller.clear_collection_actions!
+      klass.clear_collection_actions!
     end
 
-    context "with a block" do
+    context 'with a block' do
       let(:action!) do
         ActiveAdmin.register Post do
           collection_action :comments do
@@ -75,58 +89,46 @@ describe 'defining new actions from registration blocks' do
           end
         end
       end
-      it "should create a new public instance method" do
-        expect(controller.public_instance_methods.collect(&:to_s)).to include("comments")
+
+      it 'should create a public instance method' do
+        expect(klass.public_instance_methods.collect(&:to_s)).to include('comments')
       end
-      it "should add itself to the member actions config" do
-        expect(controller.active_admin_config.collection_actions.size).to eq 1
+
+      it 'should add itself to the member actions config' do
+        expect(klass.active_admin_config.collection_actions.size).to eq 1
       end
-      it "should create a new named route" do
-        expect(Rails.application.routes.url_helpers.methods.collect(&:to_s)).to include("comments_admin_posts_path")
+
+      it 'should create a named route' do
+        expect(Rails.application.routes.url_helpers.methods.collect(&:to_s)).to include('comments_admin_posts_path')
       end
     end
-    context "without a block" do
+
+    context 'without a block' do
       let(:action!) do
         ActiveAdmin.register Post do
           collection_action :comments
         end
       end
-      it "should still generate a new empty action" do
-        expect(controller.public_instance_methods.collect(&:to_s)).to include("comments")
+
+      it 'should still generate a new empty action' do
+        expect(klass.public_instance_methods.collect(&:to_s)).to include('comments')
       end
     end
-    context "with :title" do
+
+    context 'with :title' do
       let(:action!) do
         ActiveAdmin.register Post do
-          collection_action :comments, title: "My Awesome Comments"
+          collection_action :comments, title: 'My Awesome Comments' do
+            render json: {a: 2}
+          end
         end
       end
 
-      subject { find_before_filter controller, :comments }
-
-      it { is_expected.to set_page_title_to "My Awesome Comments", for: controller }
-    end
-  end
-
-  def find_before_filter(controller, action)
-    finder = if ActiveAdmin::Dependency.rails? '>= 4.1.0'
-      ->c { c.kind == :before && c.instance_variable_get(:@if) == ["action_name == '#{action}'"] }
-    else
-      ->c { c.kind == :before && c.options[:only] == [action] }
-    end
-
-    controller._process_action_callbacks.detect &finder
-  end
+      it 'sets the page title' do
+        get :comments
 
-  RSpec::Matchers.define :set_page_title_to do |expected, options|
-    match do |filter|
-      filter.raw_filter.call
-      @actual = options[:for].instance_variable_get(:@page_title)
-      expect(@actual).to eq expected
-    end
-
-    failure_message do |filter|
-      message = "expected before_filter to set the @page_title to '#{expected}', but was '#{@actual}'"
+        expect(controller.instance_variable_get(:@page_title)).to eq 'My Awesome Comments'
+      end
     end
   end
 end

data/spec/unit/authorization/authorization_adapter_spec.rb

@@ -7,7 +7,7 @@ describe ActiveAdmin::AuthorizationAdapter do
   describe "#authorized?" do
 
     it "should always return true" do
-      expect(adapter.authorized?(:read, "Resource")).to be_truthy
+      expect(adapter.authorized?(:read, "Resource")).to eq true
     end
 
   end
@@ -41,19 +41,19 @@ describe ActiveAdmin::AuthorizationAdapter do
     let(:adapter) { auth_class.new(double, double) }
 
     it "should match against a class" do
-      expect(adapter.authorized?(:read, String)).to be_truthy
+      expect(adapter.authorized?(:read, String)).to eq true
     end
 
     it 'should match against an instance' do
-      expect(adapter.authorized?(:read, "String")).to be_truthy
+      expect(adapter.authorized?(:read, "String")).to eq true
     end
 
     it 'should not match a different class' do
-      expect(adapter.authorized?(:read, Hash)).to be_falsey
+      expect(adapter.authorized?(:read, Hash)).to eq false
     end
 
     it 'should not match a different instance' do
-      expect(adapter.authorized?(:read, {})).to be_falsey
+      expect(adapter.authorized?(:read, {})).to eq false
     end
 
   end

data/spec/unit/authorization/index_overriding_spec.rb

@@ -5,7 +5,8 @@ describe Admin::PostsController, 'Index overriding', type: :controller do
     controller.instance_eval do
       def index
         super do
-          render text: 'Rendered from passed block' and return
+          render Dependency.rails.render_key => 'Rendered from passed block'
+          return
         end
       end
     end

data/spec/unit/auto_link_spec.rb

@@ -14,7 +14,7 @@ describe "auto linking resources" do
     "/admin/posts/#{post.id}"
   end
 
-  def authorized?(_action, _subject)
+  def authorized?(*)
     true
   end
 

data/spec/unit/batch_actions/resource_spec.rb

@@ -12,7 +12,7 @@ describe ActiveAdmin::BatchActions::ResourceExtension do
 
     it "should have the default action by default" do
       expect(resource.batch_actions.size).to eq 1
-      expect(resource.batch_actions.first.sym == :destroy).to be_truthy
+      expect(resource.batch_actions.first.sym == :destroy).to eq true
     end
 
   end
@@ -35,7 +35,7 @@ describe ActiveAdmin::BatchActions::ResourceExtension do
     end
 
     it "should store the block in the batch action" do
-      expect(resource.batch_actions.first.block).to_not be_nil
+      expect(resource.batch_actions.first.block).to_not eq nil
     end
 
   end

data/spec/unit/batch_actions/settings_spec.rb

@@ -8,42 +8,42 @@ describe "Batch Actions Settings" do
   it "should be disabled globally by default" do
     # Note: the default initializer would set it to true
 
-    expect(app.batch_actions).to be_falsey
-    expect(ns.batch_actions).to be_falsey
-    expect(post_resource.batch_actions_enabled?).to be_falsey
+    expect(app.batch_actions).to eq false
+    expect(ns.batch_actions).to eq false
+    expect(post_resource.batch_actions_enabled?).to eq false
   end
 
   it "should be settable to true" do
     app.batch_actions = true
-    expect(app.batch_actions).to be_truthy
+    expect(app.batch_actions).to eq true
   end
 
   it "should be an inheritable_setting" do
     app.batch_actions = true
-    expect(ns.batch_actions).to be_truthy
+    expect(ns.batch_actions).to eq true
   end
 
   it "should be settable at the namespace level" do
     app.batch_actions = true
     ns.batch_actions = false
 
-    expect(app.batch_actions).to be_truthy
-    expect(ns.batch_actions).to be_falsey
+    expect(app.batch_actions).to eq true
+    expect(ns.batch_actions).to eq false
   end
 
   it "should be settable at the resource level" do
-    expect(post_resource.batch_actions_enabled?).to be_falsey
+    expect(post_resource.batch_actions_enabled?).to eq false
     post_resource.batch_actions = true
-    expect(post_resource.batch_actions_enabled?).to be_truthy
+    expect(post_resource.batch_actions_enabled?).to eq true
   end
 
   it "should inherit the setting on the resource from the namespace" do
     ns.batch_actions = false
-    expect(post_resource.batch_actions_enabled?).to be_falsey
+    expect(post_resource.batch_actions_enabled?).to eq false
     expect(post_resource.batch_actions).to be_empty
 
     post_resource.batch_actions = true
-    expect(post_resource.batch_actions_enabled?).to be_truthy
+    expect(post_resource.batch_actions_enabled?).to eq true
     expect(post_resource.batch_actions).to_not be_empty
   end
 
@@ -51,11 +51,11 @@ describe "Batch Actions Settings" do
     ns.batch_actions = true
 
     post_resource.batch_actions = true
-    expect(post_resource.batch_actions_enabled?).to be_truthy
+    expect(post_resource.batch_actions_enabled?).to eq true
     expect(post_resource.batch_actions).to_not be_empty
 
     post_resource.batch_actions = nil
-    expect(post_resource.batch_actions_enabled?).to be_truthy # inherited from namespace
+    expect(post_resource.batch_actions_enabled?).to eq true # inherited from namespace
     expect(post_resource.batch_actions).to_not be_empty
   end
 end

data/spec/unit/comments_spec.rb

@@ -159,13 +159,13 @@ describe "Comments" do
       it "should have comments when the namespace allows comments" do
         ns = ActiveAdmin::Namespace.new(application, :admin)
         ns.comments = true
-        expect(ns.comments?).to be_truthy
+        expect(ns.comments?).to eq true
       end
 
       it "should not have comments when the namespace does not allow comments" do
         ns = ActiveAdmin::Namespace.new(application, :admin)
         ns.comments = false
-        expect(ns.comments?).to be_falsey
+        expect(ns.comments?).to eq false
       end
     end
   end
@@ -174,15 +174,15 @@ describe "Comments" do
     it "should add an attr_accessor :comments to ActiveAdmin::Resource" do
       ns = ActiveAdmin::Namespace.new(application, :admin)
       resource = ActiveAdmin::Resource.new(ns, Post)
-      expect(resource.comments).to be_nil
+      expect(resource.comments).to eq nil
       resource.comments = true
-      expect(resource.comments).to be_truthy
+      expect(resource.comments).to eq true
     end
     it "should disable comments if set to false" do
       ns = ActiveAdmin::Namespace.new(application, :admin)
       resource = ActiveAdmin::Resource.new(ns, Post)
       resource.comments = false
-      expect(resource.comments?).to be_falsey
+      expect(resource.comments?).to eq false
     end
   end
 end

data/spec/unit/csv_builder_spec.rb

@@ -1,3 +1,5 @@
+# Encoding: UTF-8
+
 require 'rails_helper'
 
 describe ActiveAdmin::CSVBuilder do
@@ -233,6 +235,63 @@ describe ActiveAdmin::CSVBuilder do
 
   end
 
+  context "build csv using specified encoding and encoding_options" do
+    let(:dummy_controller) do
+      class DummyController
+        def find_collection(*)
+          collection
+        end
+
+        def collection
+          Post
+        end
+
+        def apply_decorator(resource)
+          resource
+        end
+
+        def view_context
+        end
+      end
+      DummyController.new
+    end
+    let(:encoding) { Encoding::ASCII }
+    let(:opts) { {} }
+    let(:builder) do
+      ActiveAdmin::CSVBuilder.new(encoding: encoding, encoding_options: opts) do
+        column "おはようございます"
+        column "title"
+      end
+    end
+
+    context "Shift-JIS with options" do
+      let(:encoding) { Encoding::Shift_JIS }
+      let(:opts) { { invalid: :replace, undef: :replace, replace: "?" } }
+
+      it "encodes the CSV" do
+        receiver = []
+        builder.build dummy_controller, receiver
+        line = receiver.last
+        expect(line.encoding).to eq(encoding)
+      end
+    end
+
+    context "ASCII with options" do
+      let(:encoding) { Encoding::ASCII }
+      let(:opts) do
+        { invalid: :replace, undef: :replace, replace: "__REPLACED__" }
+      end
+
+      it "encodes the CSV without errors" do
+        receiver = []
+        builder.build dummy_controller, receiver
+        line = receiver.last
+        expect(line.encoding).to eq(encoding)
+        expect(line).to include("__REPLACED__")
+      end
+    end
+  end
+
   skip '#exec_columns'
 
   skip '#build_row' do