Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Resurrecting 1.9 compatibility. | Carl Lerche & Yehuda Katz | 2009-04-13 | 1 | -1/+1 |
| | |||||
* | Bring abstract_controller up to date with rails/master | Carl Lerche & Yehuda Katz | 2009-04-13 | 4 | -87/+18 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0: 2259ecf368e6a6715966f69216e3ee86bf1a82a7 AR not available * This will be reimplemented with ActionORM or equivalent 06182ea02e92afad579998aa80144588e8865ac3 implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically 893e9eb99504705419ad6edac14d00e71cef5f12 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] * We will need to reimplement rails-dev-boost on top of the refactor; the changes here are very implementation specific and cannot be cleanly applied. The following commits are implicated: 199e750d46c04970b5e7684998d09405648ecbd4 3942cb406e1d5db0ac00e03153809cc8dc4cc4db f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690 e3b166aab37ddc2fbab030b146eb61713b91bf55 ae9f258e03c9fd5088da12c1c6cd216cc89a01f7 44423126c6f6133a1d9cf1d0832b527e8711d40f 0cb020b4d6d838025859bd60fb8151c8e21b8e84 workaround for picking layouts based on wrong view_paths [#1974 state:resolved] * The specifics of this commit no longer apply. Since it is a two-line commit, we will reimplement this change. 8c5cc66a831aadb159f3daaffa4208064c30af0e make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] * This does not apply at all. It should be trivial to apply the feature to the reimplemented ActionController::Base. 87e8b162463f13bd50d27398f020769460a770e3 fix HTML fallback for explicit templates [#2052 state:resolved] * There were a number of patches related to this that simply compounded each other. Basically none of them apply cleanly, and the underlying issue needs to be revisited. After discussing the underlying problem with Koz, we will defer these fixes for further discussion. | ||||
| * | The latest trunk of Mocha > 0.9.5 which addresses issue with MiniUnit ↵ | Ken Collins | 2009-03-10 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | compatibility uses namespaced integration classes. [#2060 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Oops, don't yield per expression | Jeremy Kemper | 2009-02-06 | 1 | -10/+9 |
| | | |||||
| * | Include failed difference expression in assert message | Jeremy Kemper | 2009-02-06 | 1 | -8/+10 |
| | | |||||
| * | Remove dead testing core_ext | Jeremy Kemper | 2009-02-06 | 2 | -78/+0 |
| | | |||||
| * | Work around enumerable string deprecation warnings | Jeremy Kemper | 2009-02-06 | 1 | -6/+9 |
| | | |||||
| * | Tightening the condition for including ↵ | Matthias Hennemeyer | 2009-02-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | ActiveSupport::Testing::SetupAndTeardown::ForMiniTest. [#1871 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Revert rspec-runner change. TODO: Add back support for the rspec T::U runner. | Carl Lerche & Yehuda Katz | 2009-04-09 | 1 | -11/+5 |
| | | |||||
* | | Layouts work in AbstractController. Add support for the rspec runner for T::U | Yehuda Katz and Carl Lerche | 2009-04-07 | 2 | -33/+61 |
| | | |||||
* | | Changes necessary to run the T::U tests with the rspec runner | Yehuda Katz and Carl Lerche | 2009-04-06 | 1 | -2/+10 |
| | | |||||
* | | Whoops. | Yehuda Katz | 2009-02-02 | 1 | -0/+40 |
|/ | |||||
* | Process time should be wall time when benchmarking | Pratik Naik | 2009-01-09 | 1 | -1/+1 |
| | |||||
* | Require Mocha >= 0.9.3 which includes a MiniTest adapter | Jeremy Kemper | 2008-11-23 | 1 | -45/+0 |
| | |||||
* | Move deprecation assertions so TestCase (and Mocha) needn't load on startup | Jeremy Kemper | 2008-11-23 | 1 | -0/+55 |
| | |||||
* | Get ActiveSupport::TestCase working with classic Test::Unit and MiniTest. ↵ | Jeremy Kemper | 2008-11-22 | 2 | -75/+82 |
| | | | | Fix broken Mocha + MiniTest. Assume ruby-core applies patch #771 fixing libraries which extend Test::Unit. | ||||
* | Mocha 0.9.0 compatibility for test setup/teardown callbacks | Jeremy Kemper | 2008-11-20 | 1 | -4/+6 |
| | |||||
* | Require callbacks so AS::TestCase may be required in isolation | Jeremy Kemper | 2008-11-15 | 1 | -0/+2 |
| | |||||
* | Extract test method declaration | Jeremy Kemper | 2008-11-07 | 1 | -0/+21 |
| | |||||
* | Rework testing extensions to reflect the recent miniunit upheaval | Jeremy Kemper | 2008-11-07 | 2 | -15/+15 |
| | |||||
* | Remove direct TestCase mixins. Add miniunit compatibility. | Jeremy Kemper | 2008-11-07 | 1 | -0/+61 |
| | |||||
* | Check first for git repository before using git branch | Pratik Naik | 2008-11-02 | 1 | -1/+1 |
| | |||||
* | added nicer failure reporting to #assert_difference to tell you the ↵ | madlep | 2008-10-03 | 1 | -4/+7 |
| | | | | | | | expression that failed rather than just the expected and actual values Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1161 state:committed] | ||||
* | Get rid of 'Object#send!'. It was originally added because it's in Ruby 1.9, ↵ | Jeremy Kemper | 2008-08-31 | 1 | -1/+5 |
| | | | | | | | | | | but it has since been removed from 1.9. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> Conflicts: actionpack/test/controller/layout_test.rb | ||||
* | Ruby 1.9 compat: switch profile_options to superclass_delegating_accessor | Jeremy Kemper | 2008-08-25 | 1 | -8/+9 |
| | |||||
* | Ruby 1.9 and GC::Profiler updates | Jeremy Kemper | 2008-08-18 | 1 | -6/+60 |
| | |||||
* | Once is enough, mmk | Jeremy Kemper | 2008-07-28 | 1 | -2/+2 |
| | |||||
* | Undefine old run method | Joshua Peek | 2008-07-19 | 1 | -0/+3 |
| | |||||
* | Decrease default benchmark runs from 10 to 4 | Jeremy Kemper | 2008-07-17 | 1 | -1/+1 |
| | |||||
* | Move test related core_ext stuff out of regular core ext to prevent nasty ↵ | Michael Koziarski | 2008-07-04 | 2 | -0/+71 |
| | | | | surprises when you require active_support then use Test::Unit directly. | ||||
* | Revert "Check for mocha gem without requiring the lib. [#403 state:resolved]" | Jeremy Kemper | 2008-06-23 | 1 | -2/+2 |
| | | | | This reverts commit 4d5ac3f3d2e1667971752c9a4e536de1a5bec364. | ||||
* | Check for mocha gem without requiring the lib. [#403 state:resolved] | Jeremy Kemper | 2008-06-22 | 1 | -2/+2 |
| | |||||
* | Don't assume RubyProf constants are defined | Jeremy Kemper | 2008-06-20 | 1 | -5/+5 |
| | |||||
* | Tired of seeing <foo>/run | Jeremy Kemper | 2008-06-20 | 1 | -1/+1 |
| | |||||
* | Don't profile GC runs/time by default | Jeremy Kemper | 2008-06-20 | 1 | -1/+1 |
| | |||||
* | Performance: add GC metrics for # of runs and total runtime | Jeremy Kemper | 2008-06-18 | 1 | -10/+48 |
| | |||||
* | Oops, include metric name in csv filename | Jeremy Kemper | 2008-06-18 | 1 | -1/+1 |
| | |||||
* | Performance: tweak unsupported metric error message | Jeremy Kemper | 2008-06-18 | 1 | -1/+1 |
| | |||||
* | Write benchmark output to separate files per test+metric. Support Lloyd ↵ | Jeremy Kemper | 2008-06-18 | 1 | -5/+35 |
| | | | | Hilaiel's GC.heap_info patch for current heap size. | ||||
* | process time for benchmarks (quicker), wall time for profiling (lower overhead) | Jeremy Kemper | 2008-06-16 | 1 | -10/+14 |
| | |||||
* | missed . joining rails version and git revision | Jeremy Kemper | 2008-06-16 | 1 | -1/+1 |
| | |||||
* | Metrics::Memory measures in fractional KB also | Jeremy Kemper | 2008-06-16 | 1 | -3/+3 |
| | |||||
* | Extract environment. Hardcode some git info so I can start working with it now. | Jeremy Kemper | 2008-06-16 | 1 | -8/+24 |
| | |||||
* | Force runs to be an integer. Start and stop RubyProf in same scope. Expect ↵ | Jeremy Kemper | 2008-06-15 | 1 | -12/+21 |
| | | | | memory measurements in fractional KB now instead of bytes. Convert object allocation measurements to integer. Wrap up measure_mode in Metric instance method. | ||||
* | Delegate run_test to @harness | Jeremy Kemper | 2008-06-15 | 1 | -3/+3 |
| | |||||
* | Metrics::[] escues NameError only. Fix MODE typo. | Jeremy Kemper | 2008-06-15 | 1 | -2/+2 |
| | |||||
* | Extract Metric and Performer. Simplify and refactor. | Jeremy Kemper | 2008-06-15 | 1 | -138/+212 |
| | |||||
* | Pass printer class to output_filename | Jeremy Kemper | 2008-06-14 | 1 | -8/+8 |
| | |||||
* | Performance: integration test benchmarking and profiling. [Jeremy Kemper] | Jeremy Kemper | 2008-06-14 | 1 | -0/+226 |
| | |||||
* | Rubinious: setup/teardown override for miniunit | Jeremy Kemper | 2008-06-10 | 1 | -7/+31 |
| |