aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "just call the class method since we know the callbacks are stored at ↵Aaron Patterson2013-05-161-2/+1
| | | | | | the" This reverts commit 55975c71ec9c2c18b67020484959ff5c69d4d3fb.
* Merge pull request #10652 from md5/concern-multiple-includedRafael Mendonça França2013-05-163-0/+28
|\ | | | | Raise an error when multiple included blocks are defined for a Concern
| * Raise when multiple included blocks are definedMike Dillon2013-05-163-0/+28
| |
* | Merge pull request #10527 from zenspider/squishy_minitest5Aaron Patterson2013-05-1613-146/+50
|\ \ | | | | | | Squishy minitest5
| * | oops. I should have only required minitest, not minitets/autorun. muscle memory.Ryan Davis2013-05-091-1/+1
| | |
| * | tweak dependenciesRyan Davis2013-05-082-2/+2
| | |
| * | Updates to make rails 4 happy with minitest 5:Ryan Davis2013-05-0611-144/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 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.
* | | test refactorAaron Patterson2013-05-161-5/+2
| | |
* | | Add more data to AR::UnknownAttributeErrorBogdan Gusiev2013-05-163-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | begin Topic.new("hello" => "world") rescue ActiveRecord::UnknownAttributeError => e e.record # => #<Topic ... > e.attribute # => "hello" end
* | | Merge pull request #10594 from shime/rack-debuggerAaron Patterson2013-05-162-4/+4
|\ \ \ | | | | | | | | exit with non-zero to signal failure
| * | | exit with non-zero to signal failureHrvoje Šimić2013-05-132-4/+4
| | | |
* | | | Merge pull request #10619 from alno/top_level_array_in_postgres_jsonAaron Patterson2013-05-163-1/+17
|\ \ \ \ | | | | | | | | | | Support array as root element in Postgresql JSON columns
| * | | | Support array as root element in JSONAlexey Noskov2013-05-143-1/+17
| | | | |
* | | | | Revert "Integration tests support the OPTIONS http method"Rafael Mendonça França2013-05-162-24/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ad46884af567d6f8d6d8d777f372c39e81a560ba. Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/testing/integration.rb actionpack/test/controller/integration_test.rb Reason: It will conflict with a lot of test cases. Better to call `process` directly since this is a very uncommon HTTP method. Fixes #10638.
* | | | | Merge pull request #10636 from seanwalbran/fix-asset-host-proc-returning-nilRafael Mendonça França2013-05-162-1/+13
|\ \ \ \ \ | |_|_|_|/ |/| | | | fix rails4 regression with asset_host Proc returning nil
| * | | | restore ability to return nil from asset_host proc, add testSean Walbran2013-05-152-1/+13
| | | | |
* | | | | restore whitespace in Gemfile between sqlite3 and sprocketsSam Ruby2013-05-161-1/+1
| | | | |
* | | | | Revert "Add the options method to action_controller testcase."Rafael Mendonça França2013-05-162-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0303c2325fab253adf5e4a0b738cb469c048f008. Conflicts: actionpack/lib/action_controller/test_case.rb REASON: It will conflict with a lot of test cases. Better to call `process` directly since this is a very uncommon HTTP method. Fixes #10638.
* | | | | Check if APP_RAKEFILE is definedPiotr Sarnacki2013-05-161-1/+1
| | | | |
* | | | | Merge pull request #10639 from cbartlett/masterCarlos Antonio da Silva2013-05-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove trailing line break in template
| * | | | | Remove trailing line breakColin Bartlett2013-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you generate a fresh app without ActiverRecord, this template exhibited a lone trailing line break. My watchful pre-commit hook told me about it so I've fixed it here.
* | | | | | Merge pull request #10640 from joelcogen/masterPiotr Sarnacki2013-05-161-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix detection of engine in rake db:load_config
| * | | | | Fix detection of engine in rake db:load_configJoel Cogen2013-05-161-1/+1
|/ / / / / | | | | | | | | | | | | | | | Broken by d1d7c86d0c8dcb7e75a87644b330c4e9e7d6c1c1
* | | | | tiny types should only be integers when the length is <= 1. fixes #10620Aaron Patterson2013-05-151-3/+9
| | | | |
* | | | | add failing test exposing mysql adapter tinyint bugphinze2013-05-151-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in myself, a column with type TINYINT(N) where N > 1 can be used to represent an integer, but the rails mysql adapter refuses to interpret as anything but a boolean.
* | | | | Merge pull request #10591 from acapilleri/cond_callback_testAaron Patterson2013-05-151-0/+13
|\ \ \ \ \ | | | | | | | | | | | | add test for skip_before_filter with condition
| * | | | | add test for skip_before_filter with conditionAngelo capilleri2013-05-131-0/+13
| | |_|/ / | |/| | |
* | | | | require things we needAaron Patterson2013-05-151-0/+1
| | | | |
* | | | | Merge pull request #10504 from kennyj/support_pg_91Rafael Mendonça França2013-05-153-6/+8
|\ \ \ \ \ | | | | | | | | | | | | Also should supports PostgreSQL 9.1 about extensions.
| * | | | | Remove unnecessary code, because this extension is created on demand in ↵kennyj2013-05-151-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | hstore_test.rb.
| * | | | | Also support extensions in PostgreSQL 9.1, because this has been supported ↵kennyj2013-05-152-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | since 9.1.
* | | | | | Revert "Merge pull request #10600 from aditya-kapoor/code_refactor"Rafael Mendonça França2013-05-151-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8ce3c1e5dde9fb180813e4d89324db03da110b13, reversing changes made to f93da579ce7f77dbd58b9a2165861aee265b8c93. Reason: It slow down the running time. require "diffbench" load 'output_safety.rb' N = 10000 b = ActiveSupport::SafeBuffer.new("hello world") DiffBench.bm do report "capitalize in safe buffer" do N.times do b.capitalize end end end > git checkout 069ea45; diffbench bench.rb; diffbench bench.rb;diffbench bench.rb;diffbench bench.rb;diffbench bench.rb;diffbench bench.rb;diffbench bench.rb; Running benchmark with current working tree Checkout HEAD^ Running benchmark with HEAD^ Checkout to previous HEAD again user system total real ----------------------------------capitalize in safe buffer After patch: 0.010000 0.000000 0.010000 ( 0.009733) Before patch: 0.010000 0.000000 0.010000 ( 0.007702) Improvement: -26% Running benchmark with current working tree Checkout HEAD^ Running benchmark with HEAD^ Checkout to previous HEAD again user system total real ----------------------------------capitalize in safe buffer After patch: 0.010000 0.000000 0.010000 ( 0.009768) Before patch: 0.010000 0.000000 0.010000 ( 0.007896) Improvement: -24% Running benchmark with current working tree Checkout HEAD^ Running benchmark with HEAD^ Checkout to previous HEAD again user system total real ----------------------------------capitalize in safe buffer After patch: 0.010000 0.000000 0.010000 ( 0.009938) Before patch: 0.010000 0.000000 0.010000 ( 0.007768) Improvement: -28% Running benchmark with current working tree Checkout HEAD^ Running benchmark with HEAD^ Checkout to previous HEAD again user system total real ----------------------------------capitalize in safe buffer After patch: 0.010000 0.000000 0.010000 ( 0.010001) Before patch: 0.010000 0.000000 0.010000 ( 0.007873) Improvement: -27% Running benchmark with current working tree Checkout HEAD^ Running benchmark with HEAD^ Checkout to previous HEAD again user system total real ----------------------------------capitalize in safe buffer After patch: 0.010000 0.000000 0.010000 ( 0.009670) Before patch: 0.010000 0.000000 0.010000 ( 0.007800) Improvement: -24% Running benchmark with current working tree Checkout HEAD^ Running benchmark with HEAD^ Checkout to previous HEAD again user system total real ----------------------------------capitalize in safe buffer After patch: 0.010000 0.000000 0.010000 ( 0.009949) Before patch: 0.010000 0.000000 0.010000 ( 0.007752) Improvement: -28%
* | | | | | just call the class method since we know the callbacks are stored at theAaron Patterson2013-05-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | class level
* | | | | | this variable is used, so we don't have to use double assignmentsAaron Patterson2013-05-151-1/+1
| | | | | |
* | | | | | remove dead codeAaron Patterson2013-05-151-23/+4
| | | | | |
* | | | | | remove deprecation noticesAaron Patterson2013-05-152-26/+0
| | | | | |
* | | | | | stop keeping a reference to the options hashAaron Patterson2013-05-151-12/+7
| | | | | |
* | | | | | conditions are guaranteed to be arrays by initializeAaron Patterson2013-05-151-2/+2
| | | | | |
* | | | | | simplify the condions lambda generationAaron Patterson2013-05-151-12/+2
| | | | | |
* | | | | | use unless instead of if!Aaron Patterson2013-05-151-3/+3
| | | | | |
* | | | | | Merge pull request #10631 from kennyj/improve_10266Rafael Mendonça França2013-05-152-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix HWIA#to_hash behavior with array of hashes.
| * | | | | | Fix HWIA#to_hash behavior with array of hashes.kennyj2013-05-162-2/+7
| | | | | | |
* | | | | | | Merge pull request #10601 from Ichimonji10/fix-docsRafael Mendonça França2013-05-151-15/+27
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Rewrite `activerecord/RUNNING_UNIT_TESTS.rdoc`
| * | | | | | Rewrite `activerecord/RUNNING_UNIT_TESTS`Jeremy Audet2013-05-151-15/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `RUNNING_UNIT_TESTS` is written in an unclear and confusing manner. This commit attempts to correct that. Thanks to zzak and vipulnsward for feedback.
* | | | | | | Merge pull request #10626 from firedev/masterGuillermo Iguaran2013-05-143-6/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| / / / / | |_|/ / / / |/| | | | | Removed incorrect warning from application.js templates and replaced it with stub command description
| * | | | | Removed incorrect warning from application.js templates and replaced it with ↵Nick2013-05-153-6/+3
|/ / / / / | | | | | | | | | | | | | | | stub command description
* | | | | only dup the options once, the Callback object does not mutate themAaron Patterson2013-05-141-2/+2
| | | | |
* | | | | make the compile method thread safeAaron Patterson2013-05-141-5/+7
| | | | |
* | | | | use inject rather than multiple assignmentsAaron Patterson2013-05-141-4/+2
| | | | |
* | | | | deprecating string based terminatorsAaron Patterson2013-05-146-9/+23
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-17 05:30:30 +0000