mirror of
https://github.com/haml/haml.git
synced 2022-11-09 12:33:31 -05:00
We don't need linked_rails any more, use Bundler instead
This commit is contained in:
parent
3bc6ba1c53
commit
98eb136d2c
2 changed files with 3 additions and 19 deletions
|
@ -1,13 +1,3 @@
|
||||||
# allows testing with edge Rails by creating a test/rails symlink
|
|
||||||
linked_rails = File.dirname(__FILE__) + '/rails'
|
|
||||||
|
|
||||||
if File.exists?(linked_rails) && !$:.include?(linked_rails + '/activesupport/lib')
|
|
||||||
puts "[ using linked Rails ]"
|
|
||||||
$:.unshift linked_rails + '/activesupport/lib'
|
|
||||||
$:.unshift linked_rails + '/actionpack/lib'
|
|
||||||
$:.unshift linked_rails + '/railties/lib'
|
|
||||||
end
|
|
||||||
require 'rubygems'
|
|
||||||
require 'action_pack'
|
require 'action_pack'
|
||||||
require 'action_controller'
|
require 'action_controller'
|
||||||
require 'action_view'
|
require 'action_view'
|
||||||
|
@ -32,11 +22,3 @@ else
|
||||||
end
|
end
|
||||||
|
|
||||||
ActionController::Base.logger = Logger.new(nil)
|
ActionController::Base.logger = Logger.new(nil)
|
||||||
|
|
||||||
# Load plugins from test/plugins.
|
|
||||||
# This will only work with very basic plugins,
|
|
||||||
# since we don't want to load the entirety of Rails.
|
|
||||||
Dir[File.dirname(__FILE__) + '/plugins/*'].each do |plugin|
|
|
||||||
$: << plugin + '/lib'
|
|
||||||
eval(File.read(plugin + '/init.rb'))
|
|
||||||
end
|
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
require 'rubygems'
|
||||||
|
|
||||||
lib_dir = File.dirname(__FILE__) + '/../lib'
|
lib_dir = File.dirname(__FILE__) + '/../lib'
|
||||||
require File.dirname(__FILE__) + '/linked_rails'
|
require File.dirname(__FILE__) + '/linked_rails'
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue