aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2012-08-28 09:32:24 -0700
committerJosé Valim <jose.valim@plataformatec.com.br>2012-08-28 09:32:24 -0700
commit52c0bf9843819b3a75d2bac2b8181966508913bc (patch)
treeee6af004a18d6f8ed3efff85019a0e94c4c0da52
parentdb8ff15a497191a952e47ed8ba761f6c2cf4a1f3 (diff)
parent1006382655487bf4afaa237920e03c1dfc8c5016 (diff)
downloadrails-52c0bf9843819b3a75d2bac2b8181966508913bc.tar.gz
rails-52c0bf9843819b3a75d2bac2b8181966508913bc.tar.bz2
rails-52c0bf9843819b3a75d2bac2b8181966508913bc.zip
Merge pull request #7468 from kennyj/tiny_fixings
Tiny fixes in railties/test/application.
-rw-r--r--railties/test/application/initializers/boot_test.rb2
-rw-r--r--railties/test/application/initializers/hooks_test.rb2
-rw-r--r--railties/test/application/middleware/cache_test.rb2
-rw-r--r--railties/test/application/middleware_test.rb2
-rw-r--r--railties/test/application/queue_test.rb3
5 files changed, 4 insertions, 7 deletions
diff --git a/railties/test/application/initializers/boot_test.rb b/railties/test/application/initializers/boot_test.rb
index 04c46058cb..7eda15894e 100644
--- a/railties/test/application/initializers/boot_test.rb
+++ b/railties/test/application/initializers/boot_test.rb
@@ -1,7 +1,7 @@
require "isolation/abstract_unit"
module ApplicationTests
- class GemBooting < ActiveSupport::TestCase
+ class BootTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation
def setup
diff --git a/railties/test/application/initializers/hooks_test.rb b/railties/test/application/initializers/hooks_test.rb
index 7c48696672..b2cea0a8e1 100644
--- a/railties/test/application/initializers/hooks_test.rb
+++ b/railties/test/application/initializers/hooks_test.rb
@@ -1,7 +1,7 @@
require "isolation/abstract_unit"
module ApplicationTests
- class InitializersTest < ActiveSupport::TestCase
+ class HooksTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation
def setup
diff --git a/railties/test/application/middleware/cache_test.rb b/railties/test/application/middleware/cache_test.rb
index 54b18542c2..19d3f3a397 100644
--- a/railties/test/application/middleware/cache_test.rb
+++ b/railties/test/application/middleware/cache_test.rb
@@ -1,7 +1,7 @@
require 'isolation/abstract_unit'
module ApplicationTests
- class RoutingTest < ActiveSupport::TestCase
+ class CacheTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation
def setup
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 34b460d0a7..3e096e99f2 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -1,6 +1,4 @@
require 'isolation/abstract_unit'
-require 'stringio'
-require 'rack/test'
module ApplicationTests
class MiddlewareTest < ActiveSupport::TestCase
diff --git a/railties/test/application/queue_test.rb b/railties/test/application/queue_test.rb
index 83ca981336..c856089540 100644
--- a/railties/test/application/queue_test.rb
+++ b/railties/test/application/queue_test.rb
@@ -1,8 +1,7 @@
require 'isolation/abstract_unit'
-require 'rack/test'
module ApplicationTests
- class GeneratorsTest < ActiveSupport::TestCase
+ class QueueTest < ActiveSupport::TestCase
include ActiveSupport::Testing::Isolation
def setup