updated environment.rb and test.rb for new test suite, also removed o…

…ld google login junk
jonmagic · Mar 24, 2009 · 21be98a · 21be98a
1 parent 79f9ccc
commit 21be98a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 136 deletions.
diff --git a/config/environment.rb b/config/environment.rb
@@ -66,10 +66,13 @@
   config.active_record.observers = :user_observer
 
   config.gem 'googlebase', :lib => 'google/base', :version => '0.2.1'
-  config.gem 'json'
   config.gem 'paperclip'
-  require 'redcloth'
-  require 'days_and_times'
+  config.gem "thoughtbot-factory_girl",
+               :lib    => "factory_girl",
+               :source => "http://gems.github.com"
+  config.gem "jnunemaker-httparty", :lib => 'httparty'
+  config.gem "RedCloth", :lib => "redcloth"
+  config.gem "dcparker-days_and_times", :lib => 'days_and_times'
   require 'lib/search.rb'
   require 'lib/statuslang.rb'
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
@@ -24,3 +24,7 @@
 # Restful Authentication
 REST_AUTH_SITE_KEY = 'f5945d1c74d3502f8a3de8562e5bf21fe3fec887'
 REST_AUTH_DIGEST_STRETCHES = 10
+
+config.gem 'thoughtbot-shoulda', :lib => 'shoulda', :source => 'http://gems.github.com'
+config.gem 'jeremymcanally-stump', :lib => 'stump', :source => 'http://gems.github.com'
+config.gem 'mhennemeyer-matchy', :lib => 'matchy', :source => 'http://gems.github.com'
diff --git a/lib/google/rails/helpers.rb b/lib/google/rails/helpers.rb