aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* don't use internal profiler methods on Rubinius and JRuby since we're only ↵Gonçalo Silva2011-04-033-8/+14
| | | | measuring wall clock for now (and the APIs will/can change, respectively)
* removed unused class declarationGonçalo Silva2011-04-031-2/+0
|
* Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-04-0331-105/+275
|\
| * Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0Santiago Pastorino2011-04-027-11/+0
| |
| * default_executable is deprecated since rubygems 1.7.0Santiago Pastorino2011-04-011-1/+0
| |
| * Moved Turn activation/dependency to railtiesDavid Heinemeier Hansson2011-03-318-38/+12
| |
| * Direct logging of Active Record to STDOUT so it's shown inline with the ↵David Heinemeier Hansson2011-03-312-0/+6
| | | | | | | | results in the console [DHH]
| * Add using Turn with natural language test case names if the library is ↵David Heinemeier Hansson2011-03-314-17/+44
| | | | | | | | available (which it will be in Rails 3.1) [DHH]
| * require turn only for minitestDavid Heinemeier Hansson2011-03-311-2/+6
| |
| * Use Turn to format all Rails tests and enable the natural language case namesDavid Heinemeier Hansson2011-03-312-0/+6
| |
| * Improve docs.José Valim2011-03-311-0/+31
| |
| * pass respond_with options to controller render when using a template for api ↵Josh Kalderimis2011-03-315-5/+25
| | | | | | | | | | | | navigation Signed-off-by: José Valim <jose.valim@gmail.com>
| * only try to display an api template in responders if the request is a get or ↵Josh Kalderimis2011-03-313-4/+31
| | | | | | | | | | | | there are no errors Signed-off-by: José Valim <jose.valim@gmail.com>
| * when using respond_with with an invalid resource and custom options, the ↵Josh Kalderimis2011-03-312-1/+19
| | | | | | | | | | | | default response status and error messages should be returned Signed-off-by: José Valim <jose.valim@gmail.com>
| * Delegate pending to skip if Minitest is availableDavid Heinemeier Hansson2011-03-301-21/+25
| |
| * use assert_equal so we get normal error messages along with our custom ↵Aaron Patterson2011-03-301-3/+3
| | | | | | | | failure message
| * Bring back AMo#i18n_key methodSantiago Pastorino2011-03-303-8/+13
| |
| * Merge branch 'master' of github.com:rails/railsAaron Patterson2011-03-303-19/+25
| |\ | | | | | | | | | | | | * 'master' of github.com:rails/rails: Make action_method? public and change implicit rendering to override it instead.
| | * Make action_method? public and change implicit rendering to override it instead.José Valim2011-03-303-19/+25
| | |
| * | TableAlias leg ordering has changed, so change accordinglyAaron Patterson2011-03-301-1/+1
| | |
| * | test against AR class rather than the relation (thanks Andrew White!)Aaron Patterson2011-03-291-2/+2
| | |
| * | Merge branch 'master' into zomgAaron Patterson2011-03-2973-150/+972
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (51 commits) order is not guaranteed by this select, so add an order and call first! oracle stores this with microseconds, so convert to seconds before comparing make sure that active connections are not cleared during test when an exception happens clearing active connections in the ConnectionManagement middleware if an exception happens proxy body responses so we close database connections after body is flushed Pass the proper method_name instead of hardcoding to action_name. Quote find_in_batches ORDER BY clause [#6620 state:resolved] Delegate first!, last!, any? and many? to scoped Dont call authenticate_or_request_with_http_basic twice Remove 'warning: ambiguous first argument' when running ActionPack tests Change exists? so that it doesn't instantiate records [#6127 state:resolved] Move mapper_test to the appropriate location Update the wildcard route to be non-greedy by default, therefore be able to match the (.:format) segment [#6605 state:resolved] Fix examples Added Base.http_basic_authenticate_with to do simple http basic authentication with a single class method call [DHH] make sure we have an active database connection before running each connection management test adding active_connections? to the connection pool for finding open connections adding active_connection? to the connection pool testing app delegation from the ConnectionManagement middleware namespacing connection management tests. :heart: ...
| * | Use Arel to build subquery. Adapt tests to changed fixtures.John Mileham2011-03-242-16/+15
| | |
| * | Merge branch 'master' of github.com:rails/rails into count_behaviorJohn Mileham2011-03-24245-1009/+3155
| |\ \
| * | | Change behavior of count(:limit => x, :offset => y) to limit/offset before ↵John Mileham2011-03-033-25/+80
| | | | | | | | | | | | | | | | counting.
* | | | profiling enabled under JRuby. Added documentation for workaround described ↵Gonçalo Silva2011-04-035-20/+9
| | | | | | | | | | | | | | | | in JRUBY-5650.
* | | | Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-03-3035-72/+494
|\ \ \ \ | | |_|/ | |/| |
| * | | order is not guaranteed by this select, so add an order and call first!Aaron Patterson2011-03-291-1/+1
| | | |
| * | | oracle stores this with microseconds, so convert to seconds before comparingAaron Patterson2011-03-291-1/+1
| | | |
| * | | make sure that active connections are not cleared during test when an ↵Aaron Patterson2011-03-292-2/+12
| | | | | | | | | | | | | | | | exception happens
| * | | clearing active connections in the ConnectionManagement middleware if an ↵Aaron Patterson2011-03-292-0/+10
| | | | | | | | | | | | | | | | exception happens
| * | | proxy body responses so we close database connections after body is flushedAaron Patterson2011-03-293-9/+49
| | | |
| * | | Pass the proper method_name instead of hardcoding to action_name.José Valim2011-03-292-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/implicit_render.rb
| * | | Quote find_in_batches ORDER BY clause [#6620 state:resolved]Andrew White2011-03-295-3/+33
| | | |
| * | | Delegate first!, last!, any? and many? to scopedAndrew White2011-03-294-2/+54
| | | |
| * | | Dont call authenticate_or_request_with_http_basic twiceDavid Heinemeier Hansson2011-03-291-4/+2
| | | |
| * | | Remove 'warning: ambiguous first argument' when running ActionPack testsSebastian Martinez2011-03-292-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | | Change exists? so that it doesn't instantiate records [#6127 state:resolved]Andrew White2011-03-292-4/+15
| | | |
| * | | Move mapper_test to the appropriate locationPrem Sichanugrist2011-03-291-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | It seems like in 89c5b9aee7d7db95cec9e5a934c3761872ab107e Aaron actually put the test in action_dispatch folder. However, there's already a `test/dispatch` directory which I think it's more appropriate. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
| * | | Update the wildcard route to be non-greedy by default, therefore be able to ↵Prem Sichanugrist2011-03-295-3/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | match the (.:format) segment [#6605 state:resolved] After some discussion with Andrew White, it seems like this is a better approach for handling a wildcard route. However, user can still bring back the old behavior by supplying `:format => false` to the route. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
| * | | Fix examplesDavid Heinemeier Hansson2011-03-282-2/+2
| | | |
| * | | Added Base.http_basic_authenticate_with to do simple http basic ↵David Heinemeier Hansson2011-03-283-14/+69
| | | | | | | | | | | | | | | | authentication with a single class method call [DHH]
| * | | make sure we have an active database connection before running each ↵Aaron Patterson2011-03-282-5/+10
| | | | | | | | | | | | | | | | connection management test
| * | | adding active_connections? to the connection pool for finding open connectionsAaron Patterson2011-03-282-0/+39
| | | |
| * | | adding active_connection? to the connection poolAaron Patterson2011-03-282-0/+14
| | | |
| * | | testing app delegation from the ConnectionManagement middlewareAaron Patterson2011-03-281-3/+20
| | | |
| * | | namespacing connection management tests. :heart:Aaron Patterson2011-03-281-18/+22
| | | |
| * | | sql logger ignores schema statementsAaron Patterson2011-03-283-2/+32
| | | |
| * | | Bring #reorder backSebastian Martinez2011-03-284-3/+13
| | | | | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | | Engines that use isolate_namespace with nested modules should set correct ↵Rolf Timmermans2011-03-282-2/+41
| | | | | | | | | | | | | | | | module prefix for their routes.