diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-02-06 20:15:04 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-06 20:15:04 -0300 |
| commit | aff5e52484da7b4c2bc26552eb02222513d3976b (patch) | |
| tree | 985399e066cb97359841610267db70f92c15a3ec /activemodel | |
| parent | e3afc83631ebe2dbb3c4368756577bdd92ea1d62 (diff) | |
| parent | 4f8d86c822b5ceebbd1616f3329fbdf40d3f8431 (diff) | |
| download | rails-aff5e52484da7b4c2bc26552eb02222513d3976b.tar.gz rails-aff5e52484da7b4c2bc26552eb02222513d3976b.tar.bz2 rails-aff5e52484da7b4c2bc26552eb02222513d3976b.zip | |
Merge pull request #27928 from y-yagi/remove_activemodel_testcase_from_lib
Remove `ActiveModel::TestCase` from lib
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activemodel/lib/active_model.rb | 1 | ||||
| -rw-r--r-- | activemodel/lib/active_model/test_case.rb | 4 | ||||
| -rw-r--r-- | activemodel/test/cases/helper.rb | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index 853a1e7d9d..41051b1315 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -1,3 +1,7 @@ +* Remove unused `ActiveModel::TestCase` class. + + *Yuji Yaginuma* + * Moved DecimalWithoutScale, Text, and UnsignedInteger from Active Model to Active Record *Iain Beeston* diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb index 8163856a46..2389c858d5 100644 --- a/activemodel/lib/active_model.rb +++ b/activemodel/lib/active_model.rb @@ -42,7 +42,6 @@ module ActiveModel autoload :Naming autoload :SecurePassword autoload :Serialization - autoload :TestCase autoload :Translation autoload :Validations autoload :Validator diff --git a/activemodel/lib/active_model/test_case.rb b/activemodel/lib/active_model/test_case.rb deleted file mode 100644 index 5004855d56..0000000000 --- a/activemodel/lib/active_model/test_case.rb +++ /dev/null @@ -1,4 +0,0 @@ -module ActiveModel #:nodoc: - class TestCase < ActiveSupport::TestCase #:nodoc: - end -end diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb index 40dfb8e589..eeb5c85a48 100644 --- a/activemodel/test/cases/helper.rb +++ b/activemodel/test/cases/helper.rb @@ -9,7 +9,7 @@ I18n.enforce_available_locales = false require "active_support/testing/autorun" require "active_support/testing/method_call_assertions" -class ActiveModel::TestCase +class ActiveModel::TestCase < ActiveSupport::TestCase include ActiveSupport::Testing::MethodCallAssertions # Skips the current run on Rubinius using Minitest::Assertions#skip |