aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10923 from arunagw/warning_removed_minitestCarlos Antonio da Silva2013-06-121-1/+1
|\ | | | | Warning removed for Minitest
| * Warning removed for MinitestArun Agrawal2013-06-121-1/+1
| |
* | Grammar nazi at work [ci skip]Paweł Gościcki2013-06-121-1/+1
|/
* fixed typo in action_view templatediatmpravin2013-06-081-1/+1
|
* Merge pull request #10841 from latortuga/fix-underscore-dependency-trackingDavid Heinemeier Hansson2013-06-042-14/+42
|\ | | | | Fix mismatching variable names when using an underscore
| * Fix mismatching variable names when using an underscoreDrew Ulmer2013-06-042-14/+42
| | | | | | | | | | | | | | | | The ERBTracker template digest helper class was using a regex to match render calls and it was incorrectly not matching against variables with underscores in the name. This caused it to use the wrong regex match data to populate the template dependency. Because underscore is a valid character for a variable, this fixes the ERBTracker to match it properly.
* | Merge pull request #10839 from gsamokovarov/clean-normalize_encoded_pathsRafael Mendonça França2013-06-041-11/+7
|\ \ | | | | | | Refactor ActionDispatch::Http::Parameters#normalize_encode_params
| * | Refactor ActionDispatch::Http::Parameters#normalize_encode_paramsGenadi Samokovarov2013-06-041-11/+7
| | |
* | | Merge pull request #10838 from gsamokovarov/routing-autoload_underRafael Mendonça França2013-06-041-5/+7
|\ \ \ | |_|/ |/| | DRY-up ActionDispatch::Routing autoloads
| * | Dry-up ActionDispatch::Routing autoloadsGenadi Samokovarov2013-06-041-5/+7
| |/
* | No need to load 'rake/packagetask' as it's alreadyArun Agrawal2013-06-021-1/+0
| | | | | | | | | | in 'rubygems/package_task'
* | Raise ArgumentError to fix Rails 4.1 deprecation warn message.kennyj2013-06-022-10/+8
| |
* | Remove Mime::Type#verify_request? and Mime::Type.browser_generated_types ↵kennyj2013-06-023-37/+0
| | | | | | | | were deprecated.
* | Remove ActionView::Template#mime_type was deprecated.kennyj2013-06-012-13/+0
| |
* | Remove ActionController::RecordIdentifier was deprecated.kennyj2013-06-015-99/+3
| |
* | Remove action_controller/vendor/html-scanner.rb was deprecated.kennyj2013-06-011-5/+0
| |
* | Remove :confirm and :disable_with options from ↵kennyj2013-06-012-69/+0
| | | | | | | | ActionView::Helpers::FormTagHelper were deprecated.
* | Remove link_to_function / button_to_function from ↵kennyj2013-06-012-84/+0
| | | | | | | | ActionView::Helpers::JavascriptHelper were deprecated.
* | Remove :confirm and :disable_with options for ↵kennyj2013-06-012-93/+0
| | | | | | | | ActionView::Helpers::UrlHelper#link_to and #button_to were deprecated.
* | Add propery docs to ActionDispatch::Response [ci skip]Steve Klabnik2013-05-301-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | After some discussion on Twitter with @skud, the documentation on ActionDispatch::Response is a bit sparse. This class is useful when you're writing tests, as often you want to assert various things about the response that's coming back. Better docs would make this easier for people new to testing in Rails. I only added some descriptions for various properties that were defined, and mostly just a sentence or two. Most of these things are familliar if you're working with HTTP, but some words is better than no words at all. Hopefully further commits will fix up things that aren't just documentation.
* | Merge pull request #10803 from gsamokovarov/extract-deep-mungeRafael Mendonça França2013-05-303-18/+27
|\ \ | | | | | | Extract ActionDispatch::Request#deep_munge
| * | Extract ActionDispatch::Request#deep_mungeGenadi Samokovarov2013-05-303-18/+27
| |/ | | | | | | | | | | | | | | | | ActionDispatch::Request#deep_munge was introduced as a private method, but was turned into a public one for the use of ActionDispatch::ParamsParser. I have extracted it into ActionDispatch::Request::Utils, so it does not get mixed up with the Request public methods.
* / `RoutesInspector` deals with routes using regexp as `:controller` optionYves Senn2013-05-302-1/+10
|/
* 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
|/ / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 12:24:41 +0000