1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Moved in deprecated assertions and remove duplicated requires

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4935 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2006-09-03 20:27:48 +00:00
parent a4bef314fe
commit d52b4a6645
9 changed files with 6 additions and 27 deletions

View file

@ -53,6 +53,7 @@ require File.dirname(__FILE__) + '/assertions/tag_assertions'
require File.dirname(__FILE__) + '/assertions/dom_assertions'
require File.dirname(__FILE__) + '/assertions/routing_assertions'
require File.dirname(__FILE__) + '/assertions/model_assertions'
require File.dirname(__FILE__) + '/assertions/deprecated_assertions'
module Test #:nodoc:
module Unit #:nodoc:
@ -63,6 +64,7 @@ module Test #:nodoc:
include ActionController::Assertions::TagAssertions
include ActionController::Assertions::DomAssertions
include ActionController::Assertions::ModelAssertions
include ActionController::Assertions::DeprecatedAssertions
def clean_backtrace(&block)
yield

View file

@ -1,10 +1,8 @@
require 'test/unit'
require 'test/unit/assertions'
require 'rexml/document'
module Test #:nodoc:
module Unit #:nodoc:
module Assertions
module ActionController #:nodoc:
module Assertions #:nodoc:
module DeprecatedAssertions
def assert_success(message=nil) #:nodoc:
assert_response(:success, message)
end

View file

@ -1,6 +1,3 @@
require 'test/unit'
require 'test/unit/assertions'
module ActionController
module Assertions
module DomAssertions

View file

@ -1,6 +1,3 @@
require 'test/unit'
require 'test/unit/assertions'
module ActionController
module Assertions
module ModelAssertions

View file

@ -1,5 +1,3 @@
require 'test/unit'
require 'test/unit/assertions'
require 'rexml/document'
require File.dirname(__FILE__) + "/../vendor/html-scanner/html/document"

View file

@ -1,6 +1,3 @@
require 'test/unit'
require 'test/unit/assertions'
module ActionController
module Assertions
module RoutingAssertions

View file

@ -3,12 +3,9 @@
# Under MIT and/or CC By license.
#++
require 'test/unit'
require 'test/unit/assertions'
require 'rexml/document'
require File.dirname(__FILE__) + "/../vendor/html-scanner/html/document"
module ActionController
module Assertions
# Adds the #assert_select method for use in Rails functional

View file

@ -1,5 +1,3 @@
require 'test/unit'
require 'test/unit/assertions'
require 'rexml/document'
require File.dirname(__FILE__) + "/../vendor/html-scanner/html/document"

View file

@ -1,9 +1,4 @@
begin
require File.dirname(__FILE__) + '/assertions'
require File.dirname(__FILE__) + '/deprecated_assertions'
rescue Exception => e
print e
end
module ActionController #:nodoc:
class Base