aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix generated query in Retrieving specific data from multiple tables section ↵Vipul A M2017-03-041-1/+1
| | | | [ci skip]
* Remove duplicated "does" [ci skip]Ryuta Kamizono2017-02-141-1/+1
|
* Merge pull request #27900 from y-yagi/add_arg_key_to_process_action_mailer_eventKasper Timm Hansen2017-02-053-1/+25
|\ | | | | Add `:args` to `process.action_mailer` event.
| * Add `:args` to `process.action_mailer` eventyuuji.yaginuma2017-02-043-1/+25
| |
* | Merge pull request #27802 from domcleal/27801-multiple-rake-testsKasper Timm Hansen2017-02-053-7/+28
|\ \ | | | | | | Collect all file patterns when running multiple rake test tasks
| * | Collect all file patterns when running multiple rake test tasksDominic Cleal2017-02-043-7/+28
| | | | | | | | | | | | | | | | | | | | | Replaces the rake_patterns instance variable with simple require, as `autorun` will run tests from all eagerly required test files. Fixes #27801
* | | Merge pull request #27898 from jaredbeck/docs_module_delegation_errorEileen M. Uchitelle2017-02-041-7/+9
|\ \ \ | |_|/ |/| | Docs: Correction: Module::DelegationError
| * | Docs: Correction: Module::DelegationErrorJared Beck2017-02-031-7/+9
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the delegation target is nil and the allow_nil option is not in use, a Module::DelegationError is raised. class C delegate :a, to: :b def b nil end end C.new.a # => Module::DelegationError: C#a delegated to b.a, but b is nil [ci skip]
* | Merge pull request #27896 from meagar/fix-assigns-typo-in-guideEileen M. Uchitelle2017-02-031-1/+1
|\ \ | | | | | | Fix typo in guide: _articles should be _article
| * | Fix typo in guide: _articles should be _articleMatthew Eagar2017-02-031-1/+1
|/ / | | | | | | | | | | | | The guide contains a typo in the "local_assigns" section, where rendering a model named 'Article' via `render @articles` is shown to render a partial called `_articles.html.erb`, when in fact the necessary partial name is `_article.html.erb`
* | Merge pull request #27865 from composerinteralia/collection-ids-setter-bugEileen M. Uchitelle2017-02-033-2/+17
|\ \ | | | | | | Fix collection_singular_ids= bug
| * | Fix collection_singular_ids= bugDaniel Colson2017-02-023-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | When the association's primary key is manually set as a symbol and called with an array of strings, CollectionAssociation#ids_writer fails to cast the ids to integers. This is because AssociationReflection#association_primary_key_type and ThroughReflection#association_primary_key_type return the incorrect type, since ModelSchema.type_for_attribute only accepts a string. The result is an ActiveRecord::RecordNotFound error.
* | | Merge pull request #27881 from koic/fix_test_type_map_lookup_using_oracleEileen M. Uchitelle2017-02-031-6/+14
|\ \ \ | | | | | | | | Fix a test of AR::Type::TypeMap#lookup when using Oracle
| * | | Fix a test of AR::Type::TypeMap#lookup when using OracleKoichi ITO2017-02-021-6/+14
| | | |
* | | | Merge pull request #27891 from y-yagi/ignore_yarn_error_logEileen M. Uchitelle2017-02-032-0/+6
|\ \ \ \ | |_|/ / |/| | | Ignore yarn error log file
| * | | Ignore yarn error log fileyuuji.yaginuma2017-02-032-0/+6
| |/ /
* | | Merge pull request #27880 from ↵Kasper Timm Hansen2017-02-021-1/+1
|\ \ \ | | | | | | | | | | | | | | | | y-yagi/generate_mailer_layout_files_only_when_it_does_not_exist generate mailer layout files only when it does not exist
| * | | generate mailer layout files only when it does not existyuuji.yaginuma2017-02-021-1/+1
| |/ / | | | | | | | | | If already have layout files, in many cases use it.
* | | Merge pull request #27885 from kamipo/fix_ci_failureAkira Matsuda2017-02-031-1/+1
|\ \ \ | | | | | | | | Fix CI failure caused by aa647b46cce55ec12f5895e403c0d1b85502c8e0
| * | | Fix CI failure caused by aa647b46cce55ec12f5895e403c0d1b85502c8e0Ryuta Kamizono2017-02-021-1/+1
|/ / /
* | | Fix test failures only seen when executed via bin/testAkira Matsuda2017-02-021-1/+1
| | | | | | | | | | | | | | | sub_template_message distracts Rails.root from its message only when Rails.root is defined, and Rails.root is defined at tools/test.rb
* | | Properly escape test namesAkira Matsuda2017-02-021-3/+3
| | | | | | | | | | | | since the test names become Regexp filters, non-escaped test names cause RegexpError on isolated test via bin/test
* | | module Blog; class Post appears twice in AV testsAkira Matsuda2017-02-021-3/+3
| | | | | | | | | | | | This causes TypeError when loaded separately
* | | DRY fake models for testingAkira Matsuda2017-02-022-37/+7
| | |
* | | bin/test for Active Job and Action Cable testsAkira Matsuda2017-02-022-0/+8
|/ / | | | | | | | | | | According to the commit comment on 54d84cbb77a7fbc6359eda4eb40cc7da29c426e1, AJ/bin/test was intentionally not added, but AJ tests doesn't actually do anything special other than specifying ENV['AJ_ADAPTER'], which can be easily done via command line environment variable.
* | Virtual/generated column support for MySQL 5.7.5+ and MariaDB 5.2.0+Ryuta Kamizono2017-02-0113-28/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL generated columns: https://dev.mysql.com/doc/refman/5.7/en/create-table-generated-columns.html MariaDB virtual columns: https://mariadb.com/kb/en/mariadb/virtual-computed-columns/ Declare virtual columns with `t.virtual name, type: …, as: "expression"`. Pass `stored: true` to persist the generated value (false by default). Example: create_table :generated_columns do |t| t.string :name t.virtual :upper_name, type: :string, as: "UPPER(name)" t.virtual :name_length, type: :integer, as: "LENGTH(name)", stored: true t.index :name_length # May be indexed, too! end Closes #22589
* | explicitly require `listen` in `EventedFileUpdateCheckerTest` (#27867)Arthur Nogueira Neves2017-02-011-0/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, executing the `test_initialize_raises_an_ArgumentError_if_no_block_given` test alone will result in an error. ``` $ ./bin/test test/evented_file_update_checker_test.rb -n test_initialize_raises_an_ArgumentError_if_no_block_given Run options: -n test_initialize_raises_an_ArgumentError_if_no_block_given --seed 6692 # Running: E Error: EventedFileUpdateCheckerTest#test_initialize_raises_an_ArgumentError_if_no_block_given: NameError: uninitialized constant EventedFileUpdateCheckerTest::Listen rails/activesupport/test/evented_file_update_checker_test.rb:21:in `teardown' ``` This is because if do not specify a file or directory for `EventedFileUpdateChecker`, do not require `listen`, and using listen method in teardown. https://github.com/rails/rails/blob/master/activesupport/lib/active_support/evented_file_update_checker.rb#L53..L65 Therefore, added listen's require to avoid errors.
| * explicitly require `listen` in `EventedFileUpdateCheckerTest`yuuji.yaginuma2017-02-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, executing the `test_initialize_raises_an_ArgumentError_if_no_block_given` test alone will result in an error. ``` $ ./bin/test test/evented_file_update_checker_test.rb -n test_initialize_raises_an_ArgumentError_if_no_block_given Run options: -n test_initialize_raises_an_ArgumentError_if_no_block_given --seed 6692 # Running: E Error: EventedFileUpdateCheckerTest#test_initialize_raises_an_ArgumentError_if_no_block_given: NameError: uninitialized constant EventedFileUpdateCheckerTest::Listen rails/activesupport/test/evented_file_update_checker_test.rb:21:in `teardown' ``` This is because if do not specify a file or directory for `EventedFileUpdateChecker`, do not require `listen`, and using listen method in teardown. https://github.com/rails/rails/blob/master/activesupport/lib/active_support/evented_file_update_checker.rb#L53..L65 Therefore, added listen's require to avoid errors.
* | Merge pull request #27869 from y-yagi/call_gem_before_require_erubisMatthew Draper2017-02-011-0/+1
|\ \ | | | | | | call `gem` `erubis` before require
| * | call `gem` `erubis` before requireyuuji.yaginuma2017-02-011-0/+1
|/ / | | | | | | For inform that need to add `erubis` to gemfile.
* | Merge pull request #27866 from y-yagi/remove_unused_variableRafael França2017-01-311-1/+1
|\ \ | | | | | | remove unused variable
| * | remove unused variableyuuji.yaginuma2017-02-011-1/+1
| |/ | | | | | | | | | | | | | | This removes the following warnings. ``` activesupport/test/file_update_checker_shared_tests.rb:279: warning: assigned but unused variable - checker ```
* | Merge pull request #27795 from meagar/fix-missing-partial-iterationRafael França2017-01-314-1/+12
|\ \ | |/ |/| Fix missing partial iteration
| * Merge branch 'master' into fix-missing-partial-iterationMatthew Eagar2017-01-266-7/+10
| |\
| * \ Merge branch 'master' into fix-missing-partial-iterationMatthew Eagar2017-01-2522-105/+221
| |\ \
| * | | Add partial iteration variable to template keysMatthew Eagar2017-01-254-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When rendering heterogeneous collection using `render @collection` or `render partial: @collection`, the expected `<partial_name>_iteration` variable is missing due to `find_template` not having the name of the iteration variable included in its cache keys.
* | | | Merge pull request #27836 from ↵Rafael França2017-01-316-5/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | kamipo/has_many_through_with_scope_should_respect_table_alias Chain scope constraints should respect own table alias
| * | | | Chain scope constraints should respect own table aliasRyuta Kamizono2017-02-016-5/+41
| | | | | | | | | | | | | | | | | | | | Fixes #27666.
* | | | | correctly set test adapter when configure the queue adapter on a per job ↵Yuji Yaginuma2017-01-315-10/+62
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#26690) The `ActiveJob::TestHelper` replace the adapter to test adapter in `before_setup`. It gets the target class using the `descendants`, but if the test target job class is not loaded, will not be a replacement of the adapter. Therefore, instead of replacing with `before_setup`, modified to replace when setting adapter. Fixes #26360
* | | | Merge pull request #27859 from yahonda/diag27826Rafael França2017-01-312-11/+25
|\ \ \ \ | | | | | | | | | | Use temporary connection pool for sqlite3_mem adapter
| * | | | Add sqlite3_mem adapter to Travis CIYasuo Honda2017-01-311-0/+3
| | | | |
| * | | | Use temporary connection pool for sqlite3_mem adapterYasuo Honda2017-01-311-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #27826 Refer https://github.com/rails/rails/commit/f7b317175430a2d9300d9c4acfc1f34f4fdb2fbc
* | | | | Remove deprecated callbacks from ActionDispatch middlewaresRafael Mendonça França2017-01-317-163/+70
| | | | |
* | | | | Merge pull request #27850 from apauly/feature/active_job_test_helperRafael França2017-01-313-7/+18
|\ \ \ \ \ | | | | | | | | | | | | Feature/active job test helper
| * | | | | Append skipped jobs to enqueued_jobsAlexander Pauly2017-01-313-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored ActiveJob TestAdapter Updated ActiveJob changelog Fixed typo in changelog Fixed formatting issue in changelog
* | | | | | Merge pull request #27858 from mtsmfm/fix-inherit-from-deprecated-erubisRafael França2017-01-313-1/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix inherit from deprecated `ActionView::Template::Handlers::Erubis`
| * | | | | | Fix inherit from deprecated `ActionView::Template::Handlers::Erubis`Fumiaki MATSUSHIMA2017-02-013-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some classes inherit from `ActionView::Template::Handlers::Erubis`. (ex. https://github.com/haml/haml/blob/4.0.7/lib/haml/helpers/safe_erubis_template.rb#L3) ``` Class.new(ActionView::Template::Handlers::Erubis) # => TypeError: superclass must be a Class (ActiveSupport::Deprecation::DeprecatedConstantProxy given) ```
* | | | | | | Merge pull request #27758 from kenta-s/neglected-todo-in-render_testArthur Nogueira Neves2017-01-311-2/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Get neglected TODO done in render_test
| * | | | | | | Get neglected TODO done in render_testkenta-s2017-01-241-2/+1
| | | | | | | |
* | | | | | | | Merge pull request #27767 from benoittgt/freeze_sql_type_with_get_oid_typeArthur Nogueira Neves2017-01-311-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Freeze default empty string for sql_type in get_oid_type
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 13:01:17 +0000