Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Ported the new ActionView::TestCase from 2-3-stable to master [#3260 | Erik Ostrom | 2009-09-28 | 3 | -26/+102 |
| | | | | | | | | | | | | | | | | | state:resolved] The test case now mimicks the template environment more closely, so it's possible to use render, load helper dependencies. This also fixes assert_select, and similar assertions. Because view tests and helpers generally don't render full templates assert_select looks first in rendered and then in output_buffer to find the rendered output. Additional `master'-only changes: Made the Action Pack Rakefile run the ActionView::TestCase tests, and made ActionView::Rendering#_render_text always return a string. Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Introduce :almost keyword for distance_of_time_in_words. Make 1.75 days - 2 ↵ | John Trupiano | 2009-09-28 | 2 | -10/+22 |
| | | | | | | | days return '2 days'. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#3266 state:committed] | ||||
* | Enhancing distance_of_time_in_words to prefix year output with over and ↵ | Jay Pignata | 2009-09-28 | 1 | -4/+7 |
| | | | | | | | about depending upon how many months have elapsed Signed-off-by: Michael Koziarski <michael@koziarski.com> [#3106 state:committed] | ||||
* | Move middleware and route configuration from AC::Dispatcher to Rails ↵ | Joshua Peek | 2009-09-26 | 3 | -12/+6 |
| | | | | application object | ||||
* | Allow setting a default application for all integration tests | Joshua Peek | 2009-09-26 | 1 | -2/+20 |
| | |||||
* | Allow integration test rack app to be set with "@app" ivar instead of using ↵ | Joshua Peek | 2009-09-26 | 1 | -2/+3 |
| | | | | open_session | ||||
* | Move default middleware stack into initializer | Joshua Peek | 2009-09-26 | 2 | -20/+1 |
| | |||||
* | Move Rails::Static into ActionDispatch | Joshua Peek | 2009-09-26 | 2 | -1/+46 |
| | |||||
* | Extract "parse_config" into AD | Joshua Peek | 2009-09-25 | 2 | -0/+21 |
| | |||||
* | Fix generic url rewriter in integration tests | Joshua Peek | 2009-09-25 | 1 | -1/+1 |
| | |||||
* | Restore split between require-time and runtime load path mungery. Simplifies ↵ | Jeremy Kemper | 2009-09-24 | 1 | -1/+1 |
| | | | | vendor requires. | ||||
* | Move railties/lib/* into railties/lib/* | Yehuda Katz + Carl Lerche | 2009-09-24 | 1 | -0/+1 |
| | |||||
* | Clean up log output for rendered templates | Joshua Peek | 2009-09-24 | 4 | -67/+87 |
| | |||||
* | Resurrect AC::Benchmarking [#3140 state:resolved] | Joshua Peek | 2009-09-24 | 3 | -3/+97 |
| | |||||
* | SessionRestoreError belongs in AD | Joshua Peek | 2009-09-23 | 5 | -13/+12 |
| | |||||
* | Move helpers specific to functional tests out of TestProcess into AC::TestCase | Joshua Peek | 2009-09-23 | 2 | -152/+149 |
| | |||||
* | Move integration test runner into ActionDispatch | Joshua Peek | 2009-09-23 | 6 | -9/+20 |
| | |||||
* | Fixes Sam Ruby tests suite. | José Valim | 2009-09-21 | 1 | -6/+1 |
| | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com> | ||||
* | Use NewCallbacks on ActionDispatch::Callbacks. | José Valim | 2009-09-20 | 3 | -25/+41 |
| | |||||
* | Add Orchestra instrumentation to fragment and page caching. | José Valim | 2009-09-20 | 6 | -66/+57 |
| | |||||
* | Instrument process_action, render and sql. | José Valim | 2009-09-20 | 2 | -6/+11 |
| | |||||
* | 1.9 fix for changes to #to_s. By Sam Ruby. [#3228 state:resolved] | Yehuda Katz | 2009-09-18 | 1 | -2/+2 |
| | |||||
* | Forward all methods to delayed log | Joshua Peek | 2009-09-16 | 1 | -6/+8 |
| | |||||
* | Remove unused code in ActionView. | José Valim | 2009-09-15 | 4 | -133/+0 |
| | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com> | ||||
* | Beef up AD::Rescue to replace global exception handling lost in ↵ | Joshua Peek | 2009-09-15 | 1 | -4/+16 |
| | | | | ApplicationController | ||||
* | Remove global exception catching from ApplicationController. | Joshua Peek | 2009-09-15 | 2 | -48/+7 |
| | | | It was severely broken since it was ported to NewBase and is causing problems with normal exception catching. A replacement is coming soon. | ||||
* | Require active_support after autoload setup | Jeremy Kemper | 2009-09-14 | 2 | -9/+9 |
| | |||||
* | Uses extlib_inheritable_accessor | Jeremy Kemper | 2009-09-14 | 1 | -0/+2 |
| | |||||
* | Rollback AS bundler work and improve activation of vendored dependencies | Joshua Peek | 2009-09-13 | 1 | -1/+1 |
| | |||||
* | AV::UrlHelper depends on Array#second | Joshua Peek | 2009-09-13 | 1 | -0/+1 |
| | |||||
* | Omit PATH_INFO in integration test so rack mock will properly override it | Joshua Peek | 2009-09-13 | 1 | -1/+0 |
| | |||||
* | Lazy require memcache for session middleware | Joshua Peek | 2009-09-13 | 1 | -40/+35 |
| | |||||
* | Don't force test suite to use bundler | Joshua Peek | 2009-09-13 | 1 | -0/+1 |
| | |||||
* | Merge commit 'alloy/master-nested_attributes_and_autosave' | Michael Koziarski | 2009-09-13 | 1 | -7/+19 |
|\ | |||||
| * | Allow fields_for on a nested_attributes association to accept an explicit ↵ | Andrew France | 2009-09-12 | 1 | -7/+19 |
| | | | | | | | | | | | | collection to be used. [#2648 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | ||||
* | | Memoize in the endpoint. | Yehuda Katz | 2009-09-12 | 1 | -5/+10 |
| | | |||||
* | | Add per-controller middleware | Yehuda Katz | 2009-09-12 | 1 | -1/+14 |
|/ | |||||
* | Revert "Allow frameworks to be required by their gem name" | Jeremy Kemper | 2009-09-12 | 1 | -1/+0 |
| | | | | | | | This has just been confusing. Better to educate than band-aid. This reverts commit 18a24274ec823ded4ffa29bf33fd3d76816aab7e. Originally from http://dev.rubyonrails.org/ticket/8845 [drnic] | ||||
* | Fix filtering parameters when there are Fixnum or other un-dupable values. | Nathaniel Talbott | 2009-09-10 | 1 | -1/+1 |
| | | | | | | [#3184 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Fix callbacks on ActionPack. | José Valim | 2009-09-08 | 1 | -1/+1 |
| | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com> | ||||
* | Cleanup hacky routing with controller_path in url helper tests. This doesn't ↵ | Joshua Peek | 2009-09-06 | 1 | -1/+1 |
| | | | | work in real life anyway. | ||||
* | Clean tag attributes before passing through the escape_once logic. | Michael Koziarski | 2009-09-04 | 1 | -1/+1 |
| | | | | Addresses CVE-2009-3009 | ||||
* | CookieStore should not be derived from Hash - reverting [#2268 state:resolved] | Jay Pignata | 2009-09-03 | 1 | -1/+1 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Replace :formats => ["*/*"] with the default formats set | Yehuda Katz + Carl Lerche | 2009-09-03 | 1 | -0/+2 |
| | |||||
* | Refactor ActionController to use find_template and template_exists? | Yehuda Katz + Carl Lerche | 2009-09-03 | 4 | -8/+12 |
| | |||||
* | Don't raise exceptions for missing javascript_include_tag or ↵ | Sam Pohlenz | 2009-09-03 | 1 | -2/+6 |
| | | | | | | stylesheet_link_tag sources unless the :cache or :concat options are given. [#2738 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Refactor ActionView::Resolver | Yehuda Katz + Carl Lerche | 2009-09-03 | 3 | -78/+97 |
| | |||||
* | Extract finding the template in AC to it's own method | Yehuda Katz + Carl Lerche | 2009-09-03 | 1 | -3/+5 |
| | |||||
* | If session_options[:id] is requested when using CookieStore, unmarshal the ↵ | Jay Pignata | 2009-09-03 | 1 | -3/+14 |
| | | | | | | session to access it [#2268 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Fix the */* with Net::HTTP bug [#3100 state:resolved] | Yehuda Katz + Carl Lerche | 2009-09-01 | 1 | -22/+9 |
| |