aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* No need for instance vars on single testsCarlos Antonio da Silva2014-01-161-8/+8
|
* Cleanup duplicated setup of callbacks in transactions testsCarlos Antonio da Silva2014-01-161-48/+19
|
* No need to use #send with public methodsCarlos Antonio da Silva2014-01-161-10/+10
|
* Merge pull request #13734 from tjschuck/fixture_class_name_deprecation_warningCarlos Antonio da Silva2014-01-161-2/+2
|\ | | | | Update fixture class name deprecation warning to give more information about caller
| * Update deprecation warning to give more information about callerT.J. Schuck2014-01-161-2/+2
| |
* | define the delegate methods on one line. fixes #13724Aaron Patterson2014-01-162-20/+32
|/ | | | sup haters
* Merge branch 'ca-touch-commit-callbacks'Carlos Antonio da Silva2014-01-166-11/+80
|\ | | | | | | | | | | Make AR::Base#touch fire the after_commit and after_rollback callbacks. Closes #12031.
| * Make AR::Base#touch fire the after_commit and after_rollback callbacksHarry Brundage2014-01-165-2/+71
| |
| * Fix test for cache_key + touchedCarlos Antonio da Silva2014-01-161-9/+9
|/ | | | | Ensure the child can actually be touched. The `Bulb` model has no timestamp column, thus trying to touch it would return `nil`.
* Revert "methods are defined right after the module_eval, so we don't need to do"Piotr Sarnacki2014-01-161-2/+2
| | | | | | | | | This change breaks tests in activesupport/test/core_ext/module_test.rb: * test_delegation_exception_backtrace * test_delegation_exception_backtrace_with_allow_nil This reverts commit 0167765e3f84260522bc2f32d926c1f5dd44957c.
* Revert "Don't remove trailing slash from PATH_INFO for mounted apps"Piotr Sarnacki2014-01-163-18/+1
| | | | | | | The revert is needed because of a regression described in #13369, routes with trailing slash are no longer recognized properly. This reverts commit 50311f1391ddd8e0349d74eb57f04b7e0045a27d.
* Add failing test for #13369Piotr Sarnacki2014-01-161-0/+18
| | | | | | After introducing 50311f1 a regression was introduced: routes with trailing slash are no longer recognized properly. This commit provides a failing test for this situation.
* Merge branch 'fix_order_dependent_tests_in_active_record_suite'Yves Senn2014-01-168-43/+45
|\ | | | | | | | | | | | | | | This gets the whole Active Record suite working without calling `self.i_suck_and_my_tests_are_order_dependent!` on `ActiveSupport::TestCase`. Note that the test files themselves still run in order. This means that only order dependencies within a single test file were addressed.
| * reset column information after fiddling with `Encoding.default_internal`Yves Senn2014-01-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This solves order depndent problems in `base_test.rb`. The leaked column information crashed test cases using the `Weird` class later on: ``` 2) Error: BasicsTest#test_group_weirds_by_from: SyntaxError: /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:387: invalid hex escape ... attribute_before_type_cast("\x{A4CA}\x{A4DE}\x{A4A8}", *arg... ... ^ /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:387: invalid hex escape ...te_before_type_cast("\x{A4CA}\x{A4DE}\x{A4A8}", *args) ... ^ /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:387: invalid hex escape ...e_type_cast("\x{A4CA}\x{A4DE}\x{A4A8}", *args) ... ^ /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:385:in `module_eval' /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:385:in `define_proxy_call' /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:294:in `block in define_attribute_method' /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:285:in `each' /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:285:in `define_attribute_method' /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:252:in `block in define_attribute_methods' /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:252:in `each' /Users/senny/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:252:in `define_attribute_methods' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_methods.rb:72:in `block in define_attribute_methods' /Users/senny/.rbenv/versions/2.0.0-p353/lib/ruby/2.0.0/mutex_m.rb:73:in `synchronize' /Users/senny/.rbenv/versions/2.0.0-p353/lib/ruby/2.0.0/mutex_m.rb:73:in `mu_synchronize' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_methods.rb:69:in `define_attribute_methods' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_methods.rb:174:in `method_missing' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_assignment.rb:45:in `public_send' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_assignment.rb:45:in `_assign_attribute' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_assignment.rb:32:in `block in assign_attributes' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_assignment.rb:26:in `each' /Users/senny/Projects/rails/activerecord/lib/active_record/attribute_assignment.rb:26:in `assign_attributes' /Users/senny/Projects/rails/activerecord/lib/active_record/core.rb:458:in `init_attributes' /Users/senny/Projects/rails/activerecord/lib/active_record/core.rb:191:in `initialize' /Users/senny/Projects/rails/activerecord/lib/active_record/inheritance.rb:30:in `new' /Users/senny/Projects/rails/activerecord/lib/active_record/inheritance.rb:30:in `new' /Users/senny/Projects/rails/activerecord/lib/active_record/persistence.rb:33:in `create' test/cases/base_test.rb:646:in `test_group_weirds_by_from' ```
| * we have `with_env_tz` as global test helper. Remove duplicate.Yves Senn2014-01-162-14/+0
| |
| * isolate class attribute assignment in `migration_test.rb`Yves Senn2014-01-161-22/+33
| | | | | | | | | | | | | | | | This makes the tests inside `migration_test.rb` order independent. The assignments to `Reminder.table_name_prefix` and `Reminder.table_name_suffix` previously leaked and had impact on following test cases. This patch isolates the assignments on a throw-away subclass.
| * use `teardown` for cleanup, not `setup`.Yves Senn2014-01-161-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | This solves order dependent issues where the last test leaked the query cache state. This resulted in the following error: ``` QueryCacheExpiryTest#test_cache_is_expired_by_habtm_delete [test/cases/query_cache_test.rb:275]: not all expectations were satisfied unsatisfied expectations: - expected exactly twice, invoked once: #<ActiveRecord::ConnectionAdapters::SQLite3Adapter:0x7f93e0c65838>.clear_query_cache(any_parameters) ```
| * tests without transactional fixtures need to cleanup afterwards.Yves Senn2014-01-161-0/+7
| | | | | | | | This fixes test order issues.
| * no need to `return skip` in tests. `skip` is enough.Yves Senn2014-01-164-4/+4
|/
* methods are defined right after the module_eval, so we don't need to doAaron Patterson2014-01-151-2/+2
| | | | any line number maths
* Get rid of unused TransactionError constantCarlos Antonio da Silva2014-01-151-3/+0
| | | | | | This has been added 9 years ago in a677da209b16f43198b3485dda89dce862fb9bfb, and removed 6 years ago in 38f8252e2d0a109d1b833d6b289cd989e7bfffe4.
* Avoid converting :on option to array twice when defining commit/rollback ↵Carlos Antonio da Silva2014-01-151-3/+2
| | | | callbacks
* Unify changelog entries about single quotes [ci skip]Carlos Antonio da Silva2014-01-151-5/+1
|
* Merge pull request #13713 from chulkilee/use-single-quotesCarlos Antonio da Silva2014-01-158-20/+24
|\ | | | | Use single quotes in generated files
| * Use single quotes in generated filesChulki Lee2014-01-148-20/+24
| |
* | rm dup codeAaron Patterson2014-01-141-13/+0
| | | | | | | | https://github.com/rails/rails/blob/e64a83cdbd3ce836f3339c600c1006b20c23d8fd/activerecord/test/cases/relation/merging_test.rb#L80-91
* | directly create the ARel ASTAaron Patterson2014-01-141-6/+4
| | | | | | | | rather than allocating a new Relation, just make the AST directly
* | Updated comment to mention the enum mapping class method [ci skip]Godfrey Chan2014-01-141-2/+3
| |
* | "string" isn't a valid column type for ActiveRecordAaron Patterson2014-01-141-1/+1
|/ | | | | Conflicts: activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
* don't establish a new connection when testing with `sqlite3_mem`.Yves Senn2014-01-141-15/+21
| | | | | | | This fixes broken `rake test_sqlite3_mem` suite for Active Record. The problem is that that the old database with the schema is lost when establishing a new connection. Upon reconnting we are left with a blank database and tests down the line start failing.
* Merge pull request #13350 from ccutrer/sqlite-partial-indexesYves Senn2014-01-143-1/+25
|\ | | | | sqlite >= 3.8.0 supports partial indexes
| * sqlite >= 3.8.0 supports partial indexesCody Cutrer2014-01-143-1/+25
|/
* Merge pull request #13710 from ujjwalt/hotfix/stiAndrew White2014-01-145-8/+42
|\ | | | | Active Record's subclass_from_attributes shouldn't assume :type is for STI unless there is a type column.
| * Don't try to get the subclass if the inheritance column doesn't existUjjwal Thaakar2014-01-145-8/+42
|/ | | | | | | The `subclass_from_attrs` method is called even if the column specified by the `inheritance_column` setting doesn't exist. This prevents setting associations via the attributes hash if the association name clashes with the value of the setting, typically `:type`. This worked previously in Rails 3.2.
* Enum mappings are now exposed via class methods instead of constants.Godfrey Chan2014-01-143-10/+31
| | | | | | | | | | | | | | | | Example: class Conversation < ActiveRecord::Base enum status: [ :active, :archived ] end Before: Conversation::STATUS # => { "active" => 0, "archived" => 1 } After: Conversation.statuses # => { "active" => 0, "archived" => 1 }
* Merge pull request #13705 from mess110/controller_generator_route_quotesCarlos Antonio da Silva2014-01-145-11/+15
|\ | | | | Single quotes for controller generated routes. This is more consistent with all other Rails generated code.
| * single quotes for controller generated routesCristian Mircea Messel2014-01-145-11/+15
| | | | | | | | | | | | | | | | | | | | Write routes in route.rb with single quotes get 'welcome/index' instead of get "welcome/index"
* | Merge pull request #13706 from prathamesh-sonpatki/issue-13125Yves Senn2014-01-141-3/+10
|\ \ | | | | | | Fix fields_for documentation with index option [ci skip]
| * | Fix fields_for documentation with index option [ci skip]Prathamesh Sonpatki2014-01-141-3/+10
| |/ | | | | | | | | | | | | - fields_for documentation with index option was wrong. - It does not work with passing model as it is. - Changed the example by passing id of the address object. - Fixes #13125.
* | Merge pull request #13709 from akshay-vishnoi/typoYves Senn2014-01-141-1/+1
|\ \ | | | | | | [ci skip] Grammar correction
| * | [ci skip] Grammar correctionAkshay Vishnoi2014-01-141-1/+1
| | |
* | | quick pass through Active Record CHANGELOG. [ci skip]Yves Senn2014-01-141-7/+9
| | |
* | | Merge pull request #13669 from chulkilee/name-error-nameYves Senn2014-01-143-2/+8
|\ \ \ | | | | | | | | Set NameError#name
| * | | Set NameError#nameChulki Lee2014-01-133-2/+8
| | | |
* | | | Merge pull request #13707 from udaykadaboina/docModificationDamien Mathieu2014-01-131-2/+2
|\ \ \ \ | |_|_|/ |/| | | [ci skip] Added alias to CSRF
| * | | [ci skip] Added alias to CSRFUday Kadaboina2014-01-141-2/+2
|/ / /
* | | unscope should remove bind values associated with the whereAaron Patterson2014-01-132-0/+11
| | |
* | | reverse_order_value= is not private, so no need to sendAaron Patterson2014-01-131-1/+1
| | | | | | | | | | | | It's not public API, but is not private scoped.
* | | avoid more dynamic symbolsAaron Patterson2014-01-131-1/+1
| | |
* | | no need to to_symAaron Patterson2014-01-131-2/+2
| | |