3 files changed, 1 insertions, 53 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
diff --git a/actionpack/test/controller/fake_models.rb b/actionpack/test/controller/fake_models.rb
deleted file mode 100644
index 0b30c79b10..0000000000
--- a/actionpack/test/controller/fake_models.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class Customer < Struct.new(:name, :id)
-  def to_param
-    id.to_s
-  end
-end
-
-class BadCustomer < Customer
-end
-
-class GoodCustomer < Customer
-end
-
-module Quiz
-  class Question < Struct.new(:name, :id)
-    def to_param
-      id.to_s
-    end
-  end
-end
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb
index 04da0a7f86..cb9bdf57bb 100644
--- a/actionpack/test/controller/layout_test.rb
+++ b/actionpack/test/controller/layout_test.rb
@@ -9,7 +9,7 @@ ActionView::Template::register_template_handler :mab,
 
 ActionController::Base.view_paths = [ File.dirname(__FILE__) + '/../fixtures/layout_tests/' ]
 
-require "lib/fixture_template"
+require "fixture_template"
 
 class LayoutTest < ActionController::Base
   def self.controller_path; 'views' end