diff options
| author | Joshua Peek <josh@joshpeek.com> | 2010-02-15 10:20:11 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2010-02-15 10:20:11 -0600 |
| commit | eec2d301d4ce9df9c71c1a5aa63053eb970b6818 (patch) | |
| tree | 760bf54f7802d3e4f76e2db5bc642bb52637b532 /activeresource | |
| parent | 7cff54f5d3ae2e364f0d147ceb86ea701b21389c (diff) | |
| download | rails-eec2d301d4ce9df9c71c1a5aa63053eb970b6818.tar.gz rails-eec2d301d4ce9df9c71c1a5aa63053eb970b6818.tar.bz2 rails-eec2d301d4ce9df9c71c1a5aa63053eb970b6818.zip | |
Fix test load paths for those not using bundler
Diffstat (limited to 'activeresource')
| -rw-r--r-- | activeresource/test/abstract_unit.rb | 6 | ||||
| -rw-r--r-- | activeresource/test/cases/subscriber_test.rb | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb index 1af535e811..1c6f92cba4 100644 --- a/activeresource/test/abstract_unit.rb +++ b/activeresource/test/abstract_unit.rb @@ -1,4 +1,7 @@ -require File.expand_path('../../../load_paths', __FILE__) +require File.expand_path('../../../bundler', __FILE__) + +lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") +$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) require 'rubygems' require 'test/unit' @@ -6,7 +9,6 @@ require 'active_resource' require 'active_support' require 'active_support/test_case' -$:.unshift "#{File.dirname(__FILE__)}/../test" require 'setter_trap' require 'logger' diff --git a/activeresource/test/cases/subscriber_test.rb b/activeresource/test/cases/subscriber_test.rb index fb890e86cb..c673a0551a 100644 --- a/activeresource/test/cases/subscriber_test.rb +++ b/activeresource/test/cases/subscriber_test.rb @@ -1,9 +1,13 @@ +railties_path = File.expand_path('../../../../railties/lib', __FILE__) +$:.unshift(railties_path) if File.directory?(railties_path) && !$:.include?(railties_path) + require "abstract_unit" require "fixtures/person" require "rails/subscriber/test_helper" require "active_resource/railties/subscriber" require "active_support/core_ext/hash/conversions" +# TODO: This test should be part of Railties class SubscriberTest < ActiveSupport::TestCase include Rails::Subscriber::TestHelper Rails::Subscriber.add(:active_resource, ActiveResource::Railties::Subscriber.new) @@ -28,4 +32,4 @@ class SubscriberTest < ActiveSupport::TestCase assert_equal "GET http://37s.sunrise.i:3000/people/1.xml", @logger.logged(:info)[0] assert_match /\-\-\> 200 200 106/, @logger.logged(:info)[1] end -end
\ No newline at end of file +end |