Joshua Peek 5e519fb015 Merge branch '3-1-stable' ...

Conflicts:
	actionpack/actionpack.gemspec
	activemodel/activemodel.gemspec

2011-05-22 20:11:36 -05:00

..

abstract

removing usesless variable assignments

2011-01-18 15:52:56 -08:00

activerecord

Revert "Take into account time spent in AR even if a redirect occurs or if it is after the render" because it's causing test failures about missing db_during_render.

2011-05-22 18:10:52 -05:00

controller

renamed the wrap_parameters :only and :except options to :include and :exclude to make it consistent with controller filters

2011-05-19 10:33:25 -04:00

dispatch

adding test

2011-05-19 10:33:18 -04:00

fixtures

Add debug_asset support

2011-05-22 15:10:53 -05:00

lib

Fix tests on 1.9.2.

2010-11-28 12:48:50 +01:00

template

Merge branch '3-1-stable'

2011-05-22 20:11:36 -05:00

tmp

Use safe tmp dir

2009-08-13 21:03:25 -05:00

abstract_unit.rb

Make sure that we're able to run Action Pack test standalone.

2011-05-22 19:02:54 -04:00

active_record_unit.rb

Autoload AR test case

2010-01-04 16:50:01 -06:00

ts_isolated.rb

Give useful test:isolated failures

2009-11-04 12:44:06 -08:00