activeadmin 0.6.6 → 1.0.0.pre1

data/spec/unit/dependency_spec.rb

@@ -0,0 +1,135 @@
+require 'rails_helper'
+
+describe ActiveAdmin::Dependency do
+
+  k = ActiveAdmin::Dependency
+
+  describe 'method_missing' do
+    before do
+      allow(Gem).to receive(:loaded_specs)
+        .and_return 'foo' => Gem::Specification.new('foo', '1.2.3')
+    end
+
+    it 'returns a Matcher' do
+      expect(k.foo).to be_a ActiveAdmin::Dependency::Matcher
+      expect(k.foo.inspect).to eq '<ActiveAdmin::Dependency::Matcher for foo 1.2.3>'
+      expect(k.bar.inspect).to eq '<ActiveAdmin::Dependency::Matcher for (missing)>'
+    end
+
+    describe '`?`' do
+      it 'base' do
+        expect(k.foo?).to eq true
+        expect(k.bar?).to eq false
+      end
+      it '=' do
+        expect(k.foo? '= 1.2.3').to eq true
+        expect(k.foo? '= 1'    ).to eq false
+      end
+      it '>' do
+        expect(k.foo? '> 1').to eq true
+        expect(k.foo? '> 2').to eq false
+      end
+      it '<' do
+        expect(k.foo? '< 2').to eq true
+        expect(k.foo? '< 1').to eq false
+      end
+      it '>=' do
+        expect(k.foo? '>= 1.2.3').to eq true
+        expect(k.foo? '>= 1.2.2').to eq true
+        expect(k.foo? '>= 1.2.4').to eq false
+      end
+      it '<=' do
+        expect(k.foo? '<= 1.2.3').to eq true
+        expect(k.foo? '<= 1.2.4').to eq true
+        expect(k.foo? '<= 1.2.2').to eq false
+      end
+      it '~>' do
+        expect(k.foo? '~> 1.2.0').to eq true
+        expect(k.foo? '~> 1.1'  ).to eq true
+        expect(k.foo? '~> 1.2.4').to eq false
+      end
+    end
+
+    describe '`!`' do
+      it 'raises an error if requirement not met' do
+        expect{ k.foo! '5'            }.to raise_error ActiveAdmin::DependencyError,
+          'You provided foo 1.2.3 but we need: 5.'
+      end
+      it 'accepts multiple arguments' do
+        expect{ k.foo! '> 1', '< 1.2' }.to raise_error ActiveAdmin::DependencyError,
+          'You provided foo 1.2.3 but we need: > 1, < 1.2.'
+      end
+      it 'raises an error if not provided' do
+        expect{ k.bar!                }.to raise_error ActiveAdmin::DependencyError,
+          'To use bar you need to specify it in your Gemfile.'
+      end
+    end
+  end
+
+  describe '[]' do
+    before do
+      allow(Gem).to receive(:loaded_specs)
+        .and_return 'a-b' => Gem::Specification.new('a-b', '1.2.3')
+    end
+
+    it 'allows access to gems with an arbitrary name' do
+      expect(k['a-b']).to be_a ActiveAdmin::Dependency::Matcher
+      expect(k['a-b'].inspect).to eq '<ActiveAdmin::Dependency::Matcher for a-b 1.2.3>'
+      expect(k['c-d'].inspect).to eq '<ActiveAdmin::Dependency::Matcher for (missing)>'
+    end
+
+    # Note: more extensive tests for match? and match! are above.
+
+    it 'match?' do
+      expect(k['a-b'].match?        ).to eq true
+      expect(k['a-b'].match? '1.2.3').to eq true
+      expect(k['b-c'].match?        ).to eq false
+    end
+
+    it 'match!' do
+      expect(k['a-b'].match!        ).to eq nil
+      expect(k['a-b'].match! '1.2.3').to eq nil
+
+      expect{ k['a-b'].match! '2.5' }.to raise_error ActiveAdmin::DependencyError,
+        'You provided a-b 1.2.3 but we need: 2.5.'
+
+      expect{ k['b-c'].match!       }.to raise_error ActiveAdmin::DependencyError,
+        'To use b-c you need to specify it in your Gemfile.'
+    end
+
+    # Note: Ruby comparison operators are separate from the `foo? '> 1'` syntax
+
+    describe 'Ruby comparison syntax' do
+
+      it '==' do
+        expect(k['a-b'] == '1.2.3').to eq true
+        expect(k['a-b'] == '1.2'  ).to eq false
+        expect(k['a-b'] == 1      ).to eq false
+      end
+      it '>' do
+        expect(k['a-b'] > 1).to eq true
+        expect(k['a-b'] > 2).to eq false
+      end
+      it '<' do
+        expect(k['a-b'] < 2).to eq true
+        expect(k['a-b'] < 1).to eq false
+      end
+      it '>=' do
+        expect(k['a-b'] >= '1.2.3').to eq true
+        expect(k['a-b'] >= '1.2.2').to eq true
+        expect(k['a-b'] >= '1.2.4').to eq false
+      end
+      it '<=' do
+        expect(k['a-b'] <= '1.2.3').to eq true
+        expect(k['a-b'] <= '1.2.4').to eq true
+        expect(k['a-b'] <= '1.2.2').to eq false
+      end
+
+      it 'throws a custom error if the gem is missing' do
+        expect{ k['b-c'] < 23 }.to raise_error ActiveAdmin::DependencyError,
+          'To use b-c you need to specify it in your Gemfile.'
+      end
+    end
+  end
+
+end

data/spec/unit/devise_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ActiveAdmin::Devise::Controller do
 
@@ -18,12 +18,12 @@ describe ActiveAdmin::Devise::Controller do
     before { Rails.configuration.action_controller[:relative_url_root] = '/foo' }
 
     it "should set the root path to the default namespace" do
-      controller.root_path.should == "/foo/admin"
+      expect(controller.root_path).to eq "/foo/admin"
     end
 
     it "should set the root path to '/' when no default namespace" do
-      ActiveAdmin.application.stub!(:default_namespace => false)
-      controller.root_path.should == "/foo/"
+      allow(ActiveAdmin.application).to receive(:default_namespace).and_return(false)
+      expect(controller.root_path).to eq "/foo/"
     end
 
   end
@@ -33,12 +33,12 @@ describe ActiveAdmin::Devise::Controller do
     before { Rails.configuration.action_controller[:relative_url_root] = nil }
 
     it "should set the root path to the default namespace" do
-      controller.root_path.should == "/admin"
+      expect(controller.root_path).to eq "/admin"
     end
 
     it "should set the root path to '/' when no default namespace" do
-      ActiveAdmin.application.stub!(:default_namespace => false)
-      controller.root_path.should == "/"
+      allow(ActiveAdmin.application).to receive(:default_namespace).and_return(false)
+      expect(controller.root_path).to eq "/"
     end
 
   end
@@ -54,7 +54,7 @@ describe ActiveAdmin::Devise::Controller do
 
       # Add scoped routes
       routes.draw do
-        scope :path => SCOPE do
+        scope path: SCOPE do
           ActiveAdmin.routes(self)
           devise_for :admin_users, ActiveAdmin::Devise.config
         end
@@ -67,7 +67,7 @@ describe ActiveAdmin::Devise::Controller do
     end
 
     it "should include scope path in root_path" do
-      controller.root_path.should == "#{SCOPE}/admin"
+      expect(controller.root_path).to eq "#{SCOPE}/admin"
     end
 
   end
@@ -76,38 +76,18 @@ describe ActiveAdmin::Devise::Controller do
     let(:config) { ActiveAdmin::Devise.config }
 
     describe ":sign_out_via option" do
+      it "should contain the application.logout_link_method" do
+        expect(::Devise).to receive(:sign_out_via).and_return(:delete)
+        expect(ActiveAdmin.application).to receive(:logout_link_method).and_return(:get)
 
-      subject { config[:sign_out_via] }
-
-      context "when Devise does not implement sign_out_via (version < 1.2)" do
-        before do
-          ::Devise.should_receive(:respond_to?).with(:sign_out_via).and_return(false)
-        end
-
-        it "should not contain any customization for sign_out_via" do
-          config.should_not have_key(:sign_out_via)
-        end
+        expect(config[:sign_out_via]).to include(:get)
       end
 
-      context "when Devise implements sign_out_via (version >= 1.2)" do
-        before do
-          ::Devise.should_receive(:respond_to?).with(:sign_out_via).and_return(true)
-          ::Devise.stub!(:sign_out_via) { :delete }
-        end
-
-        it "should contain the application.logout_link_method" do
-            ::Devise.should_receive(:sign_out_via).and_return(:delete)
-            ActiveAdmin.application.should_receive(:logout_link_method).and_return(:get)
-
-            config[:sign_out_via].should include(:get)
-        end
+      it "should contain Devise's logout_via_method(s)" do
+        expect(::Devise).to receive(:sign_out_via).and_return([:delete, :post])
+        expect(ActiveAdmin.application).to receive(:logout_link_method).and_return(:get)
 
-        it "should contain Devise's logout_via_method(s)" do
-            ::Devise.should_receive(:sign_out_via).and_return([:delete, :post])
-            ActiveAdmin.application.should_receive(:logout_link_method).and_return(:get)
-
-            config[:sign_out_via].should == [:delete, :post, :get]
-        end
+        expect(config[:sign_out_via]).to eq [:delete, :post, :get]
       end
 
     end # describe ":sign_out_via option"

data/spec/unit/dsl_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 
 module MockModuleToInclude
@@ -8,16 +8,15 @@ end
 
 describe ActiveAdmin::DSL do
 
-  let(:config){ mock }
   let(:application) { ActiveAdmin::Application.new }
   let(:namespace) { ActiveAdmin::Namespace.new application, :admin }
   let(:resource_config) { ActiveAdmin::Resource.new namespace, Post }
-  let(:dsl){ ActiveAdmin::DSL.new(config) }
+  let(:dsl){ ActiveAdmin::DSL.new(resource_config) }
 
   describe "#include" do
 
     it "should call the included class method on the module that is included" do
-      MockModuleToInclude.should_receive(:included).with(dsl)
+      expect(MockModuleToInclude).to receive(:included).with(dsl)
       dsl.run_registration_block do
         include MockModuleToInclude
       end
@@ -25,12 +24,45 @@ describe ActiveAdmin::DSL do
 
   end
 
+
+  describe '#action_item' do
+    before do
+      @default_items_count = resource_config.action_items.size
+
+      dsl.run_registration_block do
+        action_item :awesome, only: :show do
+          "Awesome ActionItem"
+        end
+      end
+    end
+
+    it "adds action_item to the action_items of config" do
+      expect(resource_config.action_items.size).to eq(@default_items_count + 1)
+    end
+
+    context 'DEPRECATED: when used without a name' do
+      it "is configured for only the show action" do
+        expect(ActiveAdmin::Deprecation).to receive(:warn).with(instance_of(String))
+
+        dsl.run_registration_block do
+          action_item only: :edit do
+            "Awesome ActionItem"
+          end
+        end
+
+        item = resource_config.action_items.last
+        expect(item.display_on?(:edit)).to be true
+        expect(item.display_on?(:index)).to be false
+      end
+    end
+  end
+
   describe "#menu" do
 
     it "should set the menu_item_options on the configuration" do
-      config.should_receive(:menu_item_options=).with({:parent => "Admin"})
+      expect(resource_config).to receive(:menu_item_options=).with({parent: "Admin"})
       dsl.run_registration_block do
-        menu :parent => "Admin"
+        menu parent: "Admin"
       end
     end
 
@@ -39,23 +71,52 @@ describe ActiveAdmin::DSL do
   describe "#navigation_menu" do
 
     it "should set the navigation_menu_name on the configuration" do
-      config.should_receive(:navigation_menu_name=).with(:admin)
+      expect(resource_config).to receive(:navigation_menu_name=).with(:admin)
       dsl.run_registration_block do
         navigation_menu :admin
       end
     end
 
     it "should accept a block" do
-
       dsl = ActiveAdmin::DSL.new(resource_config)
       dsl.run_registration_block do
         navigation_menu { :dynamic_menu }
       end
+      expect(resource_config.navigation_menu_name).to eq :dynamic_menu
+    end
+
+  end
+
+  describe "#sidebar" do
 
-      resource_config.navigation_menu_name.should == :dynamic_menu
+    before do
+      dsl.config.sidebar_sections << ActiveAdmin::SidebarSection.new(:email)
+    end
 
+    it "add sidebar_section to the sidebar_sections of config" do
+      dsl.run_registration_block do
+        sidebar :help
+      end
+      expect(dsl.config.sidebar_sections.map(&:name)).to match_array([:filters, :email, :help])
     end
 
   end
 
+  describe "#batch_action" do
+    it "should add a batch action by symbol" do
+      dsl.run_registration_block do
+        config.batch_actions = true
+        batch_action :foo
+      end
+      expect(resource_config.batch_actions.map(&:sym)).to eq [:foo, :destroy]
+    end
+
+    it "should add a batch action by title" do
+      dsl.run_registration_block do
+        config.batch_actions = true
+        batch_action "foo bar"
+      end
+      expect(resource_config.batch_actions.map(&:sym)).to eq [:foo_bar, :destroy]
+    end
+  end
 end

data/spec/unit/event_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'active_admin/event'
 
 describe ActiveAdmin::EventDispatcher do
@@ -7,41 +7,41 @@ describe ActiveAdmin::EventDispatcher do
   let(:dispatcher){ ActiveAdmin::EventDispatcher.new }
 
   it "should add a subscriber for an event" do
-    dispatcher.subscribers(test_event).size.should == 0
+    expect(dispatcher.subscribers(test_event).size).to eq 0
     dispatcher.subscribe(test_event){ true }
-    dispatcher.subscribers(test_event).size.should == 1
+    expect(dispatcher.subscribers(test_event).size).to eq 1
   end
 
   it "should add a subscriber for multiple events" do
     dispatcher.subscribe(test_event, test_event + "1"){ true }
-    dispatcher.subscribers(test_event).size.should == 1
-    dispatcher.subscribers(test_event + "1").size.should == 1
+    expect(dispatcher.subscribers(test_event).size).to eq 1
+    expect(dispatcher.subscribers(test_event + "1").size).to eq 1
   end
 
   it "should call the dispatch block with no arguments" do
     dispatcher.subscribe(test_event){ raise StandardError, "From Event Handler" }
-    lambda {
+    expect {
       dispatcher.dispatch(test_event)
-    }.should raise_error(StandardError, "From Event Handler")
+    }.to raise_error(StandardError, "From Event Handler")
   end
 
   it "should call the dispatch block with one argument" do
     arg = nil
     dispatcher.subscribe(test_event){|passed_in| arg = passed_in }
     dispatcher.dispatch(test_event, "My Arg")
-    arg.should == "My Arg"
+    expect(arg).to eq "My Arg"
   end
 
   it "should clear all subscribers" do
     dispatcher.subscribe(test_event){ false }
     dispatcher.subscribe(test_event + "_2"){ false }
     dispatcher.clear_all_subscribers!
-    dispatcher.subscribers(test_event).size.should == 0
-    dispatcher.subscribers(test_event + "_2").size.should == 0
+    expect(dispatcher.subscribers(test_event).size).to eq 0
+    expect(dispatcher.subscribers(test_event + "_2").size).to eq 0
   end
 
   it "should have a dispatcher available from ActiveAdmin::Event" do
-    ActiveAdmin::Event.should be_an_instance_of(ActiveAdmin::EventDispatcher)
+    expect(ActiveAdmin::Event).to be_an_instance_of(ActiveAdmin::EventDispatcher)
   end
 
 end

data/spec/unit/filters/filter_form_builder_spec.rb

@@ -1,8 +1,9 @@
-require 'spec_helper'
+require 'rails_helper'
 
 class Post
-  scope :custom_searcher, ->stuff { where(body: stuff) }
-  search_method :custom_searcher
+  ransacker :custom_searcher do
+    # nothing to see here
+  end
 end
 
 describe ActiveAdmin::Filters::ViewHelper do
@@ -27,312 +28,359 @@ describe ActiveAdmin::Filters::ViewHelper do
   end
 
   def render_filter(search, filters)
-    render_arbre_component({:filter_args => [search, filters]}, helpers) do
-      text_node active_admin_filters_form_for(*assigns[:filter_args])
-    end
+    render_arbre_component({filter_args: [search, filters]}, helpers) do
+      text_node active_admin_filters_form_for *assigns[:filter_args]
+    end.to_s
   end
 
   def filter(name, options = {})
-    render_filter scope, @filters.push(options.merge(:attribute => name))
+    render_filter scope, name => options
   end
 
   let(:scope) { Post.search }
 
-  before(:each) { @filters = [] }
-
-
   describe "the form in general" do
-    let(:body) { filter :title }
+    let(:body) { Capybara.string(filter :title) }
 
     it "should generate a form which submits via get" do
-      body.should have_tag("form", :attributes => { :method => 'get', :class => 'filter_form' })
+      expect(body).to have_selector("form.filter_form[method=get]")
     end
 
     it "should generate a filter button" do
-      body.should have_tag("input", :attributes => { :type => "submit",
-                                                        :value => "Filter" })
+      expect(body).to have_selector("input[type=submit][value=Filter]")
     end
 
     it "should only generate the form once" do
-      body.to_s.scan(/q\[title_contains\]/).size.should == 1
+      expect(body).to have_selector("form", count: 1)
     end
 
     it "should generate a clear filters link" do
-      body.should have_tag("a", "Clear Filters", :attributes => { :class => "clear_filters_btn" })
+      expect(body).to have_selector("a.clear_filters_btn", text: "Clear Filters")
+    end
+
+    describe "label as proc" do
+      let(:body) { Capybara.string(filter :title, label: proc { 'Title from proc' }) }
+
+      it "should render proper label" do
+        expect(body).to have_selector("label", text: "Title from proc")
+      end
     end
   end
 
   describe "string attribute" do
-    let(:body) { filter :title }
+    let(:body) { Capybara.string(filter :title) }
 
     it "should generate a select option for starts with" do
-      body.should have_tag("option", "Starts with", :attributes => { :value => 'title_starts_with' })
+      expect(body).to have_selector("option[value=title_starts_with]", text: "Starts with")
     end
 
     it "should generate a select option for ends with" do
-      body.should have_tag("option", "Ends with", :attributes => { :value => 'title_ends_with' })
+      expect(body).to have_selector("option[value=title_ends_with]", text: "Ends with")
     end
 
     it "should generate a select option for contains" do
-      body.should have_tag("option", "Contains", :attributes => { :value => 'title_contains' })
+      expect(body).to have_selector("option[value=title_contains]", text: "Contains")
     end
 
     it "should generate a text field for input" do
-      body.should have_tag("input", :attributes => { :name => 'q[title_contains]' })
+      expect(body).to have_selector("input[name='q[title_contains]']")
     end
-    
+
     it "should have a proper label" do
-      body.should have_tag('label', 'Title')
+      expect(body).to have_selector("label", text: "Title")
     end
 
     it "should translate the label for text field" do
-      begin
-        I18n.backend.store_translations(:en, :activerecord => { :attributes => { :post => { :title => "Name" } } })
-        body.should have_tag('label', 'Name')
-      ensure
-        I18n.backend.reload!
+      with_translation activerecord: {attributes: {post: {title: 'Name'}}} do
+        expect(body).to have_selector("label", text: "Name")
       end
     end
 
-    it "should select the option which is currently being filtered"
-
-  end
-
-  describe "string attribute with sub filters" do
-    let(:body) { filter :title_contains }
-    
-    it "should generate a search field for a string attribute with query contains" do
-      body.should have_tag("input", :attributes => { :name => "q[title_contains]"})
-      body.should have_tag('label', 'Title contains')
-    end
-
-    it "should NOT generate a select option for contains" do
-      body.should_not have_tag("option", "Contains", :attributes => { :value => 'title_contains' })
-    end
-
-    context "using starts_with and as" do
-      let(:body) { filter :title_starts_with }
-
-      it "should generate a search field for a string attribute with query starts_with" do
-        body.should have_tag("input", :attributes => { :name => "q[title_starts_with]" })
-      end
+    it "should select the option which is currently being filtered" do
+      scope = Post.search 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
 
-    context "using ends_with and as" do
-      let(:body) { filter :title_ends_with }
+    context "with predicate" do
+      %w[eq equals cont contains start starts_with end ends_with].each do |predicate|
+        describe "'#{predicate}'" do
+          let(:body) { Capybara.string(filter :"title_#{predicate}") }
 
-      it "should generate a search field for a string attribute with query starts_with" do
-        body.should have_tag("input", :attributes => { :name => "q[title_ends_with]" })
-      end
-    end
-    
-    context "using contains and NO AS defined" do
-      let(:body) { filter :title_contains }
+          it "shouldn't include a select field" do
+            expect(body).not_to have_selector("select")
+          end
 
-      it "should generate a search field for a string attribute with query contains" do
-        body.should have_tag("input", :attributes => { :name => "q[title_contains]" })
+          it "should build correctly" do
+            expect(body).to have_selector("input[name='q[title_#{predicate}]']")
+          end
+        end
       end
     end
   end
-  
+
   describe "text attribute" do
-    let(:body) { filter :body }
+    let(:body) { Capybara.string(filter :body) }
 
     it "should generate a search field for a text attribute" do
-      body.should have_tag("input", :attributes => { :name => "q[body_contains]"})
+      expect(body).to have_selector("input[name='q[body_contains]']")
     end
 
     it "should have a proper label" do
-      body.should have_tag('label', 'Body')
+      expect(body).to have_selector("label", text: "Body")
     end
   end
 
   describe "string attribute, as a select" do
     let(:body) { filter :title, as: :select }
-    let(:builder) { ActiveAdmin::Inputs::FilterSelectInput }
+    let(:builder) { ActiveAdmin::Inputs::Filters::SelectInput }
 
     context "when loading collection from DB" do
       it "should use pluck for efficiency" do
-        builder.any_instance.should_receive(:pluck_column) { [] }
+        expect_any_instance_of(builder).to receive(:pluck_column) { [] }
         body
       end
 
       it "should remove original ordering to prevent PostgreSQL error" do
-        scope.base.should_receive(:reorder).with('title asc') {
-          m = mock uniq: mock(pluck: ['A Title'])
-          m.uniq.should_receive(:pluck).with :title
+        expect(scope.object.klass).to receive(:reorder).with('title asc') {
+          m = double uniq: double(pluck: ['A Title'])
+          expect(m.uniq).to receive(:pluck).with :title
           m
         }
         body
       end
     end
-  end unless Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR < 2
+  end
 
   describe "datetime attribute" do
-    let(:body) { filter :created_at }
+    let(:body) { Capybara.string(filter :created_at) }
 
     it "should generate a date greater than" do
-      body.should have_tag("input", :attributes => { :name => "q[created_at_gte]", :class => "datepicker"})
+      expect(body).to have_selector("input.datepicker[name='q[created_at_gteq]']")
     end
     it "should generate a seperator" do
-      body.should have_tag("span", :attributes => { :class => "seperator"})
+      expect(body).to have_selector("span.seperator")
     end
     it "should generate a date less than" do
-      body.should have_tag("input", :attributes => { :name => "q[created_at_lte]", :class => "datepicker"})
+      expect(body).to have_selector("input.datepicker[name='q[created_at_lteq]']")
     end
   end
 
   describe "integer attribute" do
-    let(:body) { filter :id }
+    let(:body) { Capybara.string(filter :id) }
 
     it "should generate a select option for equal to" do
-      body.should have_tag("option", "Equals", :attributes => { :value => 'id_equals' })
+      expect(body).to have_selector("option[value=id_equals]", text: "Equals")
     end
     it "should generate a select option for greater than" do
-      body.should have_tag("option", "Greater than")
+      expect(body).to have_selector("option", text: "Greater than")
     end
     it "should generate a select option for less than" do
-      body.should have_tag("option", "Less than")
+      expect(body).to have_selector("option", text: "Less than")
     end
     it "should generate a text field for input" do
-      body.should have_tag("input", :attributes => { :name => 'q[id_equals]' })
+      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
+      body = Capybara.string(render_filter scope, id: {})
+      expect(body).to have_selector("option[value=id_greater_than][selected=selected]", text: "Greater than")
     end
-    it "should select the option which is currently being filtered"
   end
 
   describe "boolean attribute" do
     context "boolean datatypes" do
-      let(:body) { filter :starred }
+      let(:body) { Capybara.string(filter :starred) }
 
-      it "should create a check box for equals to" do
-        body.should have_tag("input", :attributes => {
-                                            :name => "q[starred_eq]",
-                                            :type => "checkbox" })
+      it "should generate a select" do
+        expect(body).to have_selector("select[name='q[starred_eq]']")
+      end
+      it "should set the default text to 'Any'" do
+        expect(body).to have_selector("option[value='']", text: "Any")
+      end
+      it "should create an option for true and false" do
+        expect(body).to have_selector("option[value=true]", text: "Yes")
+        expect(body).to have_selector("option[value=false]", text: "No")
       end
 
       it "should translate the label for boolean field" do
-        begin
-          I18n.backend.store_translations(:en, :activerecord => { :attributes => { :post => { :starred => "Faved" } } })
-          body.should have_tag('label', 'Faved')
-        ensure
-          I18n.backend.reload!
+        with_translation activerecord: {attributes: {post: {starred: 'Faved'}}} do
+          expect(body).to have_selector("label", text: "Faved")
         end
       end
     end
 
     context "non-boolean data types" do
-      let(:body) { filter :title_is_present, :as => :boolean }
+      let(:body) { Capybara.string(filter :title_present, as: :boolean) }
 
-      it "should create a check box for equals to" do
-        body.should have_tag("input", :attributes => {
-                                            :name => "q[title_is_present]",
-                                            :type => "checkbox" })
+      it "should generate a select" do
+        expect(body).to have_selector("select[name='q[title_present]']")
+      end
+      it "should set the default text to 'Any'" do
+        expect(body).to have_selector("option[value='']", text: "Any")
+      end
+      it "should create an option for true and false" do
+        expect(body).to have_selector("option[value=true]", text: "Yes")
+        expect(body).to have_selector("option[value=false]", text: "No")
       end
     end
   end
 
   describe "belongs_to" do
     before do
-      @john = User.create :first_name => "John", :last_name => "Doe", :username => "john_doe"
-      @jane = User.create :first_name => "Jane", :last_name => "Doe", :username => "jane_doe"
+      @john = User.create first_name: "John", last_name: "Doe", username: "john_doe"
+      @jane = User.create first_name: "Jane", last_name: "Doe", username: "jane_doe"
     end
 
     context "when given as the _id attribute name" do
-      let(:body) { filter :author_id }
+      let(:body) { Capybara.string(filter :author_id) }
 
       it "should generate a numeric filter" do
-        body.should have_tag 'label', 'Author' # really this should be Author ID :/
-        body.should have_tag 'option', :attributes => { :value => 'author_id_less_than' }
-        body.should have_tag 'input',  :attributes => { :id => 'q_author_id', :name => 'q[author_id_equals]'}
+        expect(body).to have_selector("label", text: "Author") # really this should be Author ID :/)
+        expect(body).to have_selector("option[value=author_id_less_than]")
+        expect(body).to have_selector("input#q_author_id[name='q[author_id_equals]']")
       end
     end
 
     context "when given as the name of the relationship" do
-      let(:body) { filter :author }
+      let(:body) { Capybara.string(filter :author) }
 
       it "should generate a select" do
-        body.should have_tag "select",             :attributes => { :name => "q[author_id_eq]" }
+        expect(body).to have_selector("select[name='q[author_id_eq]']")
       end
       it "should set the default text to 'Any'" do
-        body.should have_tag "option", "Any",      :attributes => { :value => "" }
+        expect(body).to have_selector("option[value='']", text: "Any")
       end
       it "should create an option for each related object" do
-        body.should have_tag "option", "John Doe", :attributes => { :value => @john.id }
-        body.should have_tag "option", "Jane Doe", :attributes => { :value => @jane.id }
+        expect(body).to have_selector("option[value='#{@john.id}']", text: "John Doe")
+        expect(body).to have_selector("option[value='#{@jane.id}']", text: "Jane Doe")
       end
 
       context "with a proc" do
         let :body do
-          filter :title, :as => :select, :collection => proc{ ['Title One', 'Title Two'] }
+          Capybara.string(filter :title, as: :select, collection: proc{ ['Title One', 'Title Two'] })
         end
 
         it "should use call the proc as the collection" do
-          body.should have_tag("option", "Title One")
-          body.should have_tag("option", "Title Two")
+          expect(body).to have_selector("option", text: "Title One")
+          expect(body).to have_selector("option", text: "Title Two")
         end
 
         it "should render the collection in the context of the view" do
-          body = filter(:title, :as => :select, :collection => proc{[a_helper_method]})
-          body.should have_tag("option", "A Helper Method")
+          body = Capybara.string(filter(:title, as: :select, collection: proc{[a_helper_method]}))
+          expect(body).to have_selector("option", text: "A Helper Method")
         end
       end
     end
 
     context "as check boxes" do
-      let(:body) { filter :author, :as => :check_boxes }
+      let(:body) { Capybara.string(filter :author, as: :check_boxes) }
 
       it "should create a check box for each related object" do
-        body.should have_tag("input", :attributes => {
-                                            :name => "q[author_id_in][]",
-                                            :type => "checkbox",
-                                            :value => @john.id })
-        body.should have_tag("input", :attributes => {
-                                            :name => "q[author_id_in][]",
-                                            :type => "checkbox",
-                                            :value => @jane.id })
+        expect(body).to have_selector("input[type=checkbox][name='q[author_id_in][]'][value='#{@jane.id}']")
+        expect(body).to have_selector("input[type=checkbox][name='q[author_id_in][]'][value='#{@jane.id}']")
       end
     end
 
     context "when polymorphic relationship" do
+      let(:scope) { ActiveAdmin::Comment.search }
       it "should raise an error if a collection isn't provided" do
-        expect {
-          search = ActiveAdmin::Comment.search
-          render_filter(search, [{:attribute => :resource}])
-        }.to raise_error Formtastic::PolymorphicInputWithoutCollectionError
+        expect { filter :resource }.to raise_error \
+          Formtastic::PolymorphicInputWithoutCollectionError
+      end
+    end
+
+    context "when using a custom foreign key" do
+      let(:scope) { Post.search }
+      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
+        expect(body).to have_selector("select[name='q[category_id_eq]']")
       end
     end
   end # belongs to
 
   describe "has_and_belongs_to_many" do
-    pending "add HABTM models so this can be mocked out"
+    skip "add HABTM models so this can be tested"
+  end
+
+  describe "has_many :through" do
+    # Setup an ActionView::Base object which can be used for
+    # generating the form for.
+    let(:helpers) do
+      view = action_view
+      def view.collection_path
+        "/categories"
+      end
+
+      def view.protect_against_forgery?
+        false
+      end
+
+      def view.a_helper_method
+        "A Helper Method"
+      end
+
+      view
+    end
+    let(:scope) { Category.search }
+
+    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" }
+
+    context "when given as the name of the relationship" do
+      let(:body) { Capybara.string(filter :authors) }
+
+      it "should generate a select" do
+        expect(body).to have_selector("select[name='q[posts_author_id_eq]']")
+      end
+
+      it "should set the default text to 'Any'" do
+        expect(body).to have_selector("option[value='']", text: "Any")
+      end
+
+      it "should create an option for each related object" do
+        expect(body).to have_selector("option[value='#{john.id}']", text: "John Doe")
+        expect(body).to have_selector("option[value='#{jane.id}']", text: "Jane Doe")
+      end
+    end
+
+    context "as check boxes" do
+      let(:body) { Capybara.string(filter :authors, as: :check_boxes) }
+
+      it "should create a check box for each related object" do
+        expect(body).to have_selector("input[name='q[posts_author_id_in][]'][type=checkbox][value='#{john.id}']")
+        expect(body).to have_selector("input[name='q[posts_author_id_in][]'][type=checkbox][value='#{jane.id}']")
+      end
+    end
   end
 
   describe "conditional display" do
     [:if, :unless].each do |verb|
-      should   = verb == :if ? "should"     : "shouldn't"
-      if_true  = verb == :if ? :should      : :should_not
-      if_false = verb == :if ? :should_not  : :should
+      should   = verb == :if ? "should" : "shouldn't"
+      if_true  = verb == :if ? :to      : :to_not
+      if_false = verb == :if ? :to_not  : :to
       context "with #{verb.inspect} proc" do
         it "#{should} be displayed if true" do
-          body = filter :body, verb => proc{ true }
-          body.send if_true, have_tag("input", attributes: {name: "q[body_contains]"})
+          body = Capybara.string(filter :body, verb => proc{ true })
+          expect(body).send if_true,  have_selector("input[name='q[body_contains]']")
         end
         it "#{should} be displayed if false" do
-          body = filter :body, verb => proc{ false }
-          body.send if_false, have_tag("input", attributes: {name: "q[body_contains]"})
+          body = Capybara.string(filter :body, verb => proc{ false })
+          expect(body).send if_false, have_selector("input[name='q[body_contains]']")
         end
         it "should still be hidden on the second render" do
-          filters = [attribute: :body, verb => proc{ verb == :unless }]
+          filters = {body: { verb => proc{ verb == :unless }}}
           2.times do
-            body = render_filter scope, filters
-            body.should_not have_tag "input", attributes: {name: "q[body_contains]"}
+            body = Capybara.string(render_filter scope, filters)
+            expect(body).not_to have_selector("input[name='q[body_contains]']")
           end
         end
         it "should successfully keep rendering other filters after one is hidden" do
-          filters = [{attribute: :body, verb => proc{ verb == :unless }}, {attribute: :author}]
-          body    = render_filter scope, filters
-          body.should_not have_tag "input",  attributes: {name: "q[body_contains]"}
-          body.should     have_tag "select", attributes: {name: "q[author_id_eq]"}
+          filters = {body: { verb => proc{ verb == :unless }}, author: {}}
+          body    = Capybara.string(render_filter scope, filters)
+          expect(body).not_to have_selector("input[name='q[body_contains]']")
+          expect(body).to     have_selector("select[name='q[author_id_eq]']")
         end
       end
     end
@@ -341,32 +389,43 @@ describe ActiveAdmin::Filters::ViewHelper do
   describe "custom search methods" do
 
     it "should work as select" do
-      body = filter :custom_searcher, as: :select, collection: ['foo']
-      body.should have_tag "select", attributes: { name: "q[custom_searcher]" }
+      body = Capybara.string(filter :custom_searcher, as: :select, collection: ['foo'])
+      expect(body).to have_selector("select[name='q[custom_searcher]']")
     end
 
     it "should work as string" do
-      body = filter :custom_searcher, as: :string
-      body.should have_tag "input", attributes: { name: "q[custom_searcher]" }
+      body = Capybara.string(filter :custom_searcher, as: :string)
+      expect(body).to have_selector("input[name='q[custom_searcher]']")
+    end
+  end
+
+  describe "does not support some filter inputs" do
+    it "should fallback to use formtastic inputs" do
+      body = Capybara.string(filter :custom_searcher, as: :text)
+      expect(body).to have_selector("textarea[name='q[custom_searcher]']")
     end
   end
 
   describe "blank option" do
     context "for a select filter" do
       it "should be there by default" do
-        filter(:author).should have_tag "option", "Any"
+        body = Capybara.string(filter(:author))
+        expect(body).to have_selector("option", text: "Any")
       end
       it "should be able to be disabled" do
-        filter(:author, include_blank: false).should_not have_tag "option", "Any"
+        body = Capybara.string(filter(:author, include_blank: false))
+        expect(body).to_not have_selector("option", text: "Any")
       end
     end
 
     context "for a multi-select filter" do
       it "should not be there by default" do
-        filter(:author, multiple: true).should_not have_tag "option", "Any"
+        body = Capybara.string(filter(:author, multiple: true))
+        expect(body).to_not have_selector("option", text: "Any")
       end
       it "should be able to be enabled" do
-        filter(:author, multiple: true, include_blank: true).should have_tag "option", "Any"
+        body = Capybara.string(filter(:author, multiple: true, include_blank: true))
+        expect(body).to have_selector("option", text: "Any")
       end
     end
   end