summaryrefslogtreecommitdiffstats
path: root/rubygem-actionpack-enable-test.patch
diff options
context:
space:
mode:
authorKen Dreyer <ktdreyer@ktdreyer.com>2013-01-09 16:20:02 +0100
committerKen Dreyer <ktdreyer@ktdreyer.com>2013-02-13 18:50:46 -0700
commitf1603e0ba24af7d4dd65d7c763e3daf069c5216a (patch)
tree4e6266bfb7c96b35b1d59717f5a7706992e70090 /rubygem-actionpack-enable-test.patch
parent6224fab5ad6e066d98c3a3e6e8de58f190aec0bb (diff)
downloadrubygem-actionpack-f1603e0ba24af7d4dd65d7c763e3daf069c5216a.tar.gz
rubygem-actionpack-f1603e0ba24af7d4dd65d7c763e3daf069c5216a.tar.xz
rubygem-actionpack-f1603e0ba24af7d4dd65d7c763e3daf069c5216a.zip
Downgrade to ActionPack 2.3.16.
Diffstat (limited to 'rubygem-actionpack-enable-test.patch')
-rw-r--r--rubygem-actionpack-enable-test.patch22
1 files changed, 7 insertions, 15 deletions
diff --git a/rubygem-actionpack-enable-test.patch b/rubygem-actionpack-enable-test.patch
index d620f83..752841d 100644
--- a/rubygem-actionpack-enable-test.patch
+++ b/rubygem-actionpack-enable-test.patch
@@ -1,19 +1,11 @@
---- test/active_record_unit.rb.orig 2011-01-10 23:31:54.197506001 -0500
-+++ test/active_record_unit.rb 2011-01-11 00:09:09.152505905 -0500
-@@ -13,12 +13,12 @@ end
- # Try to grab AR
- unless defined?(ActiveRecord) && defined?(Fixtures)
+--- actionpack-2.3.8/test/active_record_unit.rb.orig 2010-07-01 14:22:29.000000000 -0400
++++ actionpack-2.3.8/test/active_record_unit.rb 2010-07-01 14:22:41.000000000 -0400
+@@ -17,7 +17,7 @@ else
+ $stderr.print 'Attempting to load Active Record... '
begin
-- PATH_TO_AR = "#{File.dirname(__FILE__)}/../../activerecord/lib"
+ PATH_TO_AR = File.expand_path('../../../activerecord/lib', __FILE__)
- raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR)
-- $LOAD_PATH.unshift PATH_TO_AR
-+ #PATH_TO_AR = "#{File.dirname(__FILE__)}/../../activerecord/lib"
+ #raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR)
-+ #$LOAD_PATH.unshift PATH_TO_AR
+ $LOAD_PATH.unshift PATH_TO_AR
require 'active_record'
- rescue LoadError => e
-- $stderr.print "Failed to load Active Record. Skipping Active Record assertion tests: #{e}"
-+ #$stderr.print "Failed to load Active Record. Skipping Active Record assertion tests: #{e}"
- ActiveRecordTestConnector.able_to_connect = false
- end
- end
+ require 'active_record/fixtures'