new custom_field gem version to fix the duplicated fields bug

Gemfile

@@ -25,7 +25,7 @@ gem 'locomotive_carrierwave', '0.5.4.beta3'
 gem 'dragonfly',  '~> 0.9.1'
 gem 'rack-cache', :require => 'rack/cache'
 
-gem 'custom_fields', '1.0.0.beta.20'
+gem 'custom_fields', '1.0.0.beta.21'
 gem 'cancan'
 gem 'fog', '0.8.2'
 gem 'mimetype-fu'

Gemfile.lock

@@ -85,8 +85,8 @@ GEM
       capybara (>= 1.0.0)
       cucumber (~> 1.0.0)
       nokogiri (>= 1.4.6)
-    custom_fields (1.0.0.beta.20)
+    custom_fields (1.0.0.beta.21)
-      activesupport (>= 3.0.7)
+      activesupport (~> 3.0.9)
       mongoid (= 2.0.2)
     daemons (1.1.4)
     database_cleaner (0.6.7)
@@ -283,7 +283,7 @@ DEPENDENCIES
   cancan
   capybara
   cucumber-rails (= 1.0.2)
-  custom_fields (= 1.0.0.beta.20)
+  custom_fields (= 1.0.0.beta.21)
   database_cleaner
   delayed_job (= 2.1.4)
   delayed_job_mongoid (= 1.0.2)

doc/TODO

@@ -59,15 +59,18 @@ x bugs
   x heroku: unable to upload a new file => okay
   x import => okay
   x delete an item => okay
-- bug: duplicate fields (new entry) when errors in the content type form
+x bug: duplicate fields (new entry) when errors in the content type form
-- overide sort for contents
 - rake task to import a remote template
 - tinyMCE => fullscreen
-- icon for redirection page in the pages section (back-office)
-- test and/or convert existing templates (the 2 of the themes section)
 
 => MERGE
 
+- overide sort for contents
+- icon for redirection page in the pages section (back-office)
+- test and/or convert existing templates (the 2 of the themes section)
+- [bushido] guiders / welcome page / devise cas authentication (SSO)
+
+
 BACKLOG:
 
 - custom_fields:

features/admin/content_types.feature

@@ -11,11 +11,12 @@ Background:
     | Description | text      | false           |
   And I am an authenticated user
 
-Scenario: I do not want my content form to have n duplicate fields if I submit n times the content type form with errors (bug)
+@javascript
+Scenario: I do not want my content form to have n duplicated fields if I submit n times the content type form with errors (bug)
   When I go to the "Projects" model edition page
   And I fill in "Name" with ""
   And I press "Update"
   And I press "Update"
   And I press "Update"
   When I follow "new item"
-  Then I should not see 4 times the "Name" field
+  Then I should see once the "Name" field

features/step_definitions/content_types_steps.rb

@@ -38,6 +38,10 @@ When %r{^I change the presentation of the "([^"]*)" model by grouping items by "
   content_type.save.should be_true
 end
 
-Then /^I should not see (\d+) times the "([^"]*)" field$/ do |n, field|
+Then %r{^I should not see (\d+) times the "([^"]*)" field$} do |n, field|
-  page.all(:css, "#content_#{field.underscore.downcase}_input").size.should == n
+  page.all(:css, "#content_#{field.underscore.downcase}_input").size.should_not == n.to_i
+end
+
+Then %r{^I should see once the "([^"]*)" field$} do |field|
+  page.all(:css, "#content_#{field.underscore.downcase}_input").size.should == 1
 end

features/support/env.rb

@@ -22,11 +22,10 @@ require 'capybara/session'
 Capybara.configure do |config|
   config.run_server         = false
   config.default_selector   = :css
-  config.app_host           = 'http://test.example.com'
+  config.app_host           = 'http://test.example.com:8080'
 end
 
-Capybara.javascript_driver = :rack_test # :selenium
+# Capybara.javascript_driver = :rack_test
-
 
 # Stop endless errors like
 # ~/.rvm/gems/ruby-1.9.2-p0@global/gems/rack-1.2.1/lib/rack/utils.rb:16:

locomotive_cms.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.add_dependency "dragonfly", "~> 0.9.1"
   s.add_dependency "rack-cache"
 
-  s.add_dependency "custom_fields", "1.0.0.beta.20"
+  s.add_dependency "custom_fields", "1.0.0.beta.21"
   s.add_dependency "cancan", "~> 1.6.0"
   s.add_dependency "fog", "0.8.2"
   s.add_dependency "mimetype-fu"