TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove exceptions from AbstractUnit so they work in real life

Browse Source
This commit is contained in:
Yehuda Katz + Carl Lerche 2009-06-16 11:20:28 -07:00
parent 18c3b77b23
commit a6e803bee1
2 changed files with 13 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
actionpack/lib/action_controller.rb
View File

@ -40,6 +40,18 @@ module ActionController
autoload :Translation, 'action_controller/translation'
autoload :Cookies, 'action_controller/base/cookies'
autoload :ActionControllerError, 'action_controller/base/exceptions'
autoload :SessionRestoreError, 'action_controller/base/exceptions'
autoload :RenderError, 'action_controller/base/exceptions'
autoload :RoutingError, 'action_controller/base/exceptions'
autoload :MethodNotAllowed, 'action_controller/base/exceptions'
autoload :NotImplemented, 'action_controller/base/exceptions'
autoload :UnknownController, 'action_controller/base/exceptions'
autoload :MissingFile, 'action_controller/base/exceptions'
autoload :RenderError, 'action_controller/base/exceptions'
autoload :SessionOverflowError, 'action_controller/base/exceptions'
autoload :UnknownHttpMethod, 'action_controller/base/exceptions'
require 'action_controller/routing'
end

59
actionpack/test/abstract_unit.rb
View File

@ -15,7 +15,7 @@
require 'action_controller/abstract'
require 'action_controller'
require 'fixture_template'
require 'action_controller/testing/process2'
require 'action_controller/testing/process'
require 'action_view/test_case'
require 'action_controller/testing/integration'
require 'active_support/dependencies'
@ -59,63 +59,6 @@ module ActionController
}
Base.session_store = nil
class ActionControllerError < StandardError #:nodoc:
end
class SessionRestoreError < ActionControllerError #:nodoc:
end
class RenderError < ActionControllerError #:nodoc:
end
class RoutingError < ActionControllerError #:nodoc:
attr_reader :failures
def initialize(message, failures=[])
super(message)
@failures = failures
end
end
class MethodNotAllowed < ActionControllerError #:nodoc:
attr_reader :allowed_methods
def initialize(*allowed_methods)
super("Only #{allowed_methods.to_sentence(:locale => :en)} requests are allowed.")
@allowed_methods = allowed_methods
end
def allowed_methods_header
allowed_methods.map { |method_symbol| method_symbol.to_s.upcase } * ', '
end
def handle_response!(response)
response.headers['Allow'] ||= allowed_methods_header
end
end
class NotImplemented < MethodNotAllowed #:nodoc:
end
class UnknownController < ActionControllerError #:nodoc:
end
class MissingFile < ActionControllerError #:nodoc:
end
class RenderError < ActionControllerError #:nodoc:
end
class SessionOverflowError < ActionControllerError #:nodoc:
DEFAULT_MESSAGE = 'Your session data is larger than the data column in which it is to be stored. You must increase the size of your data column if you intend to store large data.'
def initialize(message = nil)
super(message || DEFAULT_MESSAGE)
end
end
class UnknownHttpMethod < ActionControllerError #:nodoc:
end
class Base
include ActionController::Testing
end