updated rails version for specs to 3.1.0, use Formtastic::FormBuilder…

…, if it's available, cause Formtastic::SemanticFormBuilder was deprecated
japetheape · Oct 22, 2011 · c70bf96 · c70bf96
1 parent bec34a2
commit c70bf96
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/gemfiles/Gemfile.rails3_1 b/gemfiles/Gemfile.rails3_1
@@ -1,2 +1,2 @@
 instance_eval File.read('gemfiles/Gemfile.base')
-gem "rails", "~> 3.1.0.rc"
+gem "rails", "~> 3.1.0"
diff --git a/lib/nested_form/builders.rb b/lib/nested_form/builders.rb
@@ -15,7 +15,7 @@ class SimpleBuilder < ::SimpleForm::FormBuilder
 
   begin
     require 'formtastic'
-    class FormtasticBuilder < ::Formtastic::SemanticFormBuilder
+    class FormtasticBuilder < (defined?(::Formtastic::FormBuilder) ? Formtastic::FormBuilder : ::Formtastic::SemanticFormBuilder)
       include ::NestedForm::BuilderMixin
     end
   rescue LoadError