Merge commit 'mainstream/master'

Conflicts:
	actionpack/lib/action_controller/base/mime_responds.rb

1 files changed, 0 insertions, 33 deletions

diff --git a/actionpack/test/controller/fake_controllers.rb b/actionpack/test/controller/fake_controllers.rb
deleted file mode 100644
index 75c114c103..0000000000
--- a/actionpack/test/controller/fake_controllers.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-class << Object; alias_method :const_available?, :const_defined?; end
-  
-class ContentController < Class.new(ActionController::Base)
-end
-class NotAController
-end
-module Admin
-  class << self; alias_method :const_available?, :const_defined?; end
-  class UserController < Class.new(ActionController::Base); end
-  class NewsFeedController < Class.new(ActionController::Base); end
-end
-
-# For speed test
-class SpeedController < ActionController::Base;  end
-class SearchController        < SpeedController; end
-class VideosController        < SpeedController; end
-class VideoFileController     < SpeedController; end
-class VideoSharesController   < SpeedController; end
-class VideoAbusesController   < SpeedController; end
-class VideoUploadsController  < SpeedController; end
-class VideoVisitsController   < SpeedController; end
-class UsersController         < SpeedController; end
-class SettingsController      < SpeedController; end
-class ChannelsController      < SpeedController; end
-class ChannelVideosController < SpeedController; end
-class SessionsController      < SpeedController; end
-class LostPasswordsController < SpeedController; end
-class PagesController         < SpeedController; end
-
-ActionController::Routing::Routes.draw do |map|
-  map.route_one 'route_one', :controller => 'elsewhere', :action => 'flash_me'
-  map.connect ':controller/:action/:id'
-end