aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #14463 from ankit8898/add_infoGuillermo Iguaran2014-03-241-1/+1
|\ \ \ \ | | | | | | | | | | Adding active_model in Rails::Info
| * | | | Adding active_model in Rails::InfoAnkit Gupta2014-03-231-1/+1
|/ / / /
* | | | Merge pull request #14450 from vlal/vlal-railsGodfrey Chan2014-03-222-1/+8
|\ \ \ \ | |/ / / |/| | | Incorrect values being printed by assert_select.
| * | | Swapped parameters of assert_equal in assert_selectVishal Lal2014-03-222-1/+8
|/ / /
* | | Update test helper to use latest Digestor APIDavid Heinemeier Hansson2014-03-211-8/+8
| | |
* | | Digestor should just rely on the finder to know about the format and the ↵David Heinemeier Hansson2014-03-213-83/+39
| | | | | | | | | | | | variant -- trying to pass it back in makes a mess of things (oh, and doesnt work)
* | | Log the full path, including variant, that the digestor is trying to findDavid Heinemeier Hansson2014-03-211-3/+4
| | |
* | | Fix for digestor to consider variants for partials -- this still needs more ↵David Heinemeier Hansson2014-03-211-2/+2
| | | | | | | | | | | | testing!!
* | | Merge pull request #14445 from ibroadfo/patch-1Rafael Mendonça França2014-03-211-1/+1
|\ \ \ | |/ / |/| | fix log_tags request object grammar
| * | fix log_tags request object grammarIain D Broadfoot2014-03-211-1/+1
|/ /
* | Merge pull request #14400 from tgxworld/ensure_tables_are_dropped_after_testYves Senn2014-03-202-6/+13
|\ \ | | | | | | Drop custom tables after each test.
| * | Extract with_example_table into helper method.Guo Xiang Tan2014-03-202-6/+13
| | | | | | | | | | | | This setups the helper method which other tests can benefit from.
* | | test for structure:dump without schema information table. refs eafec46Yves Senn2014-03-201-0/+12
|/ / | | | | | | This is a test case for the fix provided in eafec4694c5b37eff9d83b1188b8e331fa6027fa
* | Merge pull request #14436 from arunagw/aa-warning-removed-grouped-expressionRafael Mendonça França2014-03-201-1/+1
|\ \ | | | | | | Warning removed (...) interpreted as grouped expression
| * | Warning removed (...) interpreted as grouped expressionArun Agrawal2014-03-201-1/+1
|/ /
* | Merge pull request #14271 from akshay-vishnoi/fixesCarlos Antonio da Silva2014-03-203-6/+36
|\ \ | | | | | | Deprecate superclass_delegating_accessor, use class_attribute instead.
| * | Deprecate Class#superclass_delegating_accessorAkshay Vishnoi2014-03-203-6/+36
| | |
* | | The digest option is no longer honoured since Rails 3.0 [ci skip]Godfrey Chan2014-03-201-1/+1
| | | | | | | | | | | | Closes #8513
* | | Merge pull request #12955 from joshwilliams/masterYves Senn2014-03-203-0/+51
|\ \ \ | | | | | | | | Postgres schema: Constrain sequence search classid
| * | | Postgres schema: Constrain sequence search classidJosh Williams2014-03-203-0/+51
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pk_an_sequence_for query previously joined against pg_class's oid for rows in pg_depend, but pg_depend's objid may point to other system tables, such as pg_attrdef. If a row in one of those other tables coincidentally has the same oid as an (unrelated) sequence, that sequence name may be returned instead of the real one. This ensures that only the pg_depend entries pointing to pg_class are considered.
* | | Remove extra indirection for testing exceptions and messagesCarlos Antonio da Silva2014-03-201-28/+12
| | | | | | | | | | | | | | | | | | assert_raise + assert_equal on the returned exception message work just fine, there is no need for extra work, specially like this overly complicated helper.
* | | Remove some indirection in rake dbs testCarlos Antonio da Silva2014-03-201-34/+20
| | | | | | | | | | | | | | | Just pass in the expected database as argument rather than "caching" it in a hash and using the hash in the helper methods.
* | | Check if the output is empty rather than asserting for equalityCarlos Antonio da Silva2014-03-201-5/+4
| | | | | | | | | | | | Also fix indent of test block.
* | | Improve touch docs with extra attributes passed in [ci skip]Carlos Antonio da Silva2014-03-202-11/+10
| | |
* | | Merge pull request #14423 from yakko/persistence-touches-manyCarlos Antonio da Silva2014-03-203-2/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord#touch should accept multiple attributes Conflicts: activerecord/CHANGELOG.md
| * | | ActiveRecord#touch should accept multiple attributes #14423Thiago Pinto2014-03-193-2/+27
| |/ /
* | | only dump schema information if migration table exists. Closes #14217Yves Senn2014-03-202-1/+9
| | |
* | | Merge pull request #14433 from adomokos/cleaning_up_and_adding_session_testsGodfrey Chan2014-03-191-7/+34
|\ \ \ | | | | | | | | Cleaning up and adding tests for Session
| * | | Cleaning and adding tests for SessionAttila Domokos2014-03-191-7/+34
| | | | | | | | | | | | Adding tests for Session `destroy`, `update` and `delete` methods. No changes for code under test.
* | | | Refactor assertion of line numbers matching 4 spacesCarlos Antonio da Silva2014-03-191-16/+4
| | | |
* | | | Move booting/loading tasks setup to the rake notes helper methodCarlos Antonio da Silva2014-03-191-15/+3
| | | |
* | | | Extract rake notes command and lines scan boilerplateCarlos Antonio da Silva2014-03-191-19/+14
| | | | | | | | | | | | | | | | Refactor to a reusable method.
* | | | Remove extra space assertionCarlos Antonio da Silva2014-03-191-3/+2
| | | | | | | | | | | | | | | | | | | | No need to check that each line contains an extra space, just matching the space in the regexp is enough to ensure that.
* | | | Extract common setup for loading tasks in rake notes testsCarlos Antonio da Silva2014-03-191-29/+14
|/ / /
* | | Merge pull request #14431 from chancancode/warn_about_json_cookie_jarsGuillermo Iguaran2014-03-192-0/+48
|\ \ \ | | | | | | | | Added a warning about serializing data with JSON cookie jars [skip ci]
| * | | Added a warning about serializing data with JSON cookie jars [skip ci]Godfrey Chan2014-03-192-0/+48
|/ / / | | | | | | | | | Closes #14409
* | | Merge pull request #14429 from chriskohlbrenner/fix_typo_ar_querying_guideArthur Nogueira Neves2014-03-191-1/+1
|\ \ \ | |/ / |/| | Fix a typo to make clause plural [ci skip]
| * | Fix a typo to make clause plural [ci skip]chriskohlbrenner2014-03-191-1/+1
|/ /
* | Merge pull request #14421 from davidpdrsn/reorder-conditionalsRafael Mendonça França2014-03-181-10/+10
|\ \ | | | | | | Reorder conditional logic in link_to_if and link_to_unless
| * | Reorder conditional logicDavid Pedersen2014-03-181-10/+10
|/ / | | | | | | | | | | According to the best practice that "unless not" and "unless else" is hard to follow logically the link_to_unless and link_to_if were reversed.
* | Merge pull request #14413 from arthurnn/port_test_ccGodfrey Chan2014-03-181-0/+11
|\ \ | | | | | | Add counter cache test for class_name
| * | Add counter cache test for class_nameArthur Neves2014-03-171-0/+11
|/ / | | | | | | Backport test from #14410
* | test should only pass if the pool.size+1 checkout failsAaron Patterson2014-03-171-3/+2
| | | | | | | | | | Previously, any of the connection checkouts could have failed, and this test would pass.
* | use a latch to avoid busy loopsAaron Patterson2014-03-171-3/+4
| |
* | Merge pull request #14360 from matthewd/thread_aware_reaperAaron Patterson2014-03-178-69/+103
|\ \ | | | | | | Track owning thread for connection pool
| * | Reap connections based on owning-thread deathMatthew Draper2014-03-187-68/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .. not a general timeout. Now, if a thread checks out a connection then dies, we can immediately recover that connection and re-use it. This should alleviate the pool exhaustion discussed in #12867. More importantly, it entirely avoids the potential issues of the reaper attempting to check whether connections are still active: as long as the owning thread is alive, the connection is its business alone. As a no-op reap is now trivial (only entails checking a thread status per connection), we can also perform one in-line any time we decide to sleep for a connection.
| * | Teach PostgreSQLAdapter#reset! to actually resetMatthew Draper2014-03-182-1/+37
|/ / | | | | | | It wasn't doing anything beyond clearing the statement cache.
* | Merge pull request #14379 from robertomiranda/rake-notes.configGuillermo Iguaran2014-03-176-30/+81
|\ \ | | | | | | Add Public Api for Register New Extensions for Rake Notes
| * | Rake notes should picked up new Extensions registered in the ↵robertomiranda2014-03-171-3/+19
| | | | | | | | | | | | config/application.rb file
| * | Update command line guiderobertomiranda2014-03-171-1/+7
| | |