More fixes.

d3m · Nov 22, 2011 · 91702ff · 91702ff
1 parent 1387a57
commit 91702ff
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 31 deletions.
diff --git a/Appraisals b/Appraisals
@@ -1,3 +1,7 @@
 appraise "rails-3.1.0" do
   gem "rails", "3.1.0"
 end
+
+appraise "rails-3.0.10" do
+  gem "rails", "3.0.10"
+end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -69,7 +69,6 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.4)
     thor (0.14.6)
     tilt (1.3.3)
 
@@ -79,5 +78,4 @@ PLATFORMS
 DEPENDENCIES
   appraisal
   rspec-rails
-  sqlite3
   wash_out!
diff --git a/gemfiles/rails-3.0.10.gemfile.lock b/gemfiles/rails-3.0.10.gemfile.lock
@@ -1,5 +1,5 @@
 PATH
-  remote: /Users/lovchy/Sites/wash_out
+  remote: /home/whitequark/wash_out
   specs:
     wash_out (0.1)
 
@@ -85,7 +85,6 @@ GEM
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (~> 2.7.0)
-    sqlite3 (1.3.4)
     thor (0.14.6)
     treetop (1.4.10)
       polyglot
@@ -99,5 +98,4 @@ DEPENDENCIES
   appraisal
   rails (= 3.0.10)
   rspec-rails
-  sqlite3
   wash_out!
diff --git a/gemfiles/rails-3.1.0.gemfile.lock b/gemfiles/rails-3.1.0.gemfile.lock
@@ -97,7 +97,6 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.4)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -112,5 +111,4 @@ DEPENDENCIES
   appraisal
   rails (= 3.1.0)
   rspec-rails
-  sqlite3
   wash_out!
diff --git a/lib/wash_out.rb b/lib/wash_out.rb
@@ -14,6 +14,6 @@ def wash_out(controller)
 end
 
 Mime::Type.register "application/soap+xml", :soap
-ActionController.add_renderer :soap do |what, options|
+ActionController::Renderers.add :soap do |what, options|
   _render_soap(what, options)
 end
diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb
@@ -1,6 +1,9 @@
 require File.expand_path('../boot', __FILE__)
 
-require "rails/all"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "active_resource/railtie"
+require "rails/test_unit/railtie"
 
 Bundler.require
 require "wash_out"

diff --git a/spec/dummy/config/database.yml b/spec/dummy/config/database.yml