Changeset 4935
- Timestamp:
- 09/03/06 20:27:48 (2 years ago)
- Files:
-
- trunk/actionpack/lib/action_controller/assertions.rb (modified) (2 diffs)
- trunk/actionpack/lib/action_controller/assertions/deprecated_assertions.rb (moved) (moved from trunk/actionpack/lib/action_controller/deprecated_assertions.rb) (1 diff)
- trunk/actionpack/lib/action_controller/assertions/dom_assertions.rb (modified) (1 diff)
- trunk/actionpack/lib/action_controller/assertions/model_assertions.rb (modified) (1 diff)
- trunk/actionpack/lib/action_controller/assertions/response_assertions.rb (modified) (1 diff)
- trunk/actionpack/lib/action_controller/assertions/routing_assertions.rb (modified) (1 diff)
- trunk/actionpack/lib/action_controller/assertions/selector_assertions.rb (modified) (1 diff)
- trunk/actionpack/lib/action_controller/assertions/tag_assertions.rb (modified) (1 diff)
- trunk/actionpack/lib/action_controller/test_process.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/actionpack/lib/action_controller/assertions.rb
r4934 r4935 54 54 require File.dirname(__FILE__) + '/assertions/routing_assertions' 55 55 require File.dirname(__FILE__) + '/assertions/model_assertions' 56 require File.dirname(__FILE__) + '/assertions/deprecated_assertions' 56 57 57 58 module Test #:nodoc: … … 64 65 include ActionController::Assertions::DomAssertions 65 66 include ActionController::Assertions::ModelAssertions 67 include ActionController::Assertions::DeprecatedAssertions 66 68 67 69 def clean_backtrace(&block) trunk/actionpack/lib/action_controller/assertions/deprecated_assertions.rb
r1190 r4935 1 require 'test/unit'2 require 'test/unit/assertions'3 1 require 'rexml/document' 4 2 5 module Test#:nodoc:6 module Unit#:nodoc:7 module Assertions3 module ActionController #:nodoc: 4 module Assertions #:nodoc: 5 module DeprecatedAssertions 8 6 def assert_success(message=nil) #:nodoc: 9 7 assert_response(:success, message) trunk/actionpack/lib/action_controller/assertions/dom_assertions.rb
r4934 r4935 1 require 'test/unit'2 require 'test/unit/assertions'3 4 1 module ActionController 5 2 module Assertions trunk/actionpack/lib/action_controller/assertions/model_assertions.rb
r4934 r4935 1 require 'test/unit'2 require 'test/unit/assertions'3 4 1 module ActionController 5 2 module Assertions trunk/actionpack/lib/action_controller/assertions/response_assertions.rb
r4934 r4935 1 require 'test/unit'2 require 'test/unit/assertions'3 1 require 'rexml/document' 4 2 require File.dirname(__FILE__) + "/../vendor/html-scanner/html/document" trunk/actionpack/lib/action_controller/assertions/routing_assertions.rb
r4934 r4935 1 require 'test/unit'2 require 'test/unit/assertions'3 4 1 module ActionController 5 2 module Assertions trunk/actionpack/lib/action_controller/assertions/selector_assertions.rb
r4934 r4935 4 4 #++ 5 5 6 require 'test/unit'7 require 'test/unit/assertions'8 6 require 'rexml/document' 9 7 require File.dirname(__FILE__) + "/../vendor/html-scanner/html/document" 10 11 8 12 9 module ActionController trunk/actionpack/lib/action_controller/assertions/tag_assertions.rb
r4934 r4935 1 require 'test/unit'2 require 'test/unit/assertions'3 1 require 'rexml/document' 4 2 require File.dirname(__FILE__) + "/../vendor/html-scanner/html/document" trunk/actionpack/lib/action_controller/test_process.rb
r4931 r4935 1 begin 2 require File.dirname(__FILE__) + '/assertions' 3 require File.dirname(__FILE__) + '/deprecated_assertions' 4 rescue Exception => e 5 print e 6 end 1 require File.dirname(__FILE__) + '/assertions' 7 2 8 3 module ActionController #:nodoc: