aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10652 from md5/concern-multiple-includedRafael Mendonça França2013-05-161-0/+14
|\ | | | | Raise an error when multiple included blocks are defined for a Concern
| * Raise when multiple included blocks are definedMike Dillon2013-05-161-0/+14
| |
* | Merge pull request #10527 from zenspider/squishy_minitest5Aaron Patterson2013-05-162-111/+1
|\ \ | |/ |/| Squishy minitest5
| * Updates to make rails 4 happy with minitest 5:Ryan Davis2013-05-062-111/+1
| | | | | | | | | | | | | | | | | | | | + Namespace changes, overhaul of runners. + Internal ivar name changes - Removed a logger globally applied to tests that spew everywhere?!? + Override Minitest#__run to sort tests by name. + Reworked testing isolation to work with the new cleaner architecture. - Removed a bunch of tests that just test minitest straight up. I think these changes were all merged to minitest 4 a long time ago. - Minor report output differences.
* | remove deprecation noticesAaron Patterson2013-05-151-16/+0
| |
* | Fix HWIA#to_hash behavior with array of hashes.kennyj2013-05-161-0/+5
| |
* | deprecating string based terminatorsAaron Patterson2013-05-141-1/+1
| |
* | Merge pull request #10266 from vipulnsward/fix_HIA_to_hashRafael Mendonça França2013-05-141-0/+4
|\ \ | | | | | | fix HashWithIndifferentAccess#to_hash behaviour
| * | fix HashWithIndifferentAccess#to_hash behaviourVipul A M2013-04-191-0/+4
| | |
* | | Merge branch 'master' into normalizecbAaron Patterson2013-05-141-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | * master: private callback methods should work Update mail to minimum version 2.5.4
| * | | private callback methods should workAaron Patterson2013-05-141-1/+2
| | | |
* | | | Merge branch 'master' into normalizecbAaron Patterson2013-05-131-0/+40
|\| | | | | | | | | | | | | | | | | | | * master: adding more callback type coverage
| * | | adding more callback type coverageAaron Patterson2013-05-131-0/+40
| | | |
* | | | pass the actual filter, not a stringAaron Patterson2013-05-131-1/+1
|/ / /
* | | add tests for reset_calbacksAaron Patterson2013-05-131-0/+40
| | |
* | | Replace multi_json with jsonErik Michaels-Ober2013-05-111-23/+13
| | |
* | | Merge pull request #10534 from cmaruz/masterRafael Mendonça França2013-05-101-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Escape of U+2028 and U+2029 in the JSON Encoder Conflicts: activesupport/lib/active_support/json/encoding.rb
| * | | Added escaping of U+2028 and U+2029 inside the json encoder.Mario Caropreso2013-05-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U+2028 and U+2029 are allowed inside strings in JSON (as all literal Unicode characters) but JavaScript defines them as newline seperators. Because no literal newlines are allowed in a string, this causes a ParseError in the browser. We work around this issue by replacing them with the escaped version. The resulting JSON is still valid and can be parsed in the browser. This commit has been coauthored with Viktor Kelemen @yikulju
* | | | remove redundant varVipul A M2013-05-091-1/+0
| | | |
* | | | add test for object conditional with scopeAaron Patterson2013-05-081-0/+19
| | | |
* | | | adding a class conditional testAaron Patterson2013-05-081-0/+12
| | | |
* | | | adding tests for lambdas as conditionsAaron Patterson2013-05-081-0/+40
|/ / /
* | | we need to indicate the type of callbackAaron Patterson2013-05-081-2/+2
| | |
* | | adding more tests around callback inconsistenciesAaron Patterson2013-05-081-5/+47
| | |
* | | refactor tests for more pointsAaron Patterson2013-05-081-4/+5
| | |
* | | adding test to demonstrate inconsistencies in the AS::Callbacks apiAaron Patterson2013-05-081-0/+41
| | |
* | | Fix Typo existant -> existent [ci skip]Prathamesh Sonpatki2013-05-081-1/+1
| | |
* | | fix issue #10502, do not recompute method name for already-stringified ↵Sean Walbran2013-05-071-0/+22
| | | | | | | | | | | | object filter
* | | Merge pull request #10234 from dasch/dasch/fetch-multiRafael Mendonça França2013-05-061-0/+20
|\ \ \ | |_|/ |/| | Allow fetching multiple values from the cache at once
| * | Allow fetching multiple values from the cache at onceDaniel Schierbeck2013-05-061-0/+20
| | | | | | | | | | | | | | | Add a simple API for fetching a list of entries from the cache, where any missing entries are computed by a supplied block.
* | | use nokogirisax as a backendAnton Kalyaev2013-05-051-3/+3
| | | | | | | | | | | | | | | Most likely someone just forgot to change it during copying and pasting test cases from nokigiri engine test.
* | | Fixed bad tests to clean up after themselves.Ryan Davis2013-05-034-6/+27
| | |
* | | Squashed commit of the following:Aaron Patterson2013-05-036-109/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 2683de5da85135e8d9fe48593ff6167db9d64b18 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri May 3 11:29:20 2013 -0700 cannot support infinite ranges right now commit cebb6acef2c3957f975f6db4afd849e535126253 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri May 3 11:26:12 2013 -0700 reverting infinity comparison commit 385f7e6b4efd1bf9b89e8d607fcb13e5b03737ea Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri May 3 11:23:28 2013 -0700 Revert "Added ability to compare date/time with infinity" This reverts commit 38f28dca3aa16efd6cc3af6453f2e6b9e9655ec1. Conflicts: activesupport/CHANGELOG.md activesupport/lib/active_support/core_ext/numeric/infinite_comparable.rb activesupport/test/core_ext/date_ext_test.rb activesupport/test/core_ext/date_time_ext_test.rb activesupport/test/core_ext/numeric_ext_test.rb activesupport/test/core_ext/time_ext_test.rb activesupport/test/core_ext/time_with_zone_test.rb commit 0d799a188dc12b18267fc8421675729917610047 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri May 3 11:18:53 2013 -0700 Revert "Refactor infinite comparable definition a bit" This reverts commit dd3360e05e4909f2f0c74a624cccc2def688f828. commit 42dec90e49745bbfae546f0560b8783f6b48b074 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri May 3 11:18:47 2013 -0700 Revert "Require 'active_support/core_ext/module/aliasing' in the infinite_comparable module" This reverts commit 7003e71c13c53ec3d34250560fbf80b8381df693.
* | Merge pull request #10412 from vipulnsward/fix_callback_test_typoCarlos Antonio da Silva2013-05-021-1/+1
|\ \ | | | | | | Fix typo in test
| * | Fix typo in testVipul A M2013-05-021-1/+1
| | |
* | | Fix failures in AS with minitest 4.7.4Carlos Antonio da Silva2013-05-011-0/+3
| | |
* | | Revert "Object#in? also accepts multiple parameters"Brian Morearty2013-05-011-10/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ebf69ab1636df74c76332c53bcd3d8494fb91b45. `in?` must not take multiple parameters because its behavior would be ambiguous: # Test if "B" is included in a list of names with `"B".in?(*names)`: names = ["BMorearty"] "B".in?(*names) # => true names = ["BMorearty","rubyduo"] "B".in?(*names) # => false Conflicts: activesupport/lib/active_support/core_ext/object/inclusion.rb activesupport/test/core_ext/object/inclusion_test.rb
* | Module#delegate checks nilness rather that falsehood if :allow_nil is true, ↵Xavier Noria2013-04-261-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and avoids multiple evaluation of the target method Notes: 1) I hope nilness is a word. 2) See rationale for avoiding multiple evaluation in a comment in the patch, credit goes to @jeremy for pointing out this gotcha in the existing implementation. 3) Embeds a little joke dedicated to @pixeltrix (it could be worse! :D). References #10347.
* | Merge pull request #10351 from ↵Xavier Noria2013-04-261-0/+5
|\ \ | | | | | | | | | | | | JonRowe/update_as_date_next_week_to_document_intent Propose better documentation for ActiveSupports `next_week` functionaility
| * | better document `next_week` functionaility closes #9568Jon Rowe2013-04-261-0/+5
| | |
* | | Delegation method bugLi Ellis Gallardo2013-04-251-0/+5
|/ / | | | | | | | | | | Add documentation and test to delegation method that make sure we're aware that when a delegated object is not nil or false and doesn't respond to the method it will still raise a NoMethodError exception.
* | Adjust for daylight savings in String#to_timeAndrew White2013-04-231-2/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes in b79adc4323 had a bug where if the time in the String was in standard time but the current time was in daylight savings then the calculated adjustment was off by an hour. This commit fixes this and adds extra tests for the following: * time in string is standard time, current time is standard time * time in string is standard time, current time is daylight savings * time in string is daylight savings, current time is standard time * time in string is daylight savings, current time is daylight savings Fixes #10306.
* | Merge pull request #10096 from benofsky/fix_skipping_object_callback_filtersRafael Mendonça França2013-04-211-0/+17
|\ \ | |/ |/| Fixes skipping object callback filters
| * Fixes skipping object callback filtersBen McRedmond2013-04-041-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows you to skip callbacks that are defined by objects, e.g. for `ActionController`: skip_after_filter MySpecialFilter Previously this didn't work due to a bug in how Rails compared callbacks in `Callback#matches?`. When a callback is compiled, if it's an object filter (i.e. not a method, proc, etc.), `Callback` now defines a method on `@klass` that is derived from the class name rather than `@callback_id`. So, when `skip_callback` tries to find the appropriate callback to remove, `Callback` can regenerate the method name for the filter object and return the correct value for `Callback#matches?`.
* | more descriptive NameError's messages for class attributesHrvoje Šimić2013-04-171-4/+6
| |
* | switch (and lazily convert) ivar names to 3.xSam Ruby2013-04-161-16/+15
| |
* | refactor order hash testVipul A M2013-04-111-5/+1
| |
* | Revert "Merge pull request #10158 from steveklabnik/issue_10125"Rafael Mendonça França2013-04-101-17/+0
| | | | | | | | | | | | | | | | This reverts commit fa3ef8e82ab2f96cf15ef9bc885b2468fad77621, reversing changes made to e0af93dd3a5eeee2e2a67b05f34afb66cc80c00b. Reason: Routes, Active Record and the rendering stack should not depend on the default locale
* | Removed unused setupAnupam Choudhury2013-04-101-2/+0
| |
* | Fixed typoAnupam Choudhury2013-04-101-1/+1
| |