yousty-activeadmin 1.0.4.pre → 1.0.5.pre

data/spec/unit/filters/resource_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ActiveAdmin::Filters::ResourceExtension do
 
@@ -7,48 +7,52 @@ describe ActiveAdmin::Filters::ResourceExtension do
     namespace.register(Post)
   end
 
+  it "should return a Hash" do
+    expect(resource.filters).to be_a Hash
+  end
+
   it "should return the defaults if no filters are set" do
-    resource.filters.keys.sort.should == [
-      :author, :body, :category, :created_at, :published_at, :starred, :title, :updated_at
-    ]
+    expect(resource.filters.keys).to match_array([
+      :author, :body, :category, :created_at, :custom_searcher, :position, :published_at, :starred, :taggings, :title, :updated_at
+    ])
   end
 
   it "should not have defaults when filters are disabled on the resource" do
     resource.filters = false
-    resource.filters.should be_empty
+    expect(resource.filters).to be_empty
   end
 
   it "should not have defaults when the filters are disabled on the namespace" do
     resource.namespace.filters = false
-    resource.filters.should be_empty
+    expect(resource.filters).to be_empty
   end
 
   it "should not have defaults when the filters are disabled on the application" do
     resource.namespace.application.filters = false
-    resource.filters.should be_empty
+    expect(resource.filters).to be_empty
   end
 
   describe "removing a filter" do
     it "should work" do
-      resource.filters.keys.should include :author
+      expect(resource.filters.keys).to include :author
       resource.remove_filter :author
-      resource.filters.keys.should_not include :author
+      expect(resource.filters.keys).to_not include :author
     end
 
     it "should work as a string" do
-      resource.filters.keys.should include :author
+      expect(resource.filters.keys).to include :author
       resource.remove_filter 'author'
-      resource.filters.keys.should_not include :author
+      expect(resource.filters.keys).to_not include :author
     end
 
     it "should be lazy" do
-      resource.should_not_receive :default_filters # this hits the DB
+      expect(resource).to_not receive :default_filters # this hits the DB
       resource.remove_filter :author
     end
 
     it "should not prevent the default filters from being added" do
       resource.remove_filter :author
-      resource.filters.should_not be_empty
+      expect(resource.filters).to_not be_empty
     end
 
     it "should raise an exception when filters are disabled" do
@@ -57,46 +61,44 @@ describe ActiveAdmin::Filters::ResourceExtension do
     end
   end
 
+  describe "removing a multiple filters inline" do
+    it "should work" do
+      expect(resource.filters.keys).to include :author, :body
+      resource.remove_filter :author, :body
+      expect(resource.filters.keys).to_not include :author, :body
+    end
+  end
+
   describe "adding a filter" do
     it "should work" do
       resource.add_filter :title
-      resource.filters.should eq title: {}
+      expect(resource.filters).to eq title: {}
     end
 
     it "should work as a string" do
       resource.add_filter 'title'
-      resource.filters.should eq title: {}
+      expect(resource.filters).to eq title: {}
     end
 
     it "should work with specified options" do
       resource.add_filter :title, as: :string
-      resource.filters.should eq title: {as: :string}
+      expect(resource.filters).to eq title: {as: :string}
     end
 
     it "should override an existing filter" do
       resource.add_filter :title, one: :two
       resource.add_filter :title, three: :four
 
-      resource.filters.should eq title: {three: :four}
-    end
-
-    it "should keep specified options" do
-      resource.add_filter :title, one: :two
-
-      resource.filters.each do |attribute, opts|
-        opts.delete(:one)
-      end
-
-      resource.filters.should eq title: {one: :two}
+      expect(resource.filters).to eq title: {three: :four}
     end
 
     it "should preserve default filters" do
       resource.preserve_default_filters!
       resource.add_filter :count, as: :string
 
-      resource.filters.keys.sort.should == [
-        :author, :body, :category, :count, :created_at, :published_at, :starred, :title, :updated_at
-      ]
+      expect(resource.filters.keys).to match_array([
+        :author, :body, :category, :count, :created_at, :custom_searcher, :position, :published_at, :starred, :taggings, :title, :updated_at
+      ])
     end
 
     it "should raise an exception when filters are disabled" do
@@ -107,13 +109,13 @@ describe ActiveAdmin::Filters::ResourceExtension do
 
   it "should reset filters" do
     resource.add_filter :title
-    resource.filters.size.should == 1
+    expect(resource.filters.size).to eq 1
     resource.reset_filters!
-    resource.filters.size.should > 1
+    expect(resource.filters.size).to be > 1
   end
 
   it "should add a sidebar section for the filters" do
-    resource.sidebar_sections.first.name.should == :filters
+    expect(resource.sidebar_sections.first.name).to eq :filters
   end
 
 end

data/spec/unit/form_builder_spec.rb

@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'rails_helper'
+require "rspec/mocks/standalone"
 
 describe ActiveAdmin::FormBuilder do
 
@@ -15,7 +16,7 @@ describe ActiveAdmin::FormBuilder do
     end
 
     def view.url_for(*args)
-      if args.first == {:action => "index"}
+      if args.first == {action: "index"}
         posts_path
       else
         super
@@ -30,11 +31,45 @@ describe ActiveAdmin::FormBuilder do
   end
 
   def build_form(options = {}, form_object = Post.new, &block)
-    options = {:url => helpers.posts_path}.merge(options)
+    options = {url: helpers.posts_path}.merge(options)
 
-    render_arbre_component({:form_object => form_object, :form_options => options, :form_block => block}, helpers)do
-      text_node active_admin_form_for(assigns[:form_object], assigns[:form_options], &assigns[:form_block])
+    form = render_arbre_component({form_object: form_object, form_options: options, form_block: block}, helpers) do
+      active_admin_form_for(assigns[:form_object], assigns[:form_options], &assigns[:form_block])
     end.to_s
+
+    Capybara.string(form)
+  end
+
+  context "in general" do
+    context "it without custom settings" do
+      let :body do
+        build_form do |f|
+          f.inputs do
+            f.input :title
+            f.input :body
+          end
+        end
+      end
+
+      it "should generate a fieldset with a inputs class" do
+        expect(body).to have_selector("fieldset.inputs")
+      end
+    end
+
+    context "it with custom settings" do
+      let :body do
+        build_form do |f|
+          f.inputs class: "custom_class" do
+            f.input :title
+            f.input :body
+          end
+        end
+      end
+
+      it "should generate a fieldset with a inputs and custom class" do
+        expect(body).to have_selector("fieldset.inputs.custom_class")
+      end
+    end
   end
 
   context "in general with actions" do
@@ -45,27 +80,24 @@ describe ActiveAdmin::FormBuilder do
           f.input :body
         end
         f.actions do
-          f.action :submit, :label => "Submit Me"
-          f.action :submit, :label => "Another Button"
+          f.action :submit, label: "Submit Me"
+          f.action :submit, label: "Another Button"
         end
       end
     end
 
    it "should generate a text input" do
-      body.should have_tag("input", :attributes => { :type => "text",
-                                                     :name => "post[title]" })
+      expect(body).to have_selector("input[type=text][name='post[title]']")
     end
     it "should generate a textarea" do
-      body.should have_tag("textarea", :attributes => { :name => "post[body]" })
+      expect(body).to have_selector("textarea[name='post[body]']")
     end
     it "should only generate the form once" do
-      body.scan(/Title/).size.should == 1
+      expect(body).to have_selector("form", count: 1)
     end
     it "should generate actions" do
-      body.should have_tag("input", :attributes => {  :type => "submit",
-                                                          :value => "Submit Me" })
-      body.should have_tag("input", :attributes => {  :type => "submit",
-                                                          :value => "Another Button" })
+      expect(body).to have_selector("input[type=submit][value='Submit Me']")
+      expect(body).to have_selector("input[type=submit][value='Another Button']")
     end
   end
 
@@ -73,7 +105,7 @@ describe ActiveAdmin::FormBuilder do
     it "should raise error" do
       expect {
         comment = ActiveAdmin::Comment.new
-        build_form({:url => "admins/comments"}, comment) do |f|
+        build_form({url: "admins/comments"}, comment) do |f|
           f.inputs :resource
         end
       }.to raise_error(Formtastic::PolymorphicInputWithoutCollectionError)
@@ -82,29 +114,30 @@ describe ActiveAdmin::FormBuilder do
 
   describe "passing in options with actions" do
     let :body do
-      build_form :html => { :multipart => true } do |f|
+      build_form html: { multipart: true } do |f|
         f.inputs :title
         f.actions
       end
     end
     it "should pass the options on to the form" do
-      body.should have_tag("form", :attributes => { :enctype => "multipart/form-data" })
+      expect(body).to have_selector("form[enctype='multipart/form-data']")
     end
   end
 
-  describe "passing in options with actions" do
-    let :body do
-      build_form :html => { :multipart => true } do |f|
-        f.inputs :title
-        f.actions
+  if Rails::VERSION::MAJOR > 3
+    context "file input present" do
+      let :body do
+        build_form do |f|
+          f.input :body, as: :file
+        end
+      end
+
+      it "adds multipart attribute automatically" do
+        expect(body).to have_selector("form[enctype='multipart/form-data']")
       end
-    end
-    it "should pass the options on to the form" do
-      body.should have_tag("form", :attributes => { :enctype => "multipart/form-data" })
     end
   end
 
-
   context "with actions" do
     it "should generate the form once" do
       body = build_form do |f|
@@ -113,54 +146,66 @@ describe ActiveAdmin::FormBuilder do
         end
         f.actions
       end
-      body.scan(/id="post_title"/).size.should == 1
+      expect(body).to have_selector("[id=post_title]", count: 1)
     end
     it "should generate one button and a cancel link" do
       body = build_form do |f|
         f.actions
       end
-      body.scan(/type="submit"/).size.should == 1
-      body.scan(/class="cancel"/).size.should == 1
+      expect(body).to have_selector("[type=submit]", count: 1)
+      expect(body).to have_selector("[class=cancel]", count: 1)
     end
     it "should generate multiple actions" do
       body = build_form do |f|
         f.actions do
-          f.action :submit, :label => "Create & Continue"
-          f.action :submit, :label => "Create & Edit"
+          f.action :submit, label: "Create & Continue"
+          f.action :submit, label: "Create & Edit"
         end
       end
-      body.scan(/type="submit"/).size.should == 2
-      body.scan(/class="cancel"/).size.should == 0
+      expect(body).to have_selector("[type=submit]", count: 2)
+      expect(body).to have_selector("[class=cancel]", count: 0)
     end
 
   end
 
-  context "with actions" do
-    it "should generate the form once" do
+  context "with Arbre inside" do
+    it "should render the Arbre in the expected place" do
       body = build_form do |f|
+        div do
+          h1 'Heading'
+        end
         f.inputs do
+          span 'Top note'
           f.input :title
+          span 'Bottom note'
         end
+        h3 'Footer'
         f.actions
       end
-      body.scan(/id="post_title"/).size.should == 1
-    end
-    it "should generate one button and a cancel link" do
-      body = build_form do |f|
-        f.actions
-      end
-      body.scan(/type="submit"/).size.should == 1
-      body.scan(/class="cancel"/).size.should == 1
+
+      expect(body).to have_selector("div > h1")
+      expect(body).to have_selector("h1", count: 1)
+      expect(body).to have_selector(".inputs > ol > span")
+      expect(body).to have_selector("span", count: 2)
     end
-    it "should generate multiple actions" do
+    it "should allow a simplified syntax" do
       body = build_form do |f|
-        f.actions do
-          f.action :submit, :label => "Create & Continue"
-          f.action :submit, :label => "Create & Edit"
+        div do
+          h1 'Heading'
+        end
+        inputs do
+          span 'Top note'
+          input :title
+          span 'Bottom note'
         end
+        h3 'Footer'
+        actions
       end
-      body.scan(/type="submit"/).size.should == 2
-      body.scan(/class="cancel"/).size.should == 0
+
+      expect(body).to have_selector("div > h1")
+      expect(body).to have_selector("h1", count: 1)
+      expect(body).to have_selector(".inputs > ol > span")
+      expect(body).to have_selector("span", count: 2)
     end
   end
 
@@ -171,11 +216,10 @@ describe ActiveAdmin::FormBuilder do
       end
     end
     it "should have a title input" do
-      body.should have_tag("input", :attributes => { :type => "text",
-                                                          :name => "post[title]" })
+      expect(body).to have_selector("input[type=text][name='post[title]']")
     end
     it "should have a body textarea" do
-      body.should have_tag("textarea", :attributes => { :name => "post[body]" })
+      expect(body).to have_selector("textarea[name='post[body]']")
     end
   end
 
@@ -186,7 +230,7 @@ describe ActiveAdmin::FormBuilder do
           f.input :title
           f.input :body
         end
-        f.instance_eval do
+        f.form_builder.instance_eval do
           @object.author = User.new
         end
         f.semantic_fields_for :author do |author|
@@ -195,35 +239,35 @@ describe ActiveAdmin::FormBuilder do
       end
     end
     it "should generate a nested text input once" do
-      body.scan("post_author_attributes_first_name_input").size.should == 1
+      expect(body).to have_selector("[id=post_author_attributes_first_name_input]", count: 1)
     end
   end
 
   context "with collection inputs" do
     before do
-      User.create :first_name => "John", :last_name => "Doe"
-      User.create :first_name => "Jane", :last_name => "Doe"
+      User.create first_name: "John", last_name: "Doe"
+      User.create first_name: "Jane", last_name: "Doe"
     end
 
     describe "as select" do
       let :body do
         build_form do |f|
-          f.input :author
+          f.input :author, include_blank: false
         end
       end
       it "should create 2 options" do
-        body.scan(/<option/).size.should == 3
+        expect(body).to have_selector("option", count: 2)
       end
     end
 
     describe "as radio buttons" do
       let :body do
         build_form do |f|
-          f.input :author, :as => :radio
+          f.input :author, as: :radio
         end
       end
       it "should create 2 radio buttons" do
-        body.scan(/type="radio"/).size.should == 2
+        expect(body).to have_selector("[type=radio]", count: 2)
       end
     end
 
@@ -236,159 +280,222 @@ describe ActiveAdmin::FormBuilder do
           f.input :title
           f.input :body
         end
-        f.instance_eval do
+        f.form_builder.instance_eval do
           @object.author = User.new
         end
-        f.inputs :name => 'Author', :for => :author do |author|
+        f.inputs name: 'Author', for: :author do |author|
           author.inputs :first_name, :last_name
         end
       end
     end
     it "should generate a nested text input once" do
-      body.scan("post_author_attributes_first_name_input").size.should == 1
+      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 an author first name field" do
-      body.should have_tag("input", :attributes => { :name => "post[author_attributes][first_name]"})
+    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]']")
+    end
+  end
+
+  context "with two input fields '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.input :first_name
+          author.input :last_name
+        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]']")
     end
   end
 
   context "with wrapper html" do
     it "should set a class" do
       body = build_form do |f|
-        f.input :title, :wrapper_html => { :class => "important" }
+        f.input :title, wrapper_html: { class: "important" }
+      end
+      expect(body).to have_selector("li[class='important string input optional stringish']")
+    end
+  end
+
+  context "with inputs twice" do
+    let :body do
+      build_form do |f|
+        f.inputs do
+          f.input :title
+          f.input :body
+        end
+        f.inputs do
+          f.input :author
+          f.input :published_at
+        end
       end
-      body.should have_tag("li", :attributes => {:class => "important string input optional stringish"})
+    end
+    it "should render four inputs" do
+      expect(body).to have_selector("input[name='post[title]']", count: 1)
+      expect(body).to have_selector("textarea[name='post[body]']", count: 1)
+      expect(body).to have_selector("select[name='post[author_id]']", count: 1)
+      expect(body).to have_selector("select[name='post[published_at(1i)]']", count: 1)
+      expect(body).to have_selector("select[name='post[published_at(2i)]']", count: 1)
+      expect(body).to have_selector("select[name='post[published_at(3i)]']", count: 1)
+      expect(body).to have_selector("select[name='post[published_at(4i)]']", count: 1)
     end
   end
 
   context "with has many inputs" do
     describe "with simple block" do
       let :body do
-        build_form({:url => '/categories'}, Category.new) do |f|
+        build_form({url: '/categories'}, Category.new) do |f|
           f.object.posts.build
           f.has_many :posts do |p|
             p.input :title
+            p.input :body
           end
+          f.inputs
         end
       end
 
+      let(:valid_html_id) { /^[A-Za-z]+[\w\-\:\.]*$/ }
+
       it "should translate the association name in header" do
-        begin
-          I18n.backend.store_translations(:en, :activerecord => { :models => { :post => { :one => "Blog Post", :other => "Blog Posts" } } })
-          body.should have_tag('h3', 'Blog Posts')
-        ensure
-          I18n.backend.reload!
+        with_translation activerecord: {models: {post: {one: 'Blog Post', other: 'Blog Posts'}}} do
+          expect(body).to have_selector("h3", text: "Blog Posts")
         end
       end
 
       it "should use model name when there is no translation for given model in header" do
-        body.should have_tag('h3', 'Post')
+        expect(body).to have_selector("h3", text: "Post")
       end
 
       it "should translate the association name in has many new button" do
-        begin
-          I18n.backend.store_translations(:en, :activerecord => { :models => { :post => { :one => "Blog Post", :other => "Blog Posts" } } })
-          body.should have_tag('a', 'Add New Blog Post')
-        ensure
-          I18n.backend.reload!
+        with_translation activerecord: {models: {post: {one: 'Blog Post', other: 'Blog Posts'}}} do
+          expect(body).to have_selector("a", text: "Add New Blog Post")
         end
       end
 
       it "should translate the attribute name" do
-        begin
-          I18n.backend.store_translations :en, :activerecord => { :attributes => { :post => { :title => 'A very nice title' } } }
-          body.should have_tag 'label', 'A very nice title'
-        ensure
-          I18n.backend.reload!
+        with_translation activerecord: {attributes: {post: {title: 'A very nice title'}}} do
+          expect(body).to have_selector("label", text: "A very nice title")
         end
       end
 
       it "should use model name when there is no translation for given model in has many new button" do
-        body.should have_tag('a', 'Add New Post')
+        expect(body).to have_selector("a", text: "Add New Post")
       end
 
       it "should render the nested form" do
-        body.should have_tag("input", :attributes => {:name => "category[posts_attributes][0][title]"})
+        expect(body).to have_selector("input[name='category[posts_attributes][0][title]']")
+        expect(body).to have_selector("textarea[name='category[posts_attributes][0][body]']")
       end
 
       it "should add a link to remove new nested records" do
-        Capybara.string(body).should have_css '.has_many > fieldset > ol > li > a', href: '#',
-          content: 'Remove', class: 'button has_many_remove', data: {placeholder: 'NEW_POST_RECORD'}
+        expect(body).to have_selector(".has_many_container > fieldset > ol > li > a.button.has_many_remove[href='#']", text: "Remove")
       end
 
       it "should add a link to add new nested records" do
-        Capybara.string(body).should have_css(".has_many > fieldset > ol > li > a", :class => "button", :href => "#", :content => "Add New Post")
+        expect(body).to have_selector(".has_many_container > a.button.has_many_add[href='#']", text: "Add New Post")
+      end
+
+      it "should set an HTML-id valid placeholder" do
+        link = body.find('.has_many_container > a.button.has_many_add')
+        expect(link[:'data-placeholder']).to match valid_html_id
+      end
+
+      describe "with namespaced model" do
+        it "should set an HTML-id valid placeholder" do
+          allow(Post).to receive(:name).and_return "ActiveAdmin::Post"
+          link = body.find('.has_many_container > a.button.has_many_add')
+          expect(link[:'data-placeholder']).to match valid_html_id
+        end
       end
     end
 
     describe "with complex block" do
       let :body do
-        build_form({:url => '/categories'}, Category.new) do |f|
+        build_form({url: '/categories'}, Category.new) do |f|
           f.object.posts.build
           f.has_many :posts do |p,i|
-            p.input :title, :label => "Title #{i}"
+            p.input :title, label: "Title #{i}"
           end
         end
       end
 
       it "should accept a block with a second argument" do
-        body.should have_tag("label", "Title 1")
+        expect(body).to have_selector("label", text: "Title 1")
       end
 
       it "should add a custom header" do
-        body.should have_tag('h3', 'Post')
+        expect(body).to have_selector("h3", text: "Post")
       end
 
     end
 
     describe "without heading and new record link" do
       let :body do
-        build_form({:url => '/categories'}, Category.new) do |f|
+        build_form({url: '/categories'}, Category.new) do |f|
           f.object.posts.build
-          f.has_many :posts, :heading => false, :new_record => false do |p|
+          f.has_many :posts, heading: false, new_record: false do |p|
             p.input :title
           end
         end
       end
 
       it "should not add a header" do
-        body.should_not have_tag('h3', 'Post')
+        expect(body).not_to have_selector("h3", text: "Post")
       end
 
       it "should not add link to new nested records" do
-        body.should_not have_tag('a', 'Add New Post')
+        expect(body).not_to have_selector("a", text: "Add New Post")
       end
 
+      it "should render the nested form" do
+        expect(body).to have_selector("input[name='category[posts_attributes][0][title]']")
+      end
     end
 
     describe "with custom heading" do
       let :body do
-        build_form({:url => '/categories'}, Category.new) do |f|
+        build_form({url: '/categories'}, Category.new) do |f|
           f.object.posts.build
-          f.has_many :posts, :heading => "Test heading" do |p|
+          f.has_many :posts, heading: "Test heading" do |p|
             p.input :title
           end
         end
       end
 
       it "should add a custom header" do
-        body.should have_tag('h3', 'Test heading')
+        expect(body).to have_selector("h3", "Test heading")
       end
 
     end
 
     describe "with custom new record link" do
       let :body do
-        build_form({:url => '/categories'}, Category.new) do |f|
+        build_form({url: '/categories'}, Category.new) do |f|
           f.object.posts.build
-          f.has_many :posts, :new_record => 'My Custom New Post' do |p|
+          f.has_many :posts, new_record: 'My Custom New Post' do |p|
             p.input :title
           end
         end
       end
 
       it "should add a custom new record link" do
-        body.should have_tag('a', 'My Custom New Post')
+        expect(body).to have_selector("a", text: "My Custom New Post")
       end
 
     end
@@ -396,49 +503,185 @@ describe ActiveAdmin::FormBuilder do
     describe "with allow destroy" do
       context "with an existing post" do
         let :body do
-          build_form({:url => '/categories'}, Category.new) do |f|
-            f.object.posts.build.stub(:new_record? => false)
-            f.has_many :posts, :allow_destroy => true do |p|
+          build_form({url: '/categories'}, Category.new) do |f|
+            allow(f.object.posts.build).to receive(:new_record?).and_return(false)
+            f.has_many :posts, allow_destroy: true do |p|
               p.input :title
             end
           end
         end
 
         it "should include a boolean field for _destroy" do
-          body.should have_tag("input", :attributes => {:name => "category[posts_attributes][0][_destroy]"})
+          expect(body).to have_selector("input[name='category[posts_attributes][0][_destroy]']")
         end
 
         it "should have a check box with 'Remove' as its label" do
-          body.should have_tag("label", :attributes => {:for => "category_posts_attributes_0__destroy"}, :content => "Delete")
+          expect(body).to have_selector("label[for=category_posts_attributes_0__destroy]", text: "Delete")
         end
 
         it "should wrap the destroy field in an li with class 'has_many_delete'" do
-          Capybara.string(body).should have_css(".has_many > fieldset > ol > li.has_many_delete > input")
+          expect(body).to have_selector(".has_many_container > fieldset > ol > li.has_many_delete > input", count: 1)
         end
       end
 
       context "with a new post" do
         let :body do
-          build_form({:url => '/categories'}, Category.new) do |f|
+          build_form({url: '/categories'}, Category.new) do |f|
             f.object.posts.build
-            f.has_many :posts, :allow_destroy => true do |p|
+            f.has_many :posts, allow_destroy: true do |p|
               p.input :title
             end
           end
         end
 
         it "should not have a boolean field for _destroy" do
-          body.should_not have_tag("input", :attributes => {:name => "category[posts_attributes][0][_destroy]"})
+          expect(body).not_to have_selector("input[name='category[posts_attributes][0][_destroy]']")
         end
 
         it "should not have a check box with 'Remove' as its label" do
-          body.should_not have_tag("label", :attributes => {:for => "category_posts_attributes_0__destroy"}, :content => "Remove")
+          expect(body).not_to have_selector("label[for=category_posts_attributes_0__destroy]", text: "Remove")
         end
       end
     end
 
-    pending "should render the block if it returns nil" do
-      body = build_form({:url => '/categories'}, Category.new) do |f|
+    describe "sortable" do
+      # TODO: it doesn't make any sense to use your foreign key as something that's sortable (and therefore editable)
+      context "with a new post" do
+        let :body do
+          build_form({url: '/categories'}, Category.new) do |f|
+            f.object.posts.build
+            f.has_many :posts, sortable: :position do |p|
+              p.input :title
+            end
+          end
+        end
+
+        it "shows the nested fields for unsaved records" do
+          expect(body).to have_selector("fieldset.inputs.has_many_fields")
+        end
+
+      end
+
+      context "with post returning nil for the sortable attribute" do
+        let :body do
+          build_form({url: '/categories'}, Category.new) do |f|
+            f.object.posts.build position: 3
+            f.object.posts.build
+            f.has_many :posts, sortable: :position do |p|
+              p.input :title
+            end
+          end
+        end
+
+        it "shows the nested fields for unsaved records" do
+          expect(body).to have_selector("fieldset.inputs.has_many_fields")
+        end
+
+      end
+
+      context "with existing and new posts" do
+        let! :category do
+          Category.create name: 'Name'
+        end
+        let! :post do
+          category.posts.create
+        end
+        let :body do
+          build_form({url: '/categories'}, category) do |f|
+            f.object.posts.build
+            f.has_many :posts, sortable: :position do |p|
+              p.input :title
+            end
+          end
+        end
+
+        it "shows the nested fields for saved and unsaved records" do
+          expect(body).to have_selector("fieldset.inputs.has_many_fields")
+        end
+      end
+
+      context "without sortable_start set" do
+        let :body do
+          build_form({url: '/categories'}, Category.new) do |f|
+            f.object.posts.build
+            f.has_many :posts, sortable: :position do |p|
+              p.input :title
+            end
+          end
+        end
+
+        it "defaults to 0" do
+          expect(body).to have_selector("div.has_many_container[data-sortable-start='0']")
+        end
+      end
+
+      context "with sortable_start set" do
+        let :body do
+          build_form({url: '/categories'}, Category.new) do |f|
+            f.object.posts.build
+            f.has_many :posts, sortable: :position, sortable_start: 15 do |p|
+              p.input :title
+            end
+          end
+        end
+
+        it "sets the data attribute" do
+          expect(body).to have_selector("div.has_many_container[data-sortable-start='15']")
+        end
+      end
+    end
+
+    describe "with nesting" do
+      context "in an inputs block" do
+        let :body do
+          build_form({url: '/categories'}, Category.new) do |f|
+            f.inputs "Field Wrapper" do
+              f.object.posts.build
+              f.has_many :posts do |p|
+                p.input :title
+              end
+            end
+          end
+        end
+
+        it "should wrap the has_many fieldset in an li" do
+          expect(body).to have_selector("ol > li.has_many_container")
+        end
+
+        it "should have a direct fieldset child" do
+          expect(body).to have_selector("li.has_many_container > fieldset")
+        end
+
+        it "should not contain invalid li children" do
+          expect(body).not_to have_selector("div.has_many_container > li")
+        end
+      end
+
+      context "in another has_many block" do
+        let :body do
+          build_form({url: '/categories'}, Category.new) do |f|
+            f.object.posts.build
+            f.has_many :posts do |p|
+              p.object.taggings.build
+              p.has_many :taggings do |t|
+                t.input :tag
+              end
+            end
+          end
+        end
+
+        it "should wrap the inner has_many fieldset in an ol > li" do
+          expect(body).to have_selector(".has_many_container ol > li.has_many_container > fieldset")
+        end
+
+        it "should not contain invalid li children" do
+          expect(body).not_to have_selector(".has_many_container div.has_many_container > li")
+        end
+      end
+    end
+
+    it "should render the block if it returns nil" do
+      body = build_form({url: '/categories'}, Category.new) do |f|
         f.object.posts.build
         f.has_many :posts do |p|
           p.input :title
@@ -446,22 +689,22 @@ describe ActiveAdmin::FormBuilder do
         end
       end
 
-      body.should have_tag("input", :attributes => {:name => "category[posts_attributes][0][title]"})
+      expect(body).to have_selector("input[name='category[posts_attributes][0][title]']")
     end
   end
 
   { # Testing that the same input can be used multiple times
-    "f.input :title, :as => :string"               => /id="post_title"/,
-    "f.input :title, :as => :text"                 => /id="post_title"/,
-    "f.input :created_at, :as => :time_select"     => /id="post_created_at_2i"/,
-    "f.input :created_at, :as => :datetime_select" => /id="post_created_at_2i"/,
-    "f.input :created_at, :as => :date_select"     => /id="post_created_at_2i"/,
+    "f.input :title, as: :string"               => "post_title",
+    "f.input :title, as: :text"                 => "post_title",
+    "f.input :created_at, as: :time_select"     => "post_created_at_2i",
+    "f.input :created_at, as: :datetime_select" => "post_created_at_2i",
+    "f.input :created_at, as: :date_select"     => "post_created_at_2i",
     # Testing that return values don't screw up the form
-    "f.input :title; nil"                          => /id="post_title"/,
-    "f.input :title; []"                           => /id="post_title"/,
-    "[:title].each{ |r| f.input r }"               => /id="post_title"/,
-    "[:title].map { |r| f.input r }"               => /id="post_title"/,
-  }.each do |source, regex|
+    "f.input :title; nil"                          => "post_title",
+    "f.input :title; []"                           => "post_title",
+    "[:title].each{ |r| f.input r }"               => "post_title",
+    "[:title].map { |r| f.input r }"               => "post_title",
+  }.each do |source, selector|
    it "should properly buffer `#{source}`" do
      body = build_form do |f|
        f.inputs do
@@ -469,7 +712,7 @@ describe ActiveAdmin::FormBuilder do
          eval source
        end
      end
-     body.scan(regex).size.should == 2
+     expect(body).to have_selector("[id=#{selector}]", count: 2)
    end
   end
 
@@ -478,14 +721,12 @@ describe ActiveAdmin::FormBuilder do
       let :body do
         build_form do |f|
           f.inputs do
-            f.input :created_at, :as => :datepicker
+            f.input :created_at, as: :datepicker
           end
         end
       end
       it "should generate a text input with the class of datepicker" do
-        body.should have_tag("input", :attributes => {  :type => "text",
-                                                            :class => "datepicker",
-                                                            :name => "post[created_at]" })
+        expect(body).to have_selector("input.datepicker[type=text][name='post[created_at]']")
       end
     end
 
@@ -493,22 +734,19 @@ describe ActiveAdmin::FormBuilder do
       let :body do
         build_form do |f|
           f.inputs do
-            f.input :created_at, :as => :datepicker,
-                                  :datepicker_options => {
-                                    :min_date => Date.new(2013, 10, 18),
-                                    :max_date => "2013-12-31" }
+            f.input :created_at, as: :datepicker,
+                                  datepicker_options: {
+                                    min_date: Date.new(2013, 10, 18),
+                                    max_date: "2013-12-31" }
           end
         end
-        it 'should generate a datepicker text input with data min and max dates' do
-          body.should have_tag("input", :attributes => { :type => "text",
-                                                            :class => "datepicker",
-                                                            :name => "post[created_at]",
-                                                            :data => { :datepicker_options => {
-                                                              :minDate => "2013-10-18",
-                                                              :maxDate => "2013-12-31" }.to_json }})
-        end
+      end
+
+      it 'should generate a datepicker text input with data min and max dates' do
+        selector = "input.datepicker[type=text][name='post[created_at]']"
+        expect(body).to have_selector(selector)
+        expect(body.find(selector)["data-datepicker-options"]).to eq({ minDate: '2013-10-18', maxDate: '2013-12-31' }.to_json)
       end
     end
   end
-
 end