diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-10 10:41:24 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-10 10:41:24 -0800 |
| commit | 522b72fd28b898c914cfbdbc31837e56702f60d5 (patch) | |
| tree | 4d1322e4a692d3c1c4b4b2519bd80e068c3b6b8b /activesupport/test/core_ext/range_ext_test.rb | |
| parent | a9a12700c72353397cf644073e58a3a1c60c30a2 (diff) | |
| parent | 3092324ef4e2f6f096adfbcf92597502b3ce91aa (diff) | |
| download | rails-522b72fd28b898c914cfbdbc31837e56702f60d5.tar.gz rails-522b72fd28b898c914cfbdbc31837e56702f60d5.tar.bz2 rails-522b72fd28b898c914cfbdbc31837e56702f60d5.zip | |
Merge branch 'master' into instance_reader
* master:
Fix GH #4720. Routing problem with nested namespace and already camelized controller option.
make Range#overlaps? accept Range of Time
improved test case for partial indices
Made schema dumper recognize partial indices' where statements
Added where option to add_index to support postgresql partial indices
Diffstat (limited to 'activesupport/test/core_ext/range_ext_test.rb')
| -rw-r--r-- | activesupport/test/core_ext/range_ext_test.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/activesupport/test/core_ext/range_ext_test.rb b/activesupport/test/core_ext/range_ext_test.rb index 8a91f6d69c..cf1ec448c2 100644 --- a/activesupport/test/core_ext/range_ext_test.rb +++ b/activesupport/test/core_ext/range_ext_test.rb @@ -71,4 +71,16 @@ class RangeTest < ActiveSupport::TestCase range = (1..3) assert range.method(:include?) != range.method(:cover?) end + + def test_overlaps_on_time + time_range_1 = Time.utc(2005, 12, 10, 15, 30)..Time.utc(2005, 12, 10, 17, 30) + time_range_2 = Time.utc(2005, 12, 10, 17, 00)..Time.utc(2005, 12, 10, 18, 00) + assert time_range_1.overlaps?(time_range_2) + end + + def test_no_overlaps_on_time + time_range_1 = Time.utc(2005, 12, 10, 15, 30)..Time.utc(2005, 12, 10, 17, 30) + time_range_2 = Time.utc(2005, 12, 10, 17, 31)..Time.utc(2005, 12, 10, 18, 00) + assert !time_range_1.overlaps?(time_range_2) + end end |