cocoon 1.1.2 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

data/cocoon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cocoon"
-  s.version = "1.1.2"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Van der Auwera"]
-  s.date = "2013-01-21"
+  s.date = "2013-07-10"
   s.description = "Unobtrusive nested forms handling, using jQuery. Use this and discover cocoon-heaven."
   s.email = "nathan@dixis.com"
   s.extra_rdoc_files = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".travis.yml",
     "Gemfile",
+    "Gemfile.lock",
     "History.md",
     "MIT-LICENSE",
     "README.markdown",
@@ -25,6 +26,8 @@ Gem::Specification.new do |s|
     "VERSION",
     "app/assets/javascripts/cocoon.js",
     "cocoon.gemspec",
+    "gemfiles/Gemfile.rails-3.2.13",
+    "gemfiles/Gemfile.rails-3.2.13.lock",
     "lib/cocoon.rb",
     "lib/cocoon/view_helpers.rb",
     "lib/generators/cocoon/install/install_generator.rb",
@@ -48,6 +51,7 @@ Gem::Specification.new do |s|
     "spec/dummy/config/initializers/backtrace_silencers.rb",
     "spec/dummy/config/initializers/inflections.rb",
     "spec/dummy/config/initializers/mime_types.rb",
+    "spec/dummy/config/initializers/rails_version_helper.rb",
     "spec/dummy/config/initializers/secret_token.rb",
     "spec/dummy/config/initializers/session_store.rb",
     "spec/dummy/config/locales/en.yml",
@@ -70,48 +74,53 @@ Gem::Specification.new do |s|
     "spec/dummy/script/rails",
     "spec/generators/install_generator_spec.rb",
     "spec/integration/navigation_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/support/rails_version_helper.rb",
+    "spec/support/shared_examples.rb"
   ]
   s.homepage = "http://github.com/nathanvda/cocoon"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "gem that enables easier nested forms with standard forms, formtastic and simple-form"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_development_dependency(%q<rails>, [">= 4.0.0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<json_pure>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rspec-rails>, [">= 2.6.0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.6.0"])
-      s.add_development_dependency(%q<actionpack>, [">= 3.0.0"])
+      s.add_development_dependency(%q<rspec-rails>, [">= 2.8.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.8.0"])
+      s.add_development_dependency(%q<actionpack>, [">= 4.0.0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<nokogiri>, [">= 0"])
       s.add_development_dependency(%q<generator_spec>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
     else
-      s.add_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_dependency(%q<rails>, [">= 4.0.0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<json_pure>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rspec-rails>, [">= 2.6.0"])
-      s.add_dependency(%q<rspec>, [">= 2.6.0"])
-      s.add_dependency(%q<actionpack>, [">= 3.0.0"])
+      s.add_dependency(%q<rspec-rails>, [">= 2.8.0"])
+      s.add_dependency(%q<rspec>, [">= 2.8.0"])
+      s.add_dependency(%q<actionpack>, [">= 4.0.0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<generator_spec>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.0.0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.0.0"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+    s.add_dependency(%q<rails>, [">= 4.0.0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<json_pure>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rspec-rails>, [">= 2.6.0"])
-    s.add_dependency(%q<rspec>, [">= 2.6.0"])
-    s.add_dependency(%q<actionpack>, [">= 3.0.0"])
+    s.add_dependency(%q<rspec-rails>, [">= 2.8.0"])
+    s.add_dependency(%q<rspec>, [">= 2.8.0"])
+    s.add_dependency(%q<actionpack>, [">= 4.0.0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<generator_spec>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.0.0"])
   end

data/gemfiles/Gemfile.rails-3.2.13

@@ -0,0 +1,21 @@
+source "http://rubygems.org"
+
+
+group :development, :test do
+  gem "rails", "~> 3.2.0"
+  gem "sqlite3"
+  gem "json_pure"
+  gem "jeweler"
+  gem "rspec-rails", ">= 2.8.0"
+  gem "rspec",       ">= 2.8.0"
+  gem "actionpack",  "~> 3.2.0"
+  gem "simplecov", :require => false
+
+  gem 'nokogiri'
+
+  gem "generator_spec"
+end
+
+# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
+# gem 'ruby-debug'
+# gem 'ruby-debug19'

data/gemfiles/Gemfile.rails-3.2.13.lock

@@ -0,0 +1,154 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    addressable (2.3.5)
+    arel (3.0.2)
+    builder (3.0.4)
+    diff-lcs (1.2.4)
+    erubis (2.7.0)
+    faraday (0.8.7)
+      multipart-post (~> 1.1)
+    generator_spec (0.9.0)
+      activerecord (>= 3.0, <= 4.0)
+      railties (>= 3.0, <= 4.0)
+    git (1.2.5)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (2.0.5)
+    highline (1.6.19)
+    hike (1.2.3)
+    httpauth (0.2.0)
+    i18n (0.6.1)
+    jeweler (1.8.6)
+      builder
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
+      rake
+      rdoc
+    journey (1.0.4)
+    json (1.8.0)
+    json_pure (1.8.0)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.23)
+    multi_json (1.7.7)
+    multi_xml (0.5.4)
+    multipart-post (1.2.0)
+    nokogiri (1.5.10)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    polyglot (0.3.3)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
+      bundler (~> 1.0)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.1.0)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rspec (2.14.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.2)
+    rspec-expectations (2.14.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.1)
+    rspec-rails (2.14.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.7)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.14)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (~> 3.2.0)
+  generator_spec
+  jeweler
+  json_pure
+  nokogiri
+  rails (~> 3.2.0)
+  rspec (>= 2.8.0)
+  rspec-rails (>= 2.8.0)
+  simplecov
+  sqlite3

data/lib/cocoon.rb

@@ -4,7 +4,9 @@ module Cocoon
   class Engine < ::Rails::Engine
 
     config.before_initialize do
-      config.action_view.javascript_expansions[:cocoon] = %w(cocoon)
+      if config.action_view.javascript_expansions
+        config.action_view.javascript_expansions[:cocoon] = %w(cocoon)
+      end
     end
 
     # configure our plugin on boot

data/lib/cocoon/view_helpers.rb

@@ -121,6 +121,10 @@ module Cocoon
     end
 
     def create_object_with_conditions(instance)
+      # in rails 4, an association is defined with a proc
+      # and I did not find how to extract the conditions from a scope
+      # except building from the scope, but then why not just build from the
+      # association???
       conditions = instance.respond_to?(:conditions) ? instance.conditions.flatten : []
       instance.klass.new(*conditions)
     end

data/spec/cocoon_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'nokogiri'
 
 describe Cocoon do
   class TestClass < ActionView::Base
@@ -13,7 +14,7 @@ describe Cocoon do
   before(:each) do
     @tester = TestClass.new
     @post = Post.new
-    @form_obj = stub(:object => @post, :object_name => @post.class.name)
+    @form_obj = double(:object => @post, :object_name => @post.class.name)
   end
 
 
@@ -23,21 +24,31 @@ describe Cocoon do
     end
 
     context "without a block" do
-      it "accepts a name" do
-        result = @tester.link_to_add_association('add something', @form_obj, :comments)
-        result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="form&lt;tag&gt;" data-association="comment" data-associations="comments">add something</a>'
+
+      context "and given a name" do
+        before do
+          @html = @tester.link_to_add_association('add something', @form_obj, :comments)
+        end
+
+        it_behaves_like "a correctly rendered add link", {}
       end
 
-      it "accepts html options and pass them to link_to" do
-        result = @tester.link_to_add_association('add something', @form_obj, :comments, {:class => 'something silly'})
-        result.to_s.should == '<a href="#" class="something silly add_fields" data-association-insertion-template="form&lt;tag&gt;" data-association="comment" data-associations="comments">add something</a>'
+      context "and given html options to pass them to link_to" do
+        before do
+          @html = @tester.link_to_add_association('add something', @form_obj, :comments, {:class => 'something silly'})
+        end
+
+        it_behaves_like "a correctly rendered add link", {class: 'something silly add_fields' }
       end
 
-      it "allows to explicitly hand the wanted partial" do
-        @tester.unstub(:render_association)
-        @tester.should_receive(:render_association).with(anything(), anything(), anything(), anything(), "shared/partial").and_return('partiallll')
-        result = @tester.link_to_add_association('add something', @form_obj, :comments, :partial => "shared/partial")
-        result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="partiallll" data-association="comment" data-associations="comments">add something</a>'
+      context "and explicitly specifying the wanted partial" do
+        before do
+          @tester.unstub(:render_association)
+          @tester.should_receive(:render_association).with(anything(), anything(), anything(), anything(), "shared/partial").and_return('partiallll')
+          @html = @tester.link_to_add_association('add something', @form_obj, :comments, :partial => "shared/partial")
+        end
+
+        it_behaves_like "a correctly rendered add link", {template: "partiallll"}
       end
 
       it "gives an opportunity to wrap/decorate created objects" do
@@ -47,61 +58,101 @@ describe Cocoon do
       end
 
       context "force non association create" do
-        it "default it uses the association" do
-          @tester.should_receive(:create_object).with(anything, :comments , false)
-          result = @tester.link_to_add_association('add something', @form_obj, :comments)
-          result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="form&lt;tag&gt;" data-association="comment" data-associations="comments">add something</a>'
-        end
-        it "specifying false is the same as default: create object on association" do
-          @tester.should_receive(:create_object).with(anything, :comments , false)
-          result = @tester.link_to_add_association('add something', @form_obj, :comments, :force_non_association_create => false)
-          result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="form&lt;tag&gt;" data-association="comment" data-associations="comments">add something</a>'
+        context "default case: create object on association" do
+          before do
+            @tester.should_receive(:create_object).with(anything, :comments , false)
+            @html = @tester.link_to_add_association('add something', @form_obj, :comments)
+          end
+
+          it_behaves_like "a correctly rendered add link", {}
         end
-        it "specifying true will not create objects on association but using the conditions" do
-          @tester.should_receive(:create_object).with(anything, :comments , true)
-          result = @tester.link_to_add_association('add something', @form_obj, :comments, :force_non_association_create => true)
-          result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="form&lt;tag&gt;" data-association="comment" data-associations="comments">add something</a>'
+
+        context "and explicitly specifying false is the same as default" do
+          before do
+            @tester.should_receive(:create_object).with(anything, :comments , false)
+            @html = @tester.link_to_add_association('add something', @form_obj, :comments, :force_non_association_create => false)
+          end
+          it_behaves_like "a correctly rendered add link", {}
         end
 
+        context "specifying true will not create objects on association but using the conditions" do
+          before do
+            @tester.should_receive(:create_object).with(anything, :comments , true)
+            @html = @tester.link_to_add_association('add something', @form_obj, :comments, :force_non_association_create => true)
+          end
+          it_behaves_like "a correctly rendered add link", {}
+        end
       end
     end
 
     context "with a block" do
-      it "the block gives the link text" do
-        result = @tester.link_to_add_association(@form_obj, :comments) do
-          "some long name"
+      context "and the block specifies the link text" do
+        before do
+          @html = @tester.link_to_add_association(@form_obj, :comments) do
+            "some long name"
+          end
         end
-        result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="form&lt;tag&gt;" data-association="comment" data-associations="comments">some long name</a>'
+        it_behaves_like "a correctly rendered add link", {text: 'some long name'}
       end
 
-      it "accepts html options and pass them to link_to" do
-        result = @tester.link_to_add_association(@form_obj, :comments, {:class => 'floppy disk'}) do
-          "some long name"
+      context "accepts html options and pass them to link_to" do
+        before do
+          @html = @tester.link_to_add_association(@form_obj, :comments, {:class => 'floppy disk'}) do
+            "some long name"
+          end
         end
-        result.to_s.should == '<a href="#" class="floppy disk add_fields" data-association-insertion-template="form&lt;tag&gt;" data-association="comment" data-associations="comments">some long name</a>'
+        it_behaves_like "a correctly rendered add link", {class: 'floppy disk add_fields', text: 'some long name'}
       end
 
-      it "allows to explicitly hand the wanted partial" do
-        @tester.unstub(:render_association)
-        @tester.should_receive(:render_association).with(anything(), anything(), anything(), anything(), "shared/partial").and_return('partiallll')
-        result = @tester.link_to_add_association( @form_obj, :comments, :class => 'floppy disk', :partial => "shared/partial") do
-          "some long name"
+      context "accepts extra attributes and pass them to link_to" do
+        context 'when using the old notation' do
+          before do
+            @html = @tester.link_to_add_association(@form_obj, :comments, {:class => 'floppy disk', 'data-something' => 'bla'}) do
+              "some long name"
+            end
+          end
+          it_behaves_like "a correctly rendered add link", {class: 'floppy disk add_fields', text: 'some long name', :extra_attributes => {'data-something' => 'bla'}}
+        end
+        if Rails.rails4?
+          context 'when using the new notation' do
+            before do
+              @html = @tester.link_to_add_association(@form_obj, :comments, {:class => 'floppy disk', :data => {:'association-something' => 'foobar'}}) do
+                "some long name"
+              end
+            end
+            it_behaves_like "a correctly rendered add link", {class: 'floppy disk add_fields', text: 'some long name', :extra_attributes => {'data-association-something' => 'foobar'}}
+          end
         end
-        result.to_s.should == '<a href="#" class="floppy disk add_fields" data-association-insertion-template="partiallll" data-association="comment" data-associations="comments">some long name</a>'
+      end
+
+      context "and explicitly specifying the wanted partial" do
+        before do
+          @tester.unstub(:render_association)
+          @tester.should_receive(:render_association).with(anything(), anything(), anything(), anything(), "shared/partial").and_return('partiallll')
+          @html = @tester.link_to_add_association( @form_obj, :comments, :class => 'floppy disk', :partial => "shared/partial") do
+            "some long name"
+          end
+        end
+
+        it_behaves_like "a correctly rendered add link", {class: 'floppy disk add_fields', template: "partiallll", text: 'some long name'}
       end
     end
 
     context "with an irregular plural" do
-      it "uses the correct plural" do
-        result = @tester.link_to_add_association('add something', @form_obj, :people)
-        result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="form&lt;tag&gt;" data-association="person" data-associations="people">add something</a>'
+      context "uses the correct plural" do
+        before do
+          @html = @tester.link_to_add_association('add something', @form_obj, :people)
+        end
+        it_behaves_like "a correctly rendered add link", {association: 'person', associations: 'people' }
       end
     end
 
     context "when using aliased association and class-name" do
-      it "uses the correct name" do
-        result = @tester.link_to_add_association('add something', @form_obj, :admin_comments)
-        result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="form&lt;tag&gt;" data-association="admin_comment" data-associations="admin_comments">add something</a>'
+      context "uses the correct name" do
+        before do
+          @html = @tester.link_to_add_association('add something', @form_obj, :admin_comments)
+        end
+        it_behaves_like "a correctly rendered add link", {association: 'admin_comment', associations: 'admin_comments'}
       end
     end
 
@@ -110,27 +161,35 @@ describe Cocoon do
     end
 
     context "with extra render-options for rendering the child relation" do
-      it "uses the correct plural" do
-        @tester.should_receive(:render_association).with(:people, @form_obj, anything, {:wrapper => 'inline'}, nil)
-        result = @tester.link_to_add_association('add something', @form_obj, :people, :render_options => {:wrapper => 'inline'})
-        result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="form&lt;tag&gt;" data-association="person" data-associations="people">add something</a>'
+      context "uses the correct plural" do
+        before do
+          @tester.should_receive(:render_association).with(:people, @form_obj, anything, {:wrapper => 'inline'}, nil)
+          @html = @tester.link_to_add_association('add something', @form_obj, :people, :render_options => {:wrapper => 'inline'})
+        end
+        it_behaves_like "a correctly rendered add link", {association: 'person', associations: 'people' }
       end
     end
 
     context "passing locals to the partial" do
-      it "when given: passes the locals to the partials" do
-        @tester.unstub(:render_association)
-        @form_obj.should_receive(:fields_for) { | association, new_object, options_hash, &block| block.call }
-        @tester.should_receive(:render).with("person_fields", {:f=>nil, :dynamic=>true, :alfred=>"Judoka"}).and_return ("partiallll")
-        result = @tester.link_to_add_association('add something', @form_obj, :people, :render_options => {:wrapper => 'inline', :locals => {:alfred => 'Judoka'}})
-        result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="partiallll" data-association="person" data-associations="people">add something</a>'
+      context "when given: passes the locals to the partials" do
+        before do
+          @tester.unstub(:render_association)
+          @form_obj.should_receive(:fields_for) { | association, new_object, options_hash, &block| block.call }
+          @tester.should_receive(:render).with("person_fields", {:f=>nil, :dynamic=>true, :alfred=>"Judoka"}).and_return ("partiallll")
+          @html = @tester.link_to_add_association('add something', @form_obj, :people, :render_options => {:wrapper => 'inline', :locals => {:alfred => 'Judoka'}})
+        end
+        it_behaves_like "a correctly rendered add link", {template: 'partiallll', association: 'person', associations: 'people' }
       end
-      it "if no locals are given it still works" do
-        @tester.unstub(:render_association)
-        @form_obj.should_receive(:fields_for) { | association, new_object, options_hash, &block| block.call }
-        @tester.should_receive(:render).with("person_fields", {:f=>nil, :dynamic=>true}).and_return ("partiallll")
-        result = @tester.link_to_add_association('add something', @form_obj, :people, :render_options => {:wrapper => 'inline'})
-        result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="partiallll" data-association="person" data-associations="people">add something</a>'
+      context "if no locals are given it still works" do
+        before do
+          @tester.unstub(:render_association)
+          @form_obj.should_receive(:fields_for) { | association, new_object, options_hash, &block| block.call }
+          @tester.should_receive(:render).with("person_fields", {:f=>nil, :dynamic=>true}).and_return ("partiallll")
+          @html = @tester.link_to_add_association('add something', @form_obj, :people, :render_options => {:wrapper => 'inline'})
+        end
+        it_behaves_like "a correctly rendered add link", {template: 'partiallll', association: 'person', associations: 'people' }
+
+        #result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="partiallll" data-association="person" data-associations="people">add something</a>'
       end
     end
 
@@ -141,12 +200,13 @@ describe Cocoon do
         @tester.unstub(:render_association)
         @form_obj.stub(:semantic_fields_for).and_return('form<tagzzz>')
       end
-      it "calls semantic_fields_for and not fields_for" do
-        @form_obj.should_receive(:semantic_fields_for)
-        @form_obj.should_receive(:fields_for).never
-        result = @tester.link_to_add_association('add something', @form_obj, :people)
-        result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="form&lt;tagzzz&gt;" data-association="person" data-associations="people">add something</a>'
-
+      context "calls semantic_fields_for and not fields_for" do
+        before do
+          @form_obj.should_receive(:semantic_fields_for)
+          @form_obj.should_receive(:fields_for).never
+          @html = @tester.link_to_add_association('add something', @form_obj, :people)
+        end
+        it_behaves_like "a correctly rendered add link", {template: 'form<tagzzz>', association: 'person', associations: 'people' }
       end
     end
     context "when using simple_form" do
@@ -157,12 +217,13 @@ describe Cocoon do
       it "responds_to :simple_fields_for" do
         @form_obj.should respond_to(:simple_fields_for)
       end
-      it "calls simple_fields_for and not fields_for" do
-        @form_obj.should_receive(:simple_fields_for)
-        @form_obj.should_receive(:fields_for).never
-        result = @tester.link_to_add_association('add something', @form_obj, :people)
-        result.to_s.should == '<a href="#" class="add_fields" data-association-insertion-template="form&lt;tagxxx&gt;" data-association="person" data-associations="people">add something</a>'
-
+      context "calls simple_fields_for and not fields_for" do
+        before do
+          @form_obj.should_receive(:simple_fields_for)
+          @form_obj.should_receive(:fields_for).never
+          @html = @tester.link_to_add_association('add something', @form_obj, :people)
+        end
+        it_behaves_like "a correctly rendered add link", {template: 'form<tagxxx>', association: 'person', associations: 'people' }
       end
     end
 
@@ -170,31 +231,47 @@ describe Cocoon do
 
   context "link_to_remove_association" do
     context "without a block" do
-      it "accepts a name" do
-        result = @tester.link_to_remove_association('remove something', @form_obj)
-        result.to_s.should == "<input id=\"Post__destroy\" name=\"Post[_destroy]\" type=\"hidden\" /><a href=\"#\" class=\"remove_fields dynamic\">remove something</a>"
+      context "accepts a name" do
+        before do
+          @html = @tester.link_to_remove_association('remove something', @form_obj)
+        end
+
+        it "is rendered inside a input element" do
+          doc = Nokogiri::HTML(@html)
+          removed = doc.at('input')
+          removed.attribute('id').value.should == "Post__destroy"
+          removed.attribute('name').value.should == "Post[_destroy]"
+        end
+
+        it_behaves_like "a correctly rendered remove link", {}
       end
 
-      it "accepts html options and pass them to link_to" do
-        result = @tester.link_to_remove_association('remove something', @form_obj, {:class => 'add_some_class', :'data-something' => 'bla'})
-        result.to_s.should == "<input id=\"Post__destroy\" name=\"Post[_destroy]\" type=\"hidden\" /><a href=\"#\" class=\"add_some_class remove_fields dynamic\" data-something=\"bla\">remove something</a>"
+      context "accepts html options and pass them to link_to" do
+        before do
+          @html = @tester.link_to_remove_association('remove something', @form_obj, {:class => 'add_some_class', :'data-something' => 'bla'})
+        end
+        it_behaves_like "a correctly rendered remove link", {class: 'add_some_class remove_fields dynamic', extra_attributes: {'data-something' => 'bla'}}
       end
 
     end
 
     context "with a block" do
-      it "the block gives the name" do
-        result = @tester.link_to_remove_association(@form_obj) do
-          "remove some long name"
+      context "the block gives the name" do
+        before do
+          @html = @tester.link_to_remove_association(@form_obj) do
+            "remove some long name"
+          end
         end
-        result.to_s.should == "<input id=\"Post__destroy\" name=\"Post[_destroy]\" type=\"hidden\" /><a href=\"#\" class=\"remove_fields dynamic\">remove some long name</a>"
+        it_behaves_like "a correctly rendered remove link", {text: 'remove some long name'}
       end
 
-      it "accepts html options and pass them to link_to" do
-        result = @tester.link_to_remove_association(@form_obj, {:class => 'add_some_class', :'data-something' => 'bla'}) do
-          "remove some long name"
+      context "accepts html options and pass them to link_to" do
+        before do
+          @html = @tester.link_to_remove_association(@form_obj, {:class => 'add_some_class', :'data-something' => 'bla'}) do
+            "remove some long name"
+          end
         end
-        result.to_s.should == "<input id=\"Post__destroy\" name=\"Post[_destroy]\" type=\"hidden\" /><a href=\"#\" class=\"add_some_class remove_fields dynamic\" data-something=\"bla\">remove some long name</a>"
+        it_behaves_like "a correctly rendered remove link", {text: 'remove some long name', class: 'add_some_class remove_fields dynamic', extra_attributes: {'data-something' => 'bla'}}
       end
     end
   end
@@ -202,29 +279,35 @@ describe Cocoon do
   context "create_object" do
     it "creates correct association with conditions" do
       @tester.should_not_receive(:create_object_with_conditions)
+      # in rails4 we cannot create an associated object when the object has not been saved before
+      # I submitted a bug for this: https://github.com/rails/rails/issues/11376
+      if Rails.rails4?
+        @post = Post.create(title: 'Testing')
+        @form_obj = double(:object => @post, :object_name => @post.class.name)
+      end
       result = @tester.create_object(@form_obj, :admin_comments)
       result.author.should == "Admin"
     end
 
     it "creates correct association for belongs_to associations" do
-      result = @tester.create_object(stub(:object => Comment.new), :post)
+      result = @tester.create_object(double(:object => Comment.new), :post)
       result.should be_a Post
     end
 
     it "raises an error if cannot reflect on association" do
-      expect { @tester.create_object(stub(:object => Comment.new), :not_existing) }.to raise_error /association/i
+      expect { @tester.create_object(double(:object => Comment.new), :not_existing) }.to raise_error /association/i
     end
 
     it "creates an association if object responds to 'build_association' as singular" do
       object = Comment.new
       object.should_receive(:build_custom_item).and_return 'custom'
-      @tester.create_object(stub(:object => object), :custom_item).should == 'custom'
+      @tester.create_object(double(:object => object), :custom_item).should == 'custom'
     end
 
     it "creates an association if object responds to 'build_association' as plural" do
       object = Comment.new
       object.should_receive(:build_custom_item).and_return 'custom'
-      @tester.create_object(stub(:object => object), :custom_items).should == 'custom'
+      @tester.create_object(double(:object => object), :custom_items).should == 'custom'
     end
 
     it "can create using only conditions not the association" do