formtastic 2.0.2 → 2.1.0.beta1

data/spec/inputs/string_input_spec.rb

@@ -124,6 +124,34 @@ describe 'string input' do
   
   end
   
+  describe "when index is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for(:author, :index => 3) do |author|
+          concat(author.input(:name, :as => :string))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("input#post_author_attributes_3_name")
+    end
+    
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
+    end
+    
+  end
+  
+  
   describe "when no object is provided" do
     before do
       concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|

data/spec/inputs/text_input_spec.rb

@@ -81,6 +81,33 @@ describe 'text input' do
 
   end
   
+  describe "when index is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for(:author, :index => 3) do |author|
+          concat(author.input(:name, :as => :text))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("textarea#post_author_attributes_3_name")
+    end
+    
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("textarea[@name='post[author_attributes][3][name]']")
+    end
+    
+  end
+  
   context "when required" do
     it "should add the required attribute to the input's html options" do
       with_config :use_required_attribute, true do 

data/spec/inputs/time_input_spec.rb

@@ -58,6 +58,37 @@ describe 'time input' do
         output_buffer.should have_tag('select#post_publish_at_5i')
       end
 
+      it 'should associate the legend label with the hour select' do
+        output_buffer.should have_tag('form li.time fieldset legend.label label[@for="post_publish_at_4i"]')
+      end
+
+    end
+
+    describe "with :ignore_date => false and no initial Time" do
+      before do
+        @new_post.stub(:publish_at)
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:publish_at, :as => :time, :ignore_date => false))
+        end)
+      end
+
+      it 'should have a hidden input for day, month and year' do
+        output_buffer.should have_tag('input#post_publish_at_1i')
+        output_buffer.should have_tag('input#post_publish_at_2i')
+        output_buffer.should have_tag('input#post_publish_at_3i')
+      end
+
+      it 'should not have values in hidden inputs for day, month and year' do
+        output_buffer.should have_tag('input#post_publish_at_1i[@value=""]')
+        output_buffer.should have_tag('input#post_publish_at_2i[@value=""]')
+        output_buffer.should have_tag('input#post_publish_at_3i[@value=""]')
+      end
+
+      it 'should have an select for hour and minute' do
+        output_buffer.should have_tag('select#post_publish_at_4i')
+        output_buffer.should have_tag('select#post_publish_at_5i')
+      end
+
     end
 
     describe "without seconds" do
@@ -80,7 +111,7 @@ describe 'time input' do
       end
 
       it 'should associate the legend label with the first select' do
-        output_buffer.should have_tag('form li.time fieldset legend.label label[@for="post_publish_at_1i"]')
+        output_buffer.should have_tag('form li.time fieldset legend.label label[@for="post_publish_at_4i"]')
       end
 
       it 'should have an ordered list of two items inside the fieldset' do
@@ -198,4 +229,39 @@ describe 'time input' do
     end
   end
   
+  describe "when index is provided" do
+
+    before do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for(:author, :index => 3) do |author|
+          concat(author.input(:created_at, :as => :time))
+        end)
+      end)
+    end
+
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_created_at_input")
+    end
+
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("input#post_author_attributes_3_created_at_1i")
+      output_buffer.should have_tag("input#post_author_attributes_3_created_at_2i")
+      output_buffer.should have_tag("input#post_author_attributes_3_created_at_3i")
+      output_buffer.should have_tag("select#post_author_attributes_3_created_at_4i")
+      output_buffer.should have_tag("select#post_author_attributes_3_created_at_5i")
+    end
+
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][created_at(1i)]']")
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][created_at(2i)]']")
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][created_at(3i)]']")
+      output_buffer.should have_tag("select[@name='post[author_attributes][3][created_at(4i)]']")
+      output_buffer.should have_tag("select[@name='post[author_attributes][3][created_at(5i)]']")
+    end
+
+  end
+  
 end
+
+
+

data/spec/inputs/time_zone_input_spec.rb

@@ -54,6 +54,34 @@ describe 'time_zone input' do
     it_should_have_label_for("context2_post_time_zone")
 
   end
+  
+  describe "when index is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for(:author, :index => 3) do |author|
+          concat(author.input(:name, :as => :time_zone))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("select#post_author_attributes_3_name")
+    end
+    
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("select[@name='post[author_attributes][3][name]']")
+    end
+    
+  end
+  
 
   describe 'when no object is given' do
     before(:each) do

data/spec/inputs/url_input_spec.rb

@@ -42,6 +42,34 @@ describe 'url input' do
 
   end
   
+  describe "when index is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for(:author, :index => 3) do |author|
+          concat(author.input(:name, :as => :url))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("input#post_author_attributes_3_name")
+    end
+    
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
+    end
+    
+  end
+  
+  
   describe "when required" do
     it "should add the required attribute to the input's html options" do
       with_config :use_required_attribute, true do 

data/spec/inputs/with_options_spec.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe 'string input' do
+
+  include FormtasticSpecHelper
+
+  before do
+    @output_buffer = ''
+    mock_everything
+  end
+
+  describe "with_options and :wrapper_html" do
+    before do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.with_options :wrapper_html => { :class => ['extra'] } do |opt_builder|
+          concat(opt_builder.input(:title, :as => :string))
+          concat(opt_builder.input(:author, :as => :radio))
+        end
+      end)
+    end
+
+    it "should have extra class on title" do
+      output_buffer.should have_tag("form li#post_title_input.extra")
+    end
+    it "should have title as string" do
+      output_buffer.should have_tag("form li#post_title_input.string")
+    end
+    it "should not have title as radio" do
+      output_buffer.should_not have_tag("form li#post_title_input.radio")
+    end
+
+    it "should have extra class on author" do
+      output_buffer.should have_tag("form li#post_author_input.extra")
+    end
+    it "should not have author as string" do
+      output_buffer.should_not have_tag("form li#post_author_input.string")
+    end
+    it "should have author as radio" do
+      output_buffer.should have_tag("form li#post_author_input.radio")
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,8 +1,6 @@
 # encoding: utf-8
 require 'rubygems'
-require 'bundler'
-Bundler.setup
-
+require 'bundler/setup'
 require 'active_support'
 require 'action_pack'
 require 'action_view'
@@ -12,6 +10,8 @@ require 'action_dispatch'
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/util'))
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic'))
 
+require 'ammeter/init'
+
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories in alphabetic order.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each {|f| require f}
@@ -137,6 +137,18 @@ module FormtasticSpecHelper
     include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
   end
 
+  ##
+  # We can't mock :respond_to?, so we need a concrete class override
+  class ::MongoidReflectionMock < RSpec::Mocks::Mock
+    def initialize(name=nil, stubs_and_options={})
+      super name, stubs_and_options
+    end
+
+    def respond_to?(sym)
+      sym == :options ? false : super
+    end
+  end
+
   def _routes
     url_helpers = mock('url_helpers')
     url_helpers.stub!(:hash_for_posts_path).and_return({})
@@ -151,7 +163,9 @@ module FormtasticSpecHelper
   end
 
   def controller
-    mock('controller', :controller_path= => '', :params => {})
+    env = mock('env', :[] => nil)
+    request = mock('request', :env => env)
+    mock('controller', :controller_path= => '', :params => {}, :request => request)
   end
 
   def default_url_options
@@ -282,7 +296,9 @@ module FormtasticSpecHelper
       when :main_post
         mock('reflection', :options => {}, :klass => ::Post, :macro => :belongs_to)
       when :mongoid_reviewer
-        mock('reflection', :options => nil, :klass => ::Author, :macro => :referenced_in, :foreign_key => "reviewer_id") # custom id
+        ::MongoidReflectionMock.new('reflection',
+             :options => Proc.new { raise NoMethodError, "Mongoid has no reflection.options" },
+             :klass => ::Author, :macro => :referenced_in, :foreign_key => "reviewer_id") # custom id
       end
     end
     ::Post.stub!(:find).and_return([@freds_post])
@@ -409,4 +425,4 @@ RSpec.configure do |config|
   config.after(:all) do
     DeferredGarbageCollection.reconsider unless ENV["DEFER_GC"] == "false"
   end
-end
+end

data/spec/support/custom_macros.rb

@@ -86,6 +86,12 @@ module CustomMacros
       end
     end
 
+    def it_should_have_select_with_name(name)
+      it "should have an input named #{name}" do
+        output_buffer.should have_tag("form li select[@name=\"#{name}\"]")
+      end
+    end
+
     def it_should_have_textarea_with_name(name)
       it "should have an input named #{name}" do
         output_buffer.should have_tag("form li textarea[@name=\"#{name}\"]")
@@ -515,140 +521,6 @@ module CustomMacros
           end
         end
 
-        describe 'when the deprecated :label_method option is provided' do
-          
-          describe 'as a symbol' do
-            before do
-              with_deprecation_silenced do
-                concat(semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:author, :as => as, :label_method => :login))
-                end)
-              end
-            end
-
-            it 'should have options with text content from the specified method' do
-              ::Author.all.each do |author|
-                output_buffer.should have_tag("form li.#{as}", /#{author.login}/)
-              end
-            end
-          end
-
-          describe 'as a proc' do
-            
-            before do
-              with_deprecation_silenced do
-                concat(semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:author, :as => as, :label_method => Proc.new {|a| a.login.reverse }))
-                end)
-              end
-            end
-
-            it 'should have options with the proc applied to each' do
-              ::Author.all.each do |author|
-                output_buffer.should have_tag("form li.#{as}", /#{author.login.reverse}/)
-              end
-            end
-          end
-
-          describe 'as a method object' do
-            before do
-              def reverse_login(a)
-                a.login.reverse
-              end
-              with_deprecation_silenced do 
-                concat(semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:author, :as => as, :label_method => method(:reverse_login)))
-                end)
-              end
-            end
-
-            it 'should have options with the proc applied to each' do
-              ::Author.all.each do |author|
-                output_buffer.should have_tag("form li.#{as}", /#{author.login.reverse}/)
-              end
-            end
-          end
-        end
-
-        describe 'when the deprecated :label_method option is not provided' do
-          Formtastic::FormBuilder.collection_label_methods.each do |label_method|
-
-            describe "when the collection objects respond to #{label_method}" do
-              before do
-                @fred.stub!(:respond_to?).and_return { |m| m.to_s == label_method || m.to_s == 'id' }
-                ::Author.all.each { |a| a.stub!(label_method).and_return('The Label Text') }
-
-                with_deprecation_silenced do 
-                  concat(semantic_form_for(@new_post) do |builder|
-                    concat(builder.input(:author, :as => as))
-                  end)
-                end
-              end
-
-              it "should render the options with #{label_method} as the label" do
-                ::Author.all.each do |author|
-                  output_buffer.should have_tag("form li.#{as}", /The Label Text/)
-                end
-              end
-            end
-
-          end
-        end
-
-        describe 'when the deprecated :value_method option is provided' do
-
-          describe 'as a symbol' do
-            before do
-              with_deprecation_silenced do 
-                concat(semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:author, :as => as, :value_method => :login))
-                end)
-              end
-            end
-
-            it 'should have options with values from specified method' do
-              ::Author.all.each do |author|
-                output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login}']")
-              end
-            end
-          end
-
-          describe 'as a proc' do
-            before do
-              with_deprecation_silenced do 
-                concat(semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:author, :as => as, :value_method => Proc.new {|a| a.login.reverse }))
-                end)
-              end
-            end
-
-            it 'should have options with the proc applied to each value' do
-              ::Author.all.each do |author|
-                output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login.reverse}']")
-              end
-            end
-          end
-
-          describe 'as a method object' do
-            before do
-              def reverse_login(a)
-                a.login.reverse
-              end
-              with_deprecation_silenced do 
-                concat(semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:author, :as => as, :value_method => method(:reverse_login)))
-                end)
-              end
-            end
-
-            it 'should have options with the proc applied to each value' do
-              ::Author.all.each do |author|
-                output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login.reverse}']")
-              end
-            end
-          end
-        end
-
       end
     end