Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-11 | 7 | -42/+69 |
|\ | |||||
| * | Only track new constant definitions when we're reloading dependencies | Jeremy Kemper | 2008-11-10 | 2 | -7/+15 |
| | | |||||
| * | Eliminate excess Regexp creation due to capture counting | Jeremy Kemper | 2008-11-10 | 2 | -4/+26 |
| | | |||||
| * | Pare down object creation during route building | Jeremy Kemper | 2008-11-10 | 2 | -30/+27 |
| | | |||||
| * | Add simple case when DB calculations returns 0 instead of 0.0 [#1346 ↵ | Joshua Peek | 2008-11-10 | 1 | -1/+1 |
| | | | | | | | | state:resolved] | ||||
* | | Ruby 1.9 compat: check for minitest's assertion also | Jeremy Kemper | 2008-11-08 | 1 | -3/+3 |
| | | |||||
* | | lazy-initialize already loaded fixtures map | Jeremy Kemper | 2008-11-08 | 1 | -1/+1 |
| | | |||||
* | | Ruby 1.9 compat: rescue Exception since minitest's assertion doesn't ↵ | Jeremy Kemper | 2008-11-08 | 1 | -2/+2 |
| | | | | | | | | subclass StandardError | ||||
* | | Wrap straggling mocha user with uses_mocha block | Jeremy Kemper | 2008-11-08 | 1 | -5/+7 |
| | | |||||
* | | Ruby 1.9 compat: CGI switched back to Tempfile | Jeremy Kemper | 2008-11-08 | 1 | -10/+4 |
| | | |||||
* | | Workaround lack of Mocha on 1.9 (hasn't been updated for minitest yet) | Jeremy Kemper | 2008-11-08 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-08 | 4 | -8/+66 |
|\| | |||||
| * | Move sshpublisher require into the rake tasks that use it so ruby 1.9 and ↵ | Jeremy Kemper | 2008-11-08 | 1 | -1/+2 |
| | | | | | | | | macruby don't need the rake gem installed | ||||
| * | Add some basic controller logging tests | Pratik Naik | 2008-11-08 | 1 | -0/+46 |
| | | |||||
| * | Timeout the connection pool monitor on ruby 1.8 only | Jeremy Kemper | 2008-11-08 | 2 | -7/+18 |
| | | |||||
* | | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-07 | 1 | -1/+1 |
|\| | |||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-11-07 | 1 | -1/+1 |
| |\ | |||||
| | * | If average value from DB is 0, make sure to convert it to a 0.0 float before ↵ | Ken Collins | 2008-11-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | calling #to_d on it [#1346 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-07 | 1 | -0/+1 |
|\| | | |||||
| * | | Work around ruby 1.9 segfault | Jeremy Kemper | 2008-11-07 | 1 | -0/+1 |
| | | | |||||
| * | | Don't worry about attribute ordering | Jeremy Kemper | 2008-11-07 | 1 | -1/+2 |
| | | | |||||
| * | | Check whether last arg is a Hash instead of duck-typing against [] | Jeremy Kemper | 2008-11-07 | 1 | -4/+9 |
| | | | |||||
| * | | Use delete if the rhs is nil | Jeremy Kemper | 2008-11-07 | 1 | -1/+5 |
| |/ | |||||
* | | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-07 | 9 | -20/+33 |
|\| | |||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-11-07 | 9 | -20/+33 |
| |\ | |||||
| | * | Don't leave open dangling connections in development mode. [#1335 ↵ | Pratik Naik | 2008-11-08 | 1 | -2/+1 |
| | | | | | | | | | | | | state:resolved] | ||||
| | * | Simplify dispatcher callbacks to eliminate unnecessary stale thread purging. ↵ | Nick Sieger | 2008-11-08 | 2 | -5/+1 |
| | | | | | | | | | | | | | | | | | | [Nick Sieger, Pratik Naik] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| | * | auto_link view helper was failing on URLs with colons after a query param | Rich Manalang | 2008-11-07 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1341 state:committed] | ||||
| | * | Added tests for HABTM associations with counter_sql | Tekin Suleyman | 2008-11-07 | 1 | -0/+23 |
| | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1102 state:committed] | ||||
| | * | Added :counter_sql as a valid key for habtm associations | Tekin Suleyman | 2008-11-07 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| | * | Revert commit which breaks all the tests. | Michael Koziarski | 2008-11-07 | 2 | -10/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8adb79b9b5983cda8dbdd4ef401661fbd51d8844. Conflicts: activerecord/CHANGELOG | ||||
* | | | Check whether last arg is a Hash instead of duck-typing against [] | Jeremy Kemper | 2008-11-07 | 1 | -4/+9 |
| | | | |||||
* | | | Don't worry about attribute ordering | Jeremy Kemper | 2008-11-07 | 1 | -1/+2 |
| | | | |||||
* | | | Use delete if the rhs is nil | Jeremy Kemper | 2008-11-07 | 1 | -1/+5 |
| | | | |||||
* | | | Set up fixtures in app's test_help | Jeremy Kemper | 2008-11-07 | 1 | -7/+8 |
| | | | |||||
* | | | Update AR tests | Jeremy Kemper | 2008-11-07 | 2 | -5/+5 |
| | | | |||||
* | | | undef abstract methods instead of raising NotImplementedError. Still need ↵ | Jeremy Kemper | 2008-11-07 | 1 | -4/+4 |
| | | | | | | | | | | | | the definitions for rdoc though. | ||||
* | | | Update AR integration tests for TestCase changes | Jeremy Kemper | 2008-11-07 | 2 | -12/+5 |
| | | | |||||
* | | | Move controller assertions from base TestCase to AC:: and AV::TestCase | Jeremy Kemper | 2008-11-07 | 26 | -265/+191 |
| | | | |||||
* | | | Silence parens warning | Jeremy Kemper | 2008-11-07 | 1 | -1/+1 |
| | | | |||||
* | | | Remove fixtures from Test::Unit::TestCase. Mix in AR::TestFixtures instead. | Jeremy Kemper | 2008-11-07 | 3 | -151/+153 |
| | | | |||||
* | | | Remove controller assertions from Test::Unit::TestCase. Use ↵ | Jeremy Kemper | 2008-11-07 | 3 | -71/+58 |
| | | | | | | | | | | | | ActionController::TestCase. | ||||
* | | | Set AS::TestCase::Assertion to the underlying test exception for either ↵ | Jeremy Kemper | 2008-11-07 | 1 | -1/+4 |
| | | | | | | | | | | | | miniunit or test/unit | ||||
* | | | Extract test method declaration | Jeremy Kemper | 2008-11-07 | 1 | -0/+21 |
| | | | |||||
* | | | Just rescue exception rather than checking for both miniunit and test/unit | Jeremy Kemper | 2008-11-07 | 2 | -7/+3 |
| | | | |||||
* | | | Subclass AS::TestCase to get custom assertions | Jeremy Kemper | 2008-11-07 | 1 | -1/+1 |
| | | | |||||
* | | | Safer but hacky minitest autorun override | Jeremy Kemper | 2008-11-07 | 1 | -4/+5 |
| | | | |||||
* | | | Rework testing extensions to reflect the recent miniunit upheaval | Jeremy Kemper | 2008-11-07 | 6 | -52/+64 |
| | | | |||||
* | | | Remove direct TestCase mixins. Add miniunit compatibility. | Jeremy Kemper | 2008-11-07 | 5 | -19/+91 |
|/ / | |||||
* | | Don't shadow local with black arg | Jeremy Kemper | 2008-11-07 | 1 | -4/+4 |
| | |