Skip to content

Commit

Permalink
convert railties to use AS::TestCase
Browse files Browse the repository at this point in the history
  • Loading branch information
tenderlove committed Jan 6, 2012
1 parent b8d8c50 commit 8f309e3
Show file tree
Hide file tree
Showing 35 changed files with 36 additions and 35 deletions.
2 changes: 1 addition & 1 deletion railties/test/application/asset_debugging_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
require 'rack/test'

module ApplicationTests
class AssetDebuggingTest < Test::Unit::TestCase
class AssetDebuggingTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation
include Rack::Test::Methods

Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/assets_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
require 'rack/test'

module ApplicationTests
class AssetsTest < Test::Unit::TestCase
class AssetsTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation
include Rack::Test::Methods

Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/build_original_fullpath_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require "abstract_unit"

module ApplicationTests
class BuildOriginalPathTest < Test::Unit::TestCase
class BuildOriginalPathTest < ActiveSupport::TestCase
def test_include_original_PATH_info_in_ORIGINAL_FULLPATH
env = { 'PATH_INFO' => '/foo/' }
assert_equal "/foo/", Rails.application.send(:build_original_fullpath, env)
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/configuration_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def self.delivered_email(email); email; end
class ::MyOtherMailObserver < ::MyMailObserver; end

module ApplicationTests
class ConfigurationTest < Test::Unit::TestCase
class ConfigurationTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation
include Rack::Test::Methods

Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/console_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'isolation/abstract_unit'

class ConsoleTest < Test::Unit::TestCase
class ConsoleTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def setup
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/generators_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require "isolation/abstract_unit"

module ApplicationTests
class GeneratorsTest < Test::Unit::TestCase
class GeneratorsTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def setup
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/initializers/boot_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require "isolation/abstract_unit"

module ApplicationTests
class GemBooting < Test::Unit::TestCase
class GemBooting < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def setup
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/initializers/frameworks_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require "isolation/abstract_unit"

module ApplicationTests
class FrameworksTest < Test::Unit::TestCase
class FrameworksTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def setup
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/initializers/hooks_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require "isolation/abstract_unit"

module ApplicationTests
class InitializersTest < Test::Unit::TestCase
class InitializersTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def setup
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/initializers/i18n_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require "isolation/abstract_unit"

module ApplicationTests
class I18nTest < Test::Unit::TestCase
class I18nTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def setup
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/initializers/load_path_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require "isolation/abstract_unit"

module ApplicationTests
class LoadPathTest < Test::Unit::TestCase
class LoadPathTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def setup
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require "isolation/abstract_unit"

module ApplicationTests
class NotificationsTest < Test::Unit::TestCase
class NotificationsTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def setup
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/loading_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'isolation/abstract_unit'

class LoadingTest < Test::Unit::TestCase
class LoadingTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def setup
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'isolation/abstract_unit'

module ApplicationTests
class BestPracticesTest < Test::Unit::TestCase
class BestPracticesTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def setup
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/middleware/cache_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'isolation/abstract_unit'

module ApplicationTests
class RoutingTest < Test::Unit::TestCase
class RoutingTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def setup
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/middleware/cookies_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'isolation/abstract_unit'

module ApplicationTests
class CookiesTest < Test::Unit::TestCase
class CookiesTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def new_app
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/middleware/exceptions_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
require 'rack/test'

module ApplicationTests
class MiddlewareExceptionsTest < Test::Unit::TestCase
class MiddlewareExceptionsTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation
include Rack::Test::Methods

Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/middleware/remote_ip_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'isolation/abstract_unit'

module ApplicationTests
class RemoteIpTest < Test::Unit::TestCase
class RemoteIpTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def setup
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/middleware/sendfile_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'isolation/abstract_unit'

module ApplicationTests
class SendfileTest < Test::Unit::TestCase
class SendfileTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def setup
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/middleware_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
require 'rack/test'

module ApplicationTests
class MiddlewareTest < Test::Unit::TestCase
class MiddlewareTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def setup
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/paths_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require "isolation/abstract_unit"

module ApplicationTests
class PathsTest < Test::Unit::TestCase
class PathsTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def setup
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/rack/logger_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

module ApplicationTests
module RackTests
class LoggerTest < Test::Unit::TestCase
class LoggerTest < ActiveSupport::TestCase
include ActiveSupport::LogSubscriber::TestHelper
include Rack::Test::Methods

Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/rackup_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require "isolation/abstract_unit"

module ApplicationTests
class RackupTest < Test::Unit::TestCase
class RackupTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def rackup
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/rake/migrations_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module ApplicationTests
module RakeTests
class RakeMigrationsTest < Test::Unit::TestCase
class RakeMigrationsTest < ActiveSupport::TestCase
def setup
build_app
boot_rails
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/rake/notes_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module ApplicationTests
module RakeTests
class RakeNotesTest < Test::Unit::TestCase
class RakeNotesTest < ActiveSupport::TestCase
def setup
build_app
require "rails/all"
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/rake_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
require "isolation/abstract_unit"

module ApplicationTests
class RakeTest < Test::Unit::TestCase
class RakeTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def setup
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/route_inspect_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
require 'rails/engine'

module ApplicationTests
class RouteInspectTest < Test::Unit::TestCase
class RouteInspectTest < ActiveSupport::TestCase
def setup
@set = ActionDispatch::Routing::RouteSet.new
@inspector = Rails::Application::RouteInspector.new
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/routing_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
require 'rack/test'

module ApplicationTests
class RoutingTest < Test::Unit::TestCase
class RoutingTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation
include Rack::Test::Methods

Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/runner_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'isolation/abstract_unit'

module ApplicationTests
class RunnerTest < Test::Unit::TestCase
class RunnerTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def setup
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/test_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'isolation/abstract_unit'

module ApplicationTests
class TestTest < Test::Unit::TestCase
class TestTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def setup
Expand Down
2 changes: 1 addition & 1 deletion railties/test/application/url_generation_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'isolation/abstract_unit'

module ApplicationTests
class UrlGenerationTest < Test::Unit::TestCase
class UrlGenerationTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def app
Expand Down
3 changes: 2 additions & 1 deletion railties/test/isolation/abstract_unit.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

require 'test/unit'
require 'rubygems'
require 'active_support/test_case'

# TODO: Remove setting this magic constant
RAILS_FRAMEWORK_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../..")
Expand Down Expand Up @@ -256,7 +257,7 @@ def boot_rails
end
end

class Test::Unit::TestCase
class ActiveSupport::TestCase
include TestHelpers::Paths
include TestHelpers::Rack
include TestHelpers::Generation
Expand Down
2 changes: 1 addition & 1 deletion railties/test/railties/engine_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
require "rack/test"

module RailtiesTest
class EngineTest < Test::Unit::TestCase
class EngineTest < ActiveSupport::TestCase

include ActiveSupport::Testing::Isolation
include SharedTests
Expand Down
2 changes: 1 addition & 1 deletion railties/test/railties/mounted_engine_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'isolation/abstract_unit'

module ApplicationTests
class ApplicationRoutingTest < Test::Unit::TestCase
class ApplicationRoutingTest < ActiveSupport::TestCase
require 'rack/test'
include Rack::Test::Methods
include ActiveSupport::Testing::Isolation
Expand Down
2 changes: 1 addition & 1 deletion railties/test/railties/railtie_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require "isolation/abstract_unit"

module RailtiesTest
class RailtieTest < Test::Unit::TestCase
class RailtieTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation

def setup
Expand Down

0 comments on commit 8f309e3

Please sign in to comment.