diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-22 23:35:55 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-22 23:35:55 -0700 |
| commit | 750194340c730b7d64e77f8402d546ed03111e09 (patch) | |
| tree | a63abcd753f3ae75e168d1893dc41298dbddafe9 /actionpack | |
| parent | 7b9f3eb10bc558ceb9942da2ee3daffe5c068316 (diff) | |
| parent | 531095e64ed734d246253143a7fad74e43b6f90e (diff) | |
| download | rails-750194340c730b7d64e77f8402d546ed03111e09.tar.gz rails-750194340c730b7d64e77f8402d546ed03111e09.tar.bz2 rails-750194340c730b7d64e77f8402d546ed03111e09.zip | |
Merge pull request #1222 from arunagw/sprockets-fixes
We don't need to load version any more as Sprockets.beta8 is included.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 1 | ||||
| -rw-r--r-- | actionpack/test/template/sprockets_helper_test.rb | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index ad0ad807db..60534a9746 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -1,5 +1,4 @@ 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 23288a242c..9d1e08373f 100644 --- a/actionpack/test/template/sprockets_helper_test.rb +++ b/actionpack/test/template/sprockets_helper_test.rb @@ -1,11 +1,4 @@ require 'abstract_unit' - -module Rails - class Engine - def self.initializer(*args); end - end -end - require 'sprockets' require 'mocha' |