diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-09-22 09:26:08 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-09-22 09:26:08 +0200 |
| commit | 625fea9a9f7c985bd1e456c046de329f8872e85c (patch) | |
| tree | 379971f55563476835a238821d48449b83b9f4de | |
| parent | 5263f5e8474e5ccc5b36a245cb878d30e237b0fd (diff) | |
| parent | f8e26c8014ea57874b6d7580d95b1df555f0ad03 (diff) | |
| download | rails-625fea9a9f7c985bd1e456c046de329f8872e85c.tar.gz rails-625fea9a9f7c985bd1e456c046de329f8872e85c.tar.bz2 rails-625fea9a9f7c985bd1e456c046de329f8872e85c.zip | |
Merge pull request #17000 from yuki24/fix-false-assertions
Fix another false assertions
| -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 |