Jeremy Kemper
1df0a07f06
lazy-initialize already loaded fixtures map
2008-11-08 22:49:00 -05:00
Jeremy Kemper
d87d3f76d5
Ruby 1.9 compat: rescue Exception since minitest's assertion doesn't subclass StandardError
2008-11-08 22:46:13 -05:00
Jeremy Kemper
8bfd5edbcf
Wrap straggling mocha user with uses_mocha block
2008-11-08 22:43:56 -05:00
Jeremy Kemper
eda9f49d57
Ruby 1.9 compat: CGI switched back to Tempfile
2008-11-08 22:43:29 -05:00
Jeremy Kemper
8a1f913381
Workaround lack of Mocha on 1.9 (hasn't been updated for minitest yet)
2008-11-08 22:35:30 -05:00
Jeremy Kemper
ace9e533dc
Merge branch 'master' into testing
2008-11-08 18:58:29 -05:00
Jeremy Kemper
a6d6a1c9ac
Move sshpublisher require into the rake tasks that use it so ruby 1.9 and macruby don't need the rake gem installed
2008-11-08 18:58:08 -05:00
Pratik Naik
5cc27f2b03
Add some basic controller logging tests
2008-11-08 18:45:19 +05:30
Jeremy Kemper
dd77733f2f
Timeout the connection pool monitor on ruby 1.8 only
2008-11-08 00:27:18 -05:00
Jeremy Kemper
661980692b
Merge branch 'master' into testing
2008-11-07 21:54:29 -05:00
Jeremy Kemper
7c73518ef7
Merge branch 'master' of git@github.com:rails/rails
2008-11-07 21:54:18 -05:00
Jeremy Kemper
c0310bde48
Merge branch 'master' into testing
2008-11-07 21:51:08 -05:00
Jeremy Kemper
0be5bc3f59
Work around ruby 1.9 segfault
2008-11-07 21:50:39 -05:00
Ken Collins
a7f920f674
If average value from DB is 0, make sure to convert it to a 0.0 float before calling #to_d on it [ #1346 state:resolved]
...
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-11-07 20:39:06 -06:00
Jeremy Kemper
425382d95f
Don't worry about attribute ordering
2008-11-07 21:21:10 -05:00
Jeremy Kemper
07fe3370f8
Check whether last arg is a Hash instead of duck-typing against []
2008-11-07 21:20:26 -05:00
Jeremy Kemper
aaa2abf73f
Use delete if the rhs is nil
2008-11-07 21:19:02 -05:00
Jeremy Kemper
0994d11f26
Merge branch 'master' into testing
2008-11-07 19:55:29 -05:00
Jeremy Kemper
1767c4b2da
Merge branch 'master' of git@github.com:rails/rails
2008-11-07 19:49:15 -05:00
Jeremy Kemper
c77e6ace66
Check whether last arg is a Hash instead of duck-typing against []
2008-11-07 17:46:03 -05:00
Jeremy Kemper
99648c9672
Don't worry about attribute ordering
2008-11-07 17:45:10 -05:00
Jeremy Kemper
110c044e20
Use delete if the rhs is nil
2008-11-07 17:44:31 -05:00
Pratik Naik
d20955f889
Don't leave open dangling connections in development mode. [ #1335 state:resolved]
2008-11-08 04:04:32 +05:30
Nick Sieger
529c271699
Simplify dispatcher callbacks to eliminate unnecessary stale thread purging. [Nick Sieger, Pratik Naik]
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-11-08 03:49:54 +05:30
Jeremy Kemper
582aa2ead5
Set up fixtures in app's test_help
2008-11-07 16:23:22 -05:00
Jeremy Kemper
1d803e5189
Update AR tests
2008-11-07 16:22:56 -05:00
Jeremy Kemper
15c0774920
undef abstract methods instead of raising NotImplementedError. Still need the definitions for rdoc though.
2008-11-07 16:22:28 -05:00
Jeremy Kemper
4af46c4ba1
Update AR integration tests for TestCase changes
2008-11-07 15:51:50 -05:00
Jeremy Kemper
c82e8e1f48
Move controller assertions from base TestCase to AC:: and AV::TestCase
2008-11-07 15:42:34 -05:00
Jeremy Kemper
ebf14baa0e
Silence parens warning
2008-11-07 15:41:27 -05:00
Jeremy Kemper
b0ee1bdf26
Remove fixtures from Test::Unit::TestCase. Mix in AR::TestFixtures instead.
2008-11-07 15:40:56 -05:00
Rich Manalang
d3ec1d3c22
auto_link view helper was failing on URLs with colons after a query param
...
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1341 state:committed]
2008-11-07 19:33:18 +00:00
Jeremy Kemper
d355921709
Remove controller assertions from Test::Unit::TestCase. Use ActionController::TestCase.
2008-11-07 13:27:06 -05:00
Jeremy Kemper
00f72cf99d
Set AS::TestCase::Assertion to the underlying test exception for either miniunit or test/unit
2008-11-07 13:26:28 -05:00
Jeremy Kemper
ae9581e0f3
Extract test method declaration
2008-11-07 13:25:40 -05:00
Jeremy Kemper
728606df91
Just rescue exception rather than checking for both miniunit and test/unit
2008-11-07 13:00:13 -05:00
Jeremy Kemper
f12a2b4820
Subclass AS::TestCase to get custom assertions
2008-11-07 12:59:29 -05:00
Jeremy Kemper
70c2fcab09
Safer but hacky minitest autorun override
2008-11-07 12:58:42 -05:00
Jeremy Kemper
18099b0fd5
Rework testing extensions to reflect the recent miniunit upheaval
2008-11-07 12:45:48 -05:00
Tekin Suleyman
32a5cfcd7f
Added tests for HABTM associations with counter_sql
...
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1102 state:committed]
2008-11-07 07:50:30 +00:00
Tekin Suleyman
26978e3ce8
Added :counter_sql as a valid key for habtm associations
...
Signed-off-by: Michael Koziarski <michael@koziarski.com>
2008-11-07 07:50:23 +00:00
Michael Koziarski
9d4337ea13
Revert commit which breaks all the tests.
...
This reverts commit 8adb79b9b5983cda8dbdd4ef401661fbd51d8844.
Conflicts:
activerecord/CHANGELOG
2008-11-07 07:31:59 +00:00
Jeremy Kemper
7b28a55a2b
Remove direct TestCase mixins. Add miniunit compatibility.
2008-11-07 01:16:06 -05:00
Jeremy Kemper
983dc80787
Don't shadow local with black arg
2008-11-07 01:08:59 -05:00
Jeremy Kemper
66d4b55899
Fix indentation mismatch
2008-11-07 01:08:21 -05:00
Jeremy Kemper
b5291ed0f1
Mark utf-8 encoding
2008-11-07 01:01:04 -05:00
Joshua Peek
77697e0335
Fix memory leak issue in ActiveRecord scoped_methods
2008-11-06 17:10:16 -06:00
Luca Guidi
4ccbc5dffb
Increment the version of our modified memcache_client code to prevent users with the gem installed not seeing our changes.
...
The changes will be submitted upstream.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1239 state:committed]
2008-11-06 19:59:02 +00:00
Aliaksey Kandratsenka
099f10679e
Don't eval recognize_optimized use __FILE__ and __LINE__ in the optimised recognition code.
...
It produces meaningless line numbers. This also easily produces line numbers greater than recognition_optimization.rb have, which causes rcov to trash memory outside of it's coverage counting arrays.
[#1319 state:committed]
Signed-off-by: Michael Koziarski <michael@koziarski.com>
2008-11-06 19:52:44 +00:00
Michael Koziarski
af5b304a40
Fix stupid typo
2008-11-06 18:52:02 +00:00
