aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'master' into wip_abstract_controllerYehuda Katz + Carl Lerche2009-05-113-0/+103
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/callbacks.rb actionpack/lib/action_controller/abstract/renderer.rb actionpack/lib/action_controller/base/base.rb actionpack/lib/action_controller/dispatch/dispatcher.rb actionpack/lib/action_controller/routing/route_set.rb actionpack/lib/action_controller/testing/process.rb actionpack/test/abstract_controller/layouts_test.rb actionpack/test/controller/filters_test.rb actionpack/test/controller/helper_test.rb actionpack/test/controller/render_test.rb actionpack/test/new_base/test_helper.rb
| * ActiveSupport::OrderedHash[1,2,3,4] creates an OrderedHash instead of a Hash.Douglas F Shearer2009-05-111-0/+6
| | | | | | | | | | | | [#2615 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * ActiveSupport::OrderedHash#to_a method returns an ordered set of arrays. ↵Ken Collins2009-05-101-0/+4
| | | | | | | | | | | | | | Matches ruby1.9's Hash#to_a. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2629 state:committed]
| * Prefer "included" language over "setup"Joshua Peek2009-05-071-8/+8
| |
| * Make module dependency DSL opt inJoshua Peek2009-05-071-12/+15
| |
| * Add test coverage to module setup extensionsJoshua Peek2009-05-071-0/+74
| |
| * Fixed Hash#from_xml with keys that are all caps.codebrulee2009-05-041-0/+16
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
* | Don't run the action if callbacks are halted.Yehuda Katz + Carl Lerche2009-05-111-3/+11
| | | | | | In AbstractController, this means that response_body is not empty
* | Makes new callbacks support keys with special charactersYehuda Katz + Carl Lerche2009-05-011-0/+28
|/
* Work around Float faux precisionJeremy Kemper2009-04-303-15/+15
|
* add JRuby-JDOM backend for XmlMiniStephen Bannasch2009-04-261-0/+153
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Privatize rails_to_jsonJeremy Kemper2009-04-261-1/+1
|
* * Add pluggable JSON backends with support for the JSON gem. [rick]rick2009-04-233-46/+72
| | | | | | | | | | | | | | Example: ActiveSupport::JSON.backend = "JSONGem" All internal Rails JSON encoding is now handled by ActiveSupport::JSON.encode(). Use of #to_json is not recommended, as it may clash with other libraries that overwrite it. However, you can recover Rails specific functionality if you really want to use #to_json. gem 'json' ActiveSupport::JSON.backend = "JSONGem" class ActiveRecord::Base alias to_json rails_to_json end
* Fix dependencies revealed by testing in isolationJeremy Kemper2009-04-2228-11/+48
|
* new_callbacks core extensionsJeremy Kemper2009-04-221-5/+5
|
* Merge branch 'master' into cherryJeremy Kemper2009-04-221-0/+1
|\ | | | | | | | | Conflicts: activesupport/lib/active_support.rb
| * Opt in to JSONJeremy Kemper2009-04-221-0/+1
| |
* | Opt in to DependenciesJeremy Kemper2009-04-222-0/+2
|/
* stdlib autoloads were hanging on 1.9.1Jeremy Kemper2009-04-221-2/+2
|
* Merge branch 'master' into cherryJeremy Kemper2009-04-207-19/+582
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/CHANGELOG activesupport/lib/active_support/core_ext/class/delegating_attributes.rb activesupport/lib/active_support/core_ext/hash/conversions.rb activesupport/lib/active_support/core_ext/module/attribute_accessors.rb activesupport/lib/active_support/core_ext/string/multibyte.rb activesupport/lib/active_support/core_ext/time/calculations.rb activesupport/lib/active_support/deprecation.rb
| * Clearer String#first and #last edge cases. Fix that foo.first(0) == instead ↵Jeremy Kemper2009-04-171-0/+2
| | | | | | | | of foo.
| * Resurrecting 1.9 compatibility.Carl Lerche & Yehuda Katz2009-04-131-1/+1
| |
| * Bring abstract_controller up to date with rails/masterCarl Lerche & Yehuda Katz2009-04-1329-415/+712
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * Test cleanupGeoff Buesing2009-04-051-3/+3
| | |
| | * TimeWithZone.name returns 'Time', to further thwart type checkingGeoff Buesing2009-04-051-0/+4
| | |
| | * Enhance Time #since and #ago DST tests.Geoff Buesing2009-03-291-16/+57
| | |
| | * Time.local instances: Adding 24.hours across the DST boundary adds 24 hours ↵Michael Curtis2009-03-292-16/+28
| | | | | | | | | | | | instead of one day [#2066 state:resolved]
| * | Revert rspec-runner change. TODO: Add back support for the rspec T::U runner.Carl Lerche & Yehuda Katz2009-04-091-299/+301
| | |
| * | Add support for callbacksYehuda Katz2009-02-272-0/+497
| | |
| * | Make tests passYehuda Katz2009-02-021-121/+0
| | |
| * | Some merge cleanupYehuda Katz2009-02-021-0/+121
| | |
* | | Remove rarely-used DRb cache storeJeremy Kemper2009-04-171-6/+0
| | |
* | | Eliminate Pathname extensionsJeremy Kemper2009-04-171-10/+0
| | |
* | | Explicit test dependenciesJeremy Kemper2009-03-291-0/+1
| | |
* | | Explicit BigDecimal extension dependencyJeremy Kemper2009-03-291-1/+1
| | |
* | | Explicit test dependenciesJeremy Kemper2009-03-295-2/+5
| | |
* | | Explicit test dependenciesJeremy Kemper2009-03-2819-11/+41
| | |
* | | Distinguish missing memcache from missing memcache serverJeremy Kemper2009-03-281-4/+6
| | |
* | | Hack in env variable setting for Dependencies.mechanismJeremy Kemper2009-03-261-0/+1
| | |
* | | Fix timezone testJeremy Kemper2009-03-261-6/+6
| | |
* | | Remove core ext dependency from testJeremy Kemper2009-03-241-4/+4
| | |
* | | Explicitly require core extension under testJeremy Kemper2009-03-241-0/+1
| | |
* | | Move Numeric#to_utc_offset_s to TimeZone.seconds_to_utc_offsetJeremy Kemper2009-03-232-15/+12
| | |
* | | Only require builder at startup if we need to monkey with its String#to_xs ↵Jeremy Kemper2009-03-211-1/+0
| | | | | | | | | | | | demands
* | | * Introduce ActiveSupport.core_ext Integer, %w(conversions time etc)Jeremy Kemper2009-03-212-20/+1
| |/ |/| | | | | | | | | * Convert some extension modules to simply reopening the class * Remove deprecated Float time extensions * Fold Base64 extension into ActiveSupport::Base64 since stdlib Base64 is gone
* | Use xmlschema when serializing TimeWithZones to xml [#2223 state:resolved]Jonathan del Strother2009-03-121-0/+9
| | | | | | | | | | | | When using Hash#to_xml, any TimeWithZone objects now use xmlschema (iso8601), rather than a simple TimeWithZone#to_s. Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | Ensure HWIA#reverse_merge! retrurns HWIA [#421 state:resolved]Bradford Folkens2009-03-121-0/+7
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | Reverted affe50105f7027a44eb6e9cfb56f5b3fc070b19b and added more JSON ↵Ubiratan Pires Alberton2009-03-111-1/+3
| | | | | | | | | | | | | | | | | | | | decoding tests. Works on Ruby 1.8 and 1.9 [#1100 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | adding more nokogiri tests and making the main rails tests passAaron Patterson2009-03-102-1/+53
| | | | | | | | | | | | [#2190 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Make Inflector#parameterize correctly squeeze multi-character separators ↵Henrik N2009-03-101-0/+6
| | | | | | | | | | | | [#1489 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>