aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Replaced `ActiveSupport::Concurrency::Latch` with concurrent-ruby.Jerry D'Antonio2015-07-133-16/+14
| | | | | | | | | | The concurrent-ruby gem is a toolset containing many concurrency utilities. Many of these utilities include runtime-specific optimizations when possible. Rather than clutter the Rails codebase with concurrency utilities separate from the core task, such tools can be superseded by similar tools in the more specialized gem. This commit replaces `ActiveSupport::Concurrency::Latch` with `Concurrent::CountDownLatch`, which is functionally equivalent.
* Expand coverage of JSON gem testsGodfrey Chan2015-07-111-16/+30
|
* Expand the JSON test coverage for Struct and Hash (?!)Godfrey Chan2015-07-111-1/+13
|
* Add tests to ensure we don't interfere with json gem's outputGodfrey Chan2015-07-113-102/+160
|
* fix class name typo [ci skip]yuuji.yaginuma2015-07-111-1/+1
|
* Merge pull request #20838 from TheBlasfem/improve_duplicable_documentationKasper Timm Hansen2015-07-111-1/+5
|\ | | | | Improve duplicable documentation [ci skip]
| * improve duplicable documentation [ci skip]Julio Lopez2015-07-101-1/+5
| |
* | Require yaml for XML mini isolation test.Kasper Timm Hansen2015-07-111-0/+1
| |
* | Merge pull request #17102 from matthewd/load-interlockAaron Patterson2015-07-103-34/+243
|\ \ | | | | | | Concurrent load interlock (rm Rack::Lock)
| * | Document ShareLock and the InterlockMatthew Draper2015-07-093-9/+42
| | |
| * | Rely on the load interlock for non-caching reloads, tooMatthew Draper2015-07-091-0/+10
| | |
| * | Soften the lock requirements when eager_load is disabledMatthew Draper2015-07-093-34/+200
| | | | | | | | | | | | | | | We don't need to fully disable concurrent requests: just ensure that loads are performed in isolation.
* | | Require yaml for time_zone isolation test.Kasper Timm Hansen2015-07-111-0/+1
| | | | | | | | | | | | See 2f26f611 for more info.
* | | Add multiple expected calls to assert_called_with.Kasper Timm Hansen2015-07-102-1/+13
| | |
* | | Require yaml for time_with_zone isolation testPrem Sichanugrist2015-07-101-0/+1
| | | | | | | | | | | | | | | Same fix as 109e71d2bb6d2305a091fe7ea96d4f6e9c7cd52d but after mocha got removed in 2f28e5b6417fd4e5d6060983b36262737558b613.
* | | Reuse the same test for HWIA reverse_merge!Rafael Mendonça França2015-07-101-3/+1
| | |
* | | Merge pull request #20828 from Sirupsen/hash-indifferent-dup-default-procRafael Mendonça França2015-07-104-13/+58
|\ \ \ | |_|/ |/| | active_support/indifferent_access: fix not raising when default_proc does
| * | test/hash: move lonely indifferent hash testSimon Eskildsen2015-07-102-11/+6
| | |
| * | active_support/indifferent_hash: dont raise on to_hash when default_proc raisesSimon Eskildsen2015-07-103-1/+22
| | |
| * | active_support/indifferent_hash: fix cloning default_proc on dupSimon Eskildsen2015-07-103-1/+30
| | |
* | | Removed use of mocha in active_supportRonak Jangir2015-07-108-65/+87
| | |
* | | Merge pull request #20784 from kaspth/great-expectationsKasper Timm Hansen2015-07-082-0/+121
|\ \ \ | |_|/ |/| | Add method call assertions for internal use.
| * | Add method call assertions for internal use.Kasper Timm Hansen2015-07-082-0/+121
| |/ | | | | | | | | Add `assert_called` and `assert_not_called` to boil down the boilerplate we need to write to assert methods are called certain number of times.
* | adding brackets to array in docsJulio Lopez2015-07-071-1/+1
| |
* | Add to RDoc of OrderedOptions the bang infoMauro George2015-07-061-0/+8
|/ | | | [ci skip]
* remove bad test.Aaron Patterson2015-06-251-4/+0
|
* Merge pull request #20575 from prathamesh-sonpatki/doc-xml-disallowed-typesZachary Scott2015-06-181-1/+19
|\ | | | | Added documentation about passing custom disallowed types to Hash#from_xml [ci skip]
| * Added documentation about passing custom disallowed types to Hash#from_xml ↵Prathamesh Sonpatki2015-06-181-1/+19
| | | | | | | | [ci skip]
* | enforce a depth limit on XML documentsAaron Patterson2015-06-163-10/+15
| | | | | | | | | | | | | | XML documents that are too deep can cause an stack overflow, which in turn will cause a potential DoS attack. CVE-2015-3227
* | Escape HTML entities in JSON keysRafael Mendonça França2015-06-162-0/+11
| | | | | | | | Fixes CVE-2015-3226
* | Merge pull request #20440 from repinel/fix-message-verifier-encoding-issueMatthew Draper2015-06-162-1/+2
|\ \ | | | | | | Fix the message verifier encoding issue
| * | Fix the message verifier encoding issueRoque Pinel2015-06-142-1/+2
| | | | | | | | | | | | | | | | | | | | | ```ruby verifier = ActiveSupport::MessageVerifier.new('secret') verifier.verify("\xff") # => ArgumentError: invalid byte sequence in UTF-8 ```
* | | Fix inflector test by using dup inflections when it needs to be changedRoque Pinel2015-06-151-86/+68
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not something that is failing at the moment, but can do it eventually. I had the issue with db62081 as the HEAD and with the following change: ``` --- a/activesupport/test/inflector_test.rb +++ b/activesupport/test/inflector_test.rb @@ -101,6 +101,7 @@ class InflectorTest < ActiveSupport::TestCase def test_acronyms ActiveSupport::Inflector.inflections do |inflect| inflect.acronym("API") + inflect.acronym("HTM") inflect.acronym("HTML") inflect.acronym("HTTP") inflect.acronym("RESTful") ``` I was expecting only `test_acronyms` to fail, but with a specific `seed` others were also failing: `ruby -w -I"lib:test" test/inflector_test.rb --seed 4313`. Now, `inflections` instance is duplicated on `setup` and restored on `teardown`. I decided to benchmark and check the impact of the patch and it seems to me to be fine. ``` Calculating ------------------------------------- without changes 1.000 i/100ms with setup dup 1.000 i/100ms with block dup 1.000 i/100ms ------------------------------------------------- without changes 0.817 (± 0.0%) i/s - 5.000 in 6.119916s with setup dup 0.784 (± 0.0%) i/s - 4.000 with block dup 0.797 (± 0.0%) i/s - 4.000 ``` Where `with setup dup` duplicates on setup for each test and `with block` duplicates for just for tests that actually modify `inflections`.
* | Merge pull request #18365 from pocke/fix_datatime_compareAaron Patterson2015-06-123-1/+15
|\ \ | | | | | | DateTime#<=> return nil when compare to the invalid String as Time.
| * | DateTime#<=> return nil when compare to the invalid String as Time.pocke2015-01-063-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before: p Time.now == 'a' # => false p Time.now <=> 'a' # => nil require 'active_support' require 'active_support/core_ext' p Time.now == 'a' # => false p Time.now <=> 'a' # => invalid date (ArgumentError) and on ruby 2.2, Time.now == 'a' warning. warning: Comparable#== will no more rescue exceptions of #<=> in the next release. warning: Return nil in #<=> if the comparison is inappropriate or avoid such comparison. after: - Error handling. - Quiet warnings.
* | | Merge pull request #20494 from ↵Rafael Mendonça França2015-06-122-1/+26
|\ \ \ | | | | | | | | | | | | | | | | knovoselic/active_support_concern_class_methods_fix [ActiveSupport] Fix for #20489 - ActiveSupport::Concern#class_methods affects parent classes
| * | | Fix for #20489 - ActiveSupport::Concern#class_methods affects parent classesKristijan Novoselic2015-06-122-1/+26
| | | |
* | | | select the AR adapter through `bin/test`.Yves Senn2015-06-111-0/+1
| | | |
* | | | use our runner (`bin/test`) for framework components.Yves Senn2015-06-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a script `bin/test` to most Rails framework components. The script uses the rails minitest plugin to augment the runner. See https://github.com/rails/rails/pull/19571 for details about the plugin. I did not yet add `bin/test` for activerecord, activejob and railties. These components rely on specific setup performed in the rake-tasks.
* | | | inline test runner check into `as/testing/autorun.rb`.Yves Senn2015-06-111-1/+8
| |_|/ |/| | | | | | | | | | | This makes it possible to easily get the runner working with existing setups that rely on `active_support/testing/autorun.rb`.
* | | Use block variable instead of globalRoque Pinel2015-06-091-1/+1
|/ /
* | Use block variable instead of globalRoque Pinel2015-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ```ruby Benchmark.ips do |x| x.report("$&") { "foo".gsub(/f/) { $&.hex } } x.report("block var") { "foo".gsub(/f/) { |match| match.hex } } end ``` ``` Calculating ------------------------------------- $& 23.271k i/100ms block var 24.804k i/100ms ------------------------------------------------- $& 321.981k (± 7.4%) i/s - 1.606M block var 324.949k (± 9.2%) i/s - 1.612M ```
* | Merge pull request #19571 from kaspth/improve-runner-integrationYves Senn2015-06-082-0/+64
|\ \ | | | | | | | | | Improve Test Runner's Minitest integration.
| * | Improve test runner's Minitest integration.Kasper Timm Hansen2015-06-042-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also adds free mix and matching of directories, files and lines filters. Like so: bin/rails test models/post_test.rb test/integration models/person_test.rb:26 You can also mix in a traditional Minitest filter: bin/rails test test/integration -n /check_it_out/
* | | Code fix in CHANGELOGAditya Sanghi2015-06-081-1/+1
| | | | | | | | | :nail: remove extraneous bracket
* | | Merge pull request #20464 from ronakjangir47/active_support_stubbingArthur Nogueira Neves2015-06-0710-309/+366
|\ \ \ | | | | | | | | Removed mocha stubbing in active_support
| * | | Removed mocha stubbing in active_supportRonak Jangir2015-06-0710-309/+366
| | | |
* | | | A few documentation tweaks [ci skip]Robin Dupret2015-06-073-5/+5
|/ / / | | | | | | | | | [Robin Dupret & Shunsuke Aida]
* | | Merge pull request #20443 from teoljungberg/thoughtbot-capitalizationKasper Timm Hansen2015-06-051-1/+1
|\ \ \ | | | | | | | | [ci skip] Fix `thoughtbot` capitalization
| * | | Fix `thoughtbot` capitalizationTeo Ljungberg2015-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | The company name is spelled `thoughtbot` per https://github.com/thoughtbot/presskit/blob/master/README.md#name