diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2011-05-22 16:05:36 -0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2011-05-22 16:05:36 -0700 |
| commit | 7124659f3ec0f7d732628a5c1dc1aa8e719aa0ae (patch) | |
| tree | 14fdc8456bbba236517d9359ecf5a064c828163c | |
| parent | d7a910e31e839e5544aa9f83f9922ecfcee74ed5 (diff) | |
| parent | 90f028a4dc48152baded4cba9ec66474c2e98f48 (diff) | |
| download | rails-7124659f3ec0f7d732628a5c1dc1aa8e719aa0ae.tar.gz rails-7124659f3ec0f7d732628a5c1dc1aa8e719aa0ae.tar.bz2 rails-7124659f3ec0f7d732628a5c1dc1aa8e719aa0ae.zip | |
Merge pull request #1221 from sikachu/fix_tests
Make sure that we're able to run Action Pack test standalone.
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 1 | ||||
| -rw-r--r-- | actionpack/test/template/sprockets_helper_test.rb | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 60534a9746..ad0ad807db 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -1,4 +1,5 @@ require File.expand_path('../../../load_paths', __FILE__) +require File.expand_path('../../../version', __FILE__) lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb index 8d3be09a4f..47c2787502 100644 --- a/actionpack/test/template/sprockets_helper_test.rb +++ b/actionpack/test/template/sprockets_helper_test.rb @@ -1,9 +1,14 @@ require 'abstract_unit' + +module Rails + class Engine + def self.initializer(*args); end + end +end + require 'sprockets' require 'mocha' -module Rails; end - class SprocketsHelperTest < ActionView::TestCase tests ActionView::Helpers::SprocketsHelper |