aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-27 18:44:00 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-27 18:44:25 -0300
commit610cf9da96726605f6bef7f276bcd7a97f4939e7 (patch)
tree66038026b0388677ecddb5dcc458b9a243bcede5 /actionpack
parent7f41a08fd8614022ec693c374178846973fcd8c2 (diff)
downloadrails-610cf9da96726605f6bef7f276bcd7a97f4939e7.tar.gz
rails-610cf9da96726605f6bef7f276bcd7a97f4939e7.tar.bz2
rails-610cf9da96726605f6bef7f276bcd7a97f4939e7.zip
remove method redefinition warnings
actionpack/test/template/spec_type_test.rb:32: warning: method redefined; discarding old test_spec_type_wont_match_non_space_characters actionpack/test/controller/spec_type_test.rb:30: warning: previous definition of test_spec_type_wont_match_non_space_characters was here
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/controller/spec_type_test.rb2
-rw-r--r--actionpack/test/template/spec_type_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/spec_type_test.rb b/actionpack/test/controller/spec_type_test.rb
index caeb0fd4dd..13be8a3405 100644
--- a/actionpack/test/controller/spec_type_test.rb
+++ b/actionpack/test/controller/spec_type_test.rb
@@ -3,7 +3,7 @@ require "abstract_unit"
class ApplicationController < ActionController::Base; end
class ModelsController < ApplicationController; end
-class SpecTypeTest < ActiveSupport::TestCase
+class ActionControllerSpecTypeTest < ActiveSupport::TestCase
def assert_controller actual
assert_equal ActionController::TestCase, actual
end
diff --git a/actionpack/test/template/spec_type_test.rb b/actionpack/test/template/spec_type_test.rb
index b35985d5f9..08a7bdf81d 100644
--- a/actionpack/test/template/spec_type_test.rb
+++ b/actionpack/test/template/spec_type_test.rb
@@ -1,6 +1,6 @@
require 'abstract_unit'
-class SpecTypeTest < ActiveSupport::TestCase
+class ActionViewSpecTypeTest < ActiveSupport::TestCase
def assert_view actual
assert_equal ActionView::TestCase, actual
end