Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed generating namespaced table_name_prefix in engines | Wojciech Wnętrzak | 2012-07-06 | 2 | -2/+2 |
| | |||||
* | Added failing test for generating namespaced table_name_prefix in engines | Wojciech Wnętrzak | 2012-07-06 | 1 | -0/+12 |
| | |||||
* | Merge pull request #6985 from sidonath/disable-query-cache-for-locks | Rafael Mendonça França | 2012-07-06 | 2 | -1/+17 |
|\ | | | | | Disable query cache for lock queries | ||||
| * | Disable query cache for lock queries | Damir Zekic | 2012-07-06 | 2 | -1/+17 |
| | | | | | | | | Fixes #867 | ||||
* | | Update release notes with AR::Relation#inspect change [ci skip] | Carlos Antonio da Silva | 2012-07-06 | 2 | -6/+9 |
| | | | | | | | | | | See 07314e64fd62fb8e6165c8c539420160da9437e9. Also fix some tabs in AR Changelog. | ||||
* | | Remove mention to csv fixtures from test_helper in guides [ci skip] | Carlos Antonio da Silva | 2012-07-06 | 1 | -1/+1 |
| | | |||||
* | | Show the records in Relation#inspect | Jon Leighton | 2012-07-06 | 3 | -6/+17 |
|/ | | | | | | | | | | | | | | | | | The reason for removing the previous implementation of `#inspect` was that it hid from you that you were dealing with a `Relation` rather than an `Array`. But it is still useful to be able to see the records, particularly if you're writing something like the following in tests: assert_equal [foo], Post.where(:bar) If the assertion fails, you want to see what records were actually loaded. So this implementation makes it clear that you've got a `Relation`, but also shows your records. | ||||
* | Merge pull request #6927 from parndt/patch-3 | Carlos Antonio da Silva | 2012-07-05 | 2 | -3/+3 |
|\ | | | | | Make ArgumentError message more consistent in nested attributes | ||||
| * | Made ArgumentError messages consistent. | Philip Arndt | 2012-07-06 | 2 | -3/+3 |
| | | |||||
* | | Revert "push parameter instantiation to one method" | Aaron Patterson | 2012-07-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | This reverts commit 9669f6f7883787aa209207cab68b1069636aed9e. This breaks Sam Ruby's tests for some reason. Revert until we figure it out. | ||||
* | | Merge branch 'master' into testclean | Aaron Patterson | 2012-07-05 | 9 | -6/+81 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Add documentation for inheritance_column method Use ArgumentError vs. RuntimeError, which is more precise. CSV fixtures aren't supported by default anymore, update generated test_helper.rb to reflect that fix quoting for ActiveSupport::Duration instances Add few information on the field types Add the options method to action_controller testcase. | ||||
| * \ | Merge pull request #6976 from vitorbal/master | Carlos Antonio da Silva | 2012-07-05 | 1 | -1/+3 |
| |\ \ | | | | | | | | | Add documentation for inheritance_column method [ci skip] | ||||
| | * | | Add documentation for inheritance_column method | Vitor Balocco | 2012-07-05 | 1 | -1/+3 |
| |/ / | |||||
| * | | Merge pull request #6957 from francois2metz/options_method | Carlos Antonio da Silva | 2012-07-05 | 2 | -2/+12 |
| |\ \ | | | | | | | | | Add the options method to action_controller testcase. | ||||
| | * | | Add the options method to action_controller testcase. | François de Metz | 2012-07-04 | 2 | -2/+12 |
| | | | | | | | | | | | | | | | | Signed-off-by: François de Metz <francois@stormz.me> | ||||
| * | | | Merge pull request #6959 from robin850/patch-1 | José Valim | 2012-07-05 | 1 | -0/+49 |
| |\ \ \ | | | | | | | | | | | Add few information on the field types | ||||
| | * | | | Add few information on the field types | Robin Dupret | 2012-07-04 | 1 | -0/+49 |
| | |/ / | |||||
| * | | | Merge pull request #6967 from frodsan/quite_as_duration | Rafael Mendonça França | 2012-07-05 | 3 | -1/+15 |
| |\ \ \ | | | | | | | | | | | fix quoting for ActiveSupport::Duration instances | ||||
| | * | | | fix quoting for ActiveSupport::Duration instances | Francesco Rodriguez | 2012-07-04 | 3 | -1/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes quoting for ActiveSupport::Duration instances: # before >> ActiveRecord::Base.connection.quote 30.minutes => "'--- 1800\n...\n'" # after >> ActiveRecord::Base.connection.quote 30.minutes => "1800" Also, adds a test for type casting ActiveSupport::Duration instances. Related to #1119. | ||||
| * | | | | Merge pull request #6969 from mkdynamic/patch-1 | Jeremy Kemper | 2012-07-04 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | Use ArgumentError vs. RuntimeError, which is more precise | ||||
| | * | | | | Use ArgumentError vs. RuntimeError, which is more precise. | Mark Dodwell | 2012-07-04 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge pull request #6968 from guilleiguaran/update-test-helper | Rafael Mendonça França | 2012-07-04 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | CSV fixtures aren't supported by default anymore, update generated test_helper.rb to reflect that | ||||
| | * | | | | CSV fixtures aren't supported by default anymore, update generated ↵ | Guillermo Iguaran | 2012-07-04 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | test_helper.rb to reflect that | ||||
* | | | | | Merge branch 'master' into testclean | Aaron Patterson | 2012-07-04 | 5 | -13/+19 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: activesupport gem dependencies should reflect the versions we actually use fix link and add activeresource link in release notes page [ci skip] Update 4.0 Release Notes Kill not used constant since removal of runner method | ||||
| * | | | | activesupport gem dependencies should reflect the versions we actually use | Aaron Patterson | 2012-07-04 | 3 | -1/+2 |
| |/ / / | |||||
| * | | | Merge pull request #6961 from frodsan/fix_release_note | Santiago Pastorino | 2012-07-04 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |/| | | fix link and add activeresource link in release notes page [ci skip] | ||||
| | * | | fix link and add activeresource link in release notes page [ci skip] | Francesco Rodriguez | 2012-07-04 | 1 | -2/+2 |
| |/ / | |||||
| * | | Update 4.0 Release Notes | Rafael Mendonça França | 2012-07-04 | 1 | -1/+15 |
| | | | | | | | | | | | | Related with 17d2115e3df6caf15d554b44e28177069fa3ed5b | ||||
| * | | Kill not used constant since removal of runner method | Carlos Antonio da Silva | 2012-07-03 | 1 | -9/+0 |
| | | | | | | | | | | | | Runner method was removed in ada571bfcdbad669ae43a4dd18277ef227680a0b. | ||||
* | | | push parameter instantiation to one method | Aaron Patterson | 2012-07-03 | 1 | -1/+1 |
| | | | |||||
* | | | add Mime.fetch so we can have default mime types | Aaron Patterson | 2012-07-03 | 2 | -2/+6 |
| | | | |||||
* | | | make the default environment have actual defaults | Aaron Patterson | 2012-07-03 | 2 | -3/+16 |
| | | | | | | | | | | | | | | | | | | instead of deleting keys on every instantiation, create defaults we actually use. eventually we can pass an environment in to the request, and create a new req / res object on each call. | ||||
* | | | assing the request on the response only once | Aaron Patterson | 2012-07-03 | 1 | -4/+5 |
| | | | |||||
* | | | group things that are alike | Aaron Patterson | 2012-07-03 | 2 | -10/+10 |
| | | | |||||
* | | | push functional test specific methods to it's own module | Aaron Patterson | 2012-07-03 | 2 | -9/+15 |
| | | | |||||
* | | | test should be testing to_param not to_s, remove Array subclass | Aaron Patterson | 2012-07-03 | 2 | -7/+3 |
| | | | |||||
* | | | push the cookie writing stuff out of the controller | Aaron Patterson | 2012-07-03 | 2 | -23/+8 |
| | | | | | | | | | | | | merging cookies is responsibility of the test runner | ||||
* | | | extend the controller with special logic on recycle | Aaron Patterson | 2012-07-03 | 2 | -16/+28 |
| | | | | | | | | | | | | | | | | | | For some reason, this special logic is only supposed to be executed on the second request. For now, we'll extend on recycle, but we should figure out why this functionality can't be run on every request | ||||
* | | | push req / res setting to the test runner | Aaron Patterson | 2012-07-03 | 2 | -5/+10 |
| | | | | | | | | | | | | | | | Try to avoid making the controller mutate itself so that we can eventually make the response async | ||||
* | | | extract response setting to a method | Aaron Patterson | 2012-07-03 | 1 | -2/+8 |
|/ / | |||||
* | | remove duplicate requires of mocha. | Aaron Patterson | 2012-07-03 | 3 | -4/+0 |
| | | | | | | | | | | Mocha is already required by AS::TestCase, so remove the duplicate requires. | ||||
* | | remove the runner method copied from minitest | Aaron Patterson | 2012-07-03 | 1 | -20/+7 |
| | | |||||
* | | hook mocha in through m/t before_setup, after_teardown hooks | Aaron Patterson | 2012-07-03 | 4 | -9/+26 |
| | | |||||
* | | Merge pull request #6948 from frodsan/plugin_skip_ignore | Rafael Mendonça França | 2012-07-03 | 2 | -1/+9 |
|\ \ | | | | | | | remove test/dummy from gitignore when "plugin new -T" | ||||
| * | | remove test/dummy from gitignore when "plugin new -T" | Francesco Rodriguez | 2012-07-03 | 2 | -1/+9 |
| | | | |||||
* | | | Merge branch 'lexmag-reference_statements' | Rafael Mendonça França | 2012-07-03 | 8 | -40/+226 |
|\ \ \ | |/ / |/| | | | | | Closes #6920 | ||||
| * | | Don't need to use delete in the options hash | Rafael Mendonça França | 2012-07-03 | 2 | -3/+2 |
| | | | |||||
| * | | Add changelog entry for references statements | Aleksey Magusev | 2012-07-03 | 1 | -0/+13 |
| | | | |||||
| * | | Refactor references schema definitions | Aleksey Magusev | 2012-07-03 | 2 | -34/+24 |
| | | | |||||
| * | | Make references statements reversible | Aleksey Magusev | 2012-07-03 | 2 | -4/+40 |
| | | |