diff options
| author | Yuki Nishijima <mail@yukinishijima.net> | 2014-09-21 14:36:00 -0700 |
|---|---|---|
| committer | Yuki Nishijima <mail@yukinishijima.net> | 2014-09-21 17:16:21 -0700 |
| commit | f8e26c8014ea57874b6d7580d95b1df555f0ad03 (patch) | |
| tree | aea4ba142077f5d99bdbd029071c382a5c7a053a | |
| parent | 3f39ac4ee8ea96dbd921b13485e1976c04733889 (diff) | |
| download | rails-f8e26c8014ea57874b6d7580d95b1df555f0ad03.tar.gz rails-f8e26c8014ea57874b6d7580d95b1df555f0ad03.tar.bz2 rails-f8e26c8014ea57874b6d7580d95b1df555f0ad03.zip | |
Fix another false assertions
* The assertions in AS::Duration don't actually assert.
* The assertion in Railtie will pass even when `eager_load_namespaces`
doesn't include `AppTemplate::Application` if `Rails.application` is
truthy.
For more details, see here:
* https://github.com/rails/rails/pull/16998
* https://github.com/rails/rails/pull/17000
| -rw-r--r-- | activesupport/test/core_ext/duration_test.rb | 4 | ||||
| -rw-r--r-- | railties/test/application/configuration_test.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/test/core_ext/duration_test.rb b/activesupport/test/core_ext/duration_test.rb index 881faf93f5..f4d504914e 100644 --- a/activesupport/test/core_ext/duration_test.rb +++ b/activesupport/test/core_ext/duration_test.rb @@ -98,8 +98,8 @@ class DurationTest < ActiveSupport::TestCase def test_since_and_ago t = Time.local(2000) - assert t + 1, 1.second.since(t) - assert t - 1, 1.second.ago(t) + assert_equal t + 1, 1.second.since(t) + assert_equal t - 1, 1.second.ago(t) end def test_since_and_ago_without_argument diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index f8b4ee30d8..0eddf644d9 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -182,7 +182,7 @@ module ApplicationTests test "application is always added to eager_load namespaces" do require "#{app_path}/config/application" - assert Rails.application, Rails.application.config.eager_load_namespaces + assert_includes Rails.application.config.eager_load_namespaces, AppTemplate::Application end test "the application can be eager loaded even when there are no frameworks" do |