aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* Running isolated testsArun Agrawal2013-05-282-18/+7
| | | | These stopped running don't know when. But these should be running now.
* Require only minitest.Rafael Mendonça França2013-05-221-1/+1
| | | | | minitest/autorun required minitest/spec and we are avoiding to require it.
* Merge pull request #10667 from rubys/minitest-autorunRafael Mendonça França2013-05-221-1/+1
|\ | | | | Eliminate minitest warnings
| * Eliminate minitest warningsSam Ruby2013-05-171-1/+1
| | | | | | | | https://github.com/seattlerb/minitest/commit/9a57c520ceac76abfe6105866f8548a94eb357b6#L15R8
* | Add has_named_route? to the mapper APIJosé Valim2013-05-202-0/+18
|/
* Fix named routing regression from 3.2.13schneems2013-05-162-0/+12
| | | | | | | | | | | | | | | | | | | | | | When named route that is nested is used in 3.2.13 Example `routes.rb`: ``` resources :nested do resources :builder, :controller => 'nested/builder' end ``` In 3.2.12 and 3.2.12 this named route would work: ``` nested_builder_path(:last_step, :nested_id => "foo") ``` Generating a url that looks like `/nested/foo/builder/last_step`. This PR fixes the regression when building urls via the optimized helper. Any explicit keys set in the options are removed from the list of implicitly mapped keys. Not sure if this is exactly how the original version worked, but this fixes this use case regression.
* Merge pull request #10527 from zenspider/squishy_minitest5Aaron Patterson2013-05-161-1/+3
|\ | | | | Squishy minitest5
| * Updates to make rails 4 happy with minitest 5:Ryan Davis2013-05-061-1/+3
| | | | | | | | | | | | | | | | | | | | + 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.
* | 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
| | |
* | | 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.
* | | 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
| | |
* | | deprecating string based terminatorsAaron Patterson2013-05-141-1/+3
| | |
* | | inspect the filter when displaying error messagesAaron Patterson2013-05-141-1/+1
| | |
* | | use public api for testing rather than grabbing instance variablesAaron Patterson2013-05-141-1/+1
| | |
* | | Fixing build broken by this changeArun Agrawal2013-05-131-2/+2
|/ / | | | | | | c43ca06ca091fc09e2c86bb051ac92b648f12b64
* | Code cleanup for ActionDispatch::Flash#callJulian Vargas2013-05-121-9/+3
| | | | | | | | | | | | | | The nested `if` was replaced by using `presence` which takes account for the given hash when it is `nil` or when it is empty. The `else` was removed because what it was doing was to assign to `env[KEY]` the value it already had.
* | Replace multi_json with jsonErik Michaels-Ober2013-05-111-1/+1
| |
* | Merge pull request #10543 from vipulnsward/to_sortCarlos Antonio da Silva2013-05-101-1/+1
|\ \ | | | | | | Can you improve the commit message a little bit? It's good to describe why the change is happening.
| * | sort => sort! on new arrayVipul A M2013-05-101-1/+1
| | |
* | | Merge pull request #10510 from think602/masterXavier Noria2013-05-091-0/+1
|\ \ \ | |/ / |/| | [ci skip] document protect_against_forgery? method
| * | [ci skip] document protect_against_forgery? methodWeston Platter2013-05-101-0/+1
| | |
* | | Merge pull request #10536 from vipulnsward/fix_exp_warningCarlos Antonio da Silva2013-05-091-1/+0
|\ \ \ | | | | | | | | remove variable and fix warning
| * | | remove variable and fix warningVipul A M2013-05-091-1/+0
| | | |
* | | | rails -> Rails [ci skip]Prathamesh Sonpatki2013-05-091-1/+1
|/ / /
* / / Fix that JSON and XML exception responses should give the HTTP error message ↵Jeremy Kemper2013-05-082-4/+4
|/ / | | | | | | for their status, by default, not the message from the underlying exception
* | Test that #fresh_when accepts an arrayBrandon Keepers2013-05-071-2/+19
| | | | | | | | https://github.com/rails/etagger/pull/3
* | Merge pull request #10377 from bricker/template_digest_ending_with_numberRafael Mendonça França2013-05-064-3/+12
|\ \ | | | | | | Allow numbers in partial name for digesting
| * | Allow numbers in partial name for digestingBryan Ricker2013-05-064-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add failing test for template with number at the end Use \w for RENDER_DEPENDENCY regex Spacing Add CHANGELOG entry
* | | Merge pull request #10446 from dasch/instrument-template-compilationRafael Mendonça França2013-05-061-2/+9
|\ \ \ | |/ / |/| | Instrument template compilation
| * | Instrument template compilationDaniel Schierbeck2013-05-061-2/+9
| | |
* | | Merge pull request #10478 from cainlevy/patch-1Rafael Mendonça França2013-05-061-1/+1
|\ \ \ | |_|/ |/| | use canonical #controller_path logic in controller test cases
| * | use canonical #controller_path logic in controller test casesLance Ivy2013-05-051-1/+1
| | |
* | | remove unused variableVipul A M2013-05-061-1/+0
| | |
* | | Fix typo in documentation commentJunya Ogura2013-05-061-1/+1
|/ /
* | Added missing `require` to ActionView::LookupContextVladimir Strakhov2013-05-051-0/+1
| |
* | Fix generating route from engine to other enginePiotr Sarnacki2013-05-031-1/+2
|/ | | | | | | | | | | | A regression was introduced in 5b3bb6, generating route from within an engine to an another engine resulted in prefixing a path with the SCRIPT_NAME value. The regression was caused by the fact that SCRIPT_NAME should be appended only if it's the SCRIPT_NAME for the application, not if it's SCRIPT_NAME from the current engine. closes #10409
* Merge pull request #10426 from tkrajcar/rescue-h1-fixCarlos Antonio da Silva2013-05-021-0/+6
|\ | | | | Add styling to h1 for default rescue layout
| * Add styling to h1Tim Krajcar2013-05-021-0/+6
| |
* | use constant for encodingNihad Abbasov2013-05-021-1/+1
|/
* Fix failing AP testCarlos Antonio da Silva2013-05-011-1/+1
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-011-1/+1
|\
| * fixed typo in select_tag docsRncrtr2013-04-181-1/+1
| |
* | Merge pull request #9857 from yyyc514/bad_params_should_400Aaron Patterson2013-04-303-0/+8
|\ \ | | | | | | failure to parse params should trigger a 400 Bad Request
| * | failure to parse params should trigger a 400 Bad RequestJosh Goebel2013-03-213-0/+8
| | |
* | | add missing semicolon to journey parser.yBen Holley2013-04-301-0/+1
| | |
* | | Rack::Mount was replaced by Journey, Fixed commentGaurish Sharma2013-04-301-1/+1
| | |
* | | rails/master is now 4.1.0.betaRafael Mendonça França2013-04-292-1193/+3
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 08:00:22 +0000