Remove config.ru generation from --with-dispatchers option

This commit is contained in:
Joshua Peek
2009-09-25 23:15:49 -05:00
parent 5fba5409f7
commit c83c0f6936
4 changed files with 5 additions and 10 deletions

View File

@@ -115,7 +115,6 @@ module Rails::Generators
def create_dispatch_files
return unless options[:with_dispatchers]
copy_file "dispatchers/config.ru", "config.ru"
template "dispatchers/dispatch.rb", "public/dispatch.rb"
chmod "public/dispatch.rb", 0755, :verbose => false

View File

@@ -1,2 +1,7 @@
# Rack Dispatcher
# Require your environment file to bootstrap Rails
require File.dirname(__FILE__) + '/config/environment'
# Dispatch the request
run ActionController::Dispatcher.new

View File

@@ -1,7 +0,0 @@
# Rack Dispatcher
# Require your environment file to bootstrap Rails
require File.dirname(__FILE__) + '/config/environment'
# Dispatch the request
run ActionController::Dispatcher.new

View File

@@ -55,14 +55,12 @@ class AppGeneratorTest < GeneratorsTestCase
def test_dispatchers_are_not_added_by_default
run_generator
assert_no_file "config.ru"
assert_no_file "public/dispatch.cgi"
assert_no_file "public/dispatch.fcgi"
end
def test_dispatchers_are_added_if_required
run_generator ["--with-dispatchers"]
assert_file "config.ru"
assert_file "public/dispatch.cgi"
assert_file "public/dispatch.fcgi"
end