Staging

SpeciesFileGroup · Apr 9, 2014 · 81e1bac · 81e1bac
1 parent d76e15d
commit 81e1bac
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -8,7 +8,7 @@ gem 'pg', '~> 0.17.0'
 
 # Postgis
 gem 'activerecord-postgis-adapter'
-# gem 'squeel', git: 'https://github.com/nybex/squeel.git'
+gem 'squeel', git: 'https://github.com/nybex/squeel.git'
 
 # rgeo support
 gem 'ffi-geos'

diff --git a/lib/taxonworks.rb b/lib/taxonworks.rb
@@ -11,7 +11,7 @@ module TaxonWorks
 
   require 'soft_validation'
   require 'activerecord_utilities'
-  # require 'squeel'
+  require 'squeel'
 
   # TODO: Move this out of here before production
   # paperclip requires information on where ImageMagick is installed.

diff --git a/spec/views/controlled_vocabulary_terms/edit.html.erb_spec.rb b/spec/views/controlled_vocabulary_terms/edit.html.erb_spec.rb
@@ -3,7 +3,7 @@
 describe "controlled_vocabulary_terms/edit" do
   before(:each) do
     @controlled_vocabulary_term = assign(:controlled_vocabulary_term, stub_model(ControlledVocabularyTerm,
-      :type => "",
+      :type => "Keyword",
       :name => "MyString",
       :definition => "MyText",
       :created_by_id => 1,
@@ -17,7 +17,7 @@
 
     # Run the generator again with the --webrat flag if you want to use webrat matchers
     assert_select "form[action=?][method=?]", controlled_vocabulary_term_path(@controlled_vocabulary_term), "post" do
-      assert_select "input#controlled_vocabulary_term_type[name=?]", "controlled_vocabulary_term[type]"
+      assert_select "select#controlled_vocabulary_term_type[name=?]", "controlled_vocabulary_term[type]"
       assert_select "input#controlled_vocabulary_term_name[name=?]", "controlled_vocabulary_term[name]"
       assert_select "textarea#controlled_vocabulary_term_definition[name=?]", "controlled_vocabulary_term[definition]"
     end