aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | | | Freeze default empty string for sql_type in get_oid_typeBenoit Tigeot2017-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One empty string allocation per column per row.
* | | | | | | | | Merge pull request #27855 from kevinzwhuang/finder-methods-typo-fixEileen M. Uchitelle2017-01-311-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix typo about sort in finder_methods.rb
| * | | | | | | | | Fix grammar typo about sort in finder_methods.rbKevin Huang2017-01-301-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #27857 from kenta-s/add-test-for-variable_size_secure_compareEileen M. Uchitelle2017-01-311-1/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | Add test for `variable_size_secure_compare`
| * | | | | | | | | Add test for `variable_size_secure_compare`kenta-s2017-01-311-1/+6
| | | | | | | | | |
* | | | | | | | | | Merge pull request #27856 from kenta-s/remove-redundant-right-parenthesesप्रथमेश Sonpatki2017-01-311-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Remove redundant right parentheses in number_helper [ci skip]
| * | | | | | | | | Remove redundant right parentheses in number_helper [ci skip]kenta-s2017-01-311-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #27838 from kamipo/reload_destroyed_through_recordRafael França2017-01-312-0/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Reload `through_record` that has been destroyed in `create_through_record`
| * | | | | | | | Reload `through_record` that has been destroyed in `create_through_record`Ryuta Kamizono2017-01-292-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an alternative of #27714. If `has_one :through` association has set `nil`, `through_record` is destroyed but still remain loaded target in `through_proxy` until `reload` or `reset` explicitly. If `through_proxy` is not reset (remain destroyed (frozen) target), setting new record causes `RuntimeError: Can't modify frozen hash`. To prevent `RuntimeError`, should reload `through_record` that has been destroyed in `create_through_record`.
* | | | | | | | | Raise in the initialize not in the executeRafael Mendonça França2017-01-313-13/+12
| | | | | | | | |
* | | | | | | | | Merge pull request #27824 from kenta-s/raise-an-error-if-no-block-givenRafael França2017-01-313-2/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Raise an error if FileUpdateChecker#execute is called with no block
| * | | | | | | | | Raise an error if FileUpdateChecker#execute is called with no blockkenta-s2017-01-283-2/+17
| | | | | | | | | |
* | | | | | | | | | Don't mutate raw_source in mailer preview interceptorEugene Kenny2017-01-302-5/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The raw_source method is documented as returning the exact value that was used to create the body; mutating it breaks that contract. Additionally, if the value used to create the body is blank, raw_source returns a frozen string which causes the interceptor to raise an error.
* | | | | | | | | | Merge pull request #27849 from joevandyk/patch-2Rafael França2017-01-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify complete path to AR::LegacyYamlAdapter
* | | | | | | | | | Merge pull request #27853 from ↵Rafael França2017-01-311-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/add_default_value_to_deliver_later_queue_name_option add default value to `deliver_later_queue_name` option [ci skip]
| * | | | | | | | | | add default value to `deliver_later_queue_name` option [ci skip]yuuji.yaginuma2017-01-311-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #27738 from kenta-s/remove-unused-argument-formatsRafael França2017-01-312-27/+27
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove unused argument `formats`
| * | | | | | | | | | | Remove unused argument `formats`kenta-s2017-01-202-27/+27
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #27842 from richseviora/masterRafael França2017-01-312-0/+39
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Added warning for reserved YAML keywords.
| * | | | | | | | | | | | Added warning for reserved YAML keywords.Rich Seviora2017-01-302-0/+39
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update i18n.md Addressed Feedback
* | | | | | | | | | | | Merge pull request #27647 from Shopify/fully-eagerload-journeyRafael França2017-01-306-1/+45
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fully initialize routes before the first request is handled
| * | | | | | | | | | | | Fully initialize routes before the first request is handledJean Boussier2017-01-186-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `AD::Journey::GTG::Simulator` is lazily built the first time `Journey::Router#find_routes` is invoked, which happens when the first request is served. On large applications with many routes, building the simulator can take several hundred milliseconds (~700ms for us). Triggering this initialization during the boot process reduces the impact of deploys on the application response time.
* | | | | | | | | | | | | Merge pull request #27797 from y-yagi/correctly_check_error_messageArthur Nogueira Neves2017-01-306-12/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | correctly check error message
| * | | | | | | | | | | | | correctly check error messageyuuji.yaginuma2017-01-256-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `assert_raise` does not check error message. However, in some tests, it seems like expecting error message checking with `assert_raise`. Instead of specifying an error message in `assert_raise`, modify to use another assert to check the error message.
* | | | | | | | | | | | | | Avoid lambda scopes when possibleAaron Patterson2017-01-301-3/+1
| |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lambda scopes require a bunch more work. Ideally the `scope` list would be a homogeneous collection. In this case, the reflection knows how to construct the right reflection for this join, so lets just construct that relation rather than instance execing to figure it out later.
* | | | | | | | | | | | | Merge pull request #27851 from tenderlove/scope-chainAaron Patterson2017-01-304-57/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | Deprecate `scope_chain`
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 21:42:54 +0000