Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #1222 from arunagw/sprockets-fixes
We don't need to load version any more as Sprockets.beta8 is included.
  • Loading branch information
josevalim committed May 23, 2011
2 parents 7b9f3eb + 531095e commit 7501943
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
1 change: 0 additions & 1 deletion actionpack/test/abstract_unit.rb
@@ -1,5 +1,4 @@
require File.expand_path('../../../load_paths', __FILE__) require File.expand_path('../../../load_paths', __FILE__)
require File.expand_path('../../../version', __FILE__)


lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
Expand Down
7 changes: 0 additions & 7 deletions actionpack/test/template/sprockets_helper_test.rb
@@ -1,11 +1,4 @@
require 'abstract_unit' require 'abstract_unit'

module Rails
class Engine
def self.initializer(*args); end
end
end

require 'sprockets' require 'sprockets'
require 'mocha' require 'mocha'


Expand Down

0 comments on commit 7501943

Please sign in to comment.