aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Dupping a CollectionProxy should dup the load_target"eileencodes2017-02-282-12/+0
| | | | | | | | | I incorrectly changed behavior of `dup`. Reading the original issue I thought that `dup` should retain the original contents of the record and it's associations but it is in fact supposed to be a copy as if a record had been reinitialized. This reverts commit ca8c21df0fdbf1f03ba2f7fb16b39c3282dc1be0.
* Merge pull request #28214 from kamipo/use_tablesRafael França2017-02-281-1/+1
|\ | | | | Use `tables` instead of `data_sources - views`
| * Use `tables` instead of `data_sources - views`Ryuta Kamizono2017-02-281-1/+1
| | | | | | | | `tables` returns only tables now.
* | Merge pull request #28215 from y-yagi/take_failed_screenshot_before_reset_driverRafael França2017-02-281-1/+1
|\ \ | | | | | | Take failed screenshot before reset driver
| * | Take failed screenshot before reset driveryuuji.yaginuma2017-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | Now reset the driver before take failed screenshot since #28144. However, I think that failed screenshot should be take with the driver actually used in the test. So, fixed to take screenshot before reset driver.
* | | Merge pull request #28202 from ↵Rafael França2017-02-281-0/+4
|\ \ \ | | | | | | | | | | | | | | | | baerjam/improve-testing-your-mailers-documentation Improve documentation for Testing Your Mailers [ci skip]
| * | | Improve documentation for Testing Your Mailers [ci skip]James Baer2017-02-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current Basic Test Case example has the following assertion ``` assert_equal read_fixture('invite').join, email.body.to_s ``` email.body.to_s returns an empty string if both HTML and text templates exist for a given mailer. This commit adds a note to section 11.2.2 explaining this and also suggests using email.text_part.body.to_s and email.html_part.body.to_s as alternatives.
* | | | Merge pull request #28222 from kenta-s/fix-railstutorial-urlVipul A M2017-02-282-2/+2
|\ \ \ \ | | | | | | | | | | Fix http -> https [ci skip]
| * | | | Fix http -> https [ci skip]kenta-s2017-02-282-2/+2
| | |_|/ | |/| |
* | | | Dupping a CollectionProxy should dup the load_targeteileencodes2017-02-282-0/+12
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 3.2 dupping a `CollectionProxy` would dup it's `load_target` as well. That functionality has been broken since the release of Rails 4.0. I hit this in an application upgrade and wondered why duplicating a CollectionProxy and assigning it to a variable stopped working. When calling `dup` on a `CollectionProxy` only the owner (ex. topic) was getting duplicated and the `load_target` would remain in tact with it's original object ID. Dupping the `load_target` is useful for performing a logging operation after records have been destroyed in a method. For example: ``` def transfer_operation saved_replies = topic.replies topic.replies.clear saved_replies.each do |reply| user.update_replies_count! end end ``` This change adds a `initialize_dup` method that performs a `deep_dup` on the `@associatiation` so that the `load_target` is dupped as well. Fixes #17117
* | | Merge pull request #28208 from yahonda/rails28183_oracleAndrew White2017-02-281-1/+1
|\ \ \ | |/ / |/| | Oracle database also does not allow aliases in the having clause
| * | Oracle database also does not allow aliases in the having clauseYasuo Honda2017-02-271-1/+1
| |/ | | | | | | Follow up #28183
* | Merge pull request #28212 from ↵Rafael França2017-02-271-1/+1
|\ \ | | | | | | | | | | | | y-yagi/user_released_webpacker_in_new_applications Use released webpacker in new applications
| * | Use released webpacker in new applicationsyuuji.yaginuma2017-02-281-1/+1
| |/ | | | | | | Because webpacker 1.0 already released.
* | Merge pull request #28061 from andrewhood125/strip_tags_updateRafael França2017-02-273-4/+19
|\ \ | |/ |/| Remove `encode_special_chars` option from `strip_tags`
| * Remove `encode_special_chars` option from `strip_tags`Andrew Hood2017-02-273-4/+19
|/
* Merge pull request #28196 from ↵Andrew White2017-02-272-3/+25
|\ | | | | | | | | y-yagi/set_correct_host_except_development_environment Set correct host except development environment
| * Set correct host except development environmentyuuji.yaginuma2017-02-272-3/+25
| | | | | | | | | | | | | | | | Currently `localhost` is used for the default host in all environments. But up to Rails 5.0, `0.0.0.0` is used except for development. So fixed to use the same value as 5.0. Fixes #28184
* | Merge pull request #28199 from kirs/ar-test-connectionMatthew Draper2017-02-281-1/+4
|\ \ | | | | | | Handle non-existing $ARCONN
| * | Handle non-existing $ARCONNKir Shatrov2017-02-271-1/+4
| | |
* | | Merge pull request #28160 from ↵Eileen M. Uchitelle2017-02-271-2/+2
|\ \ \ | | | | | | | | | | | | | | | | y-yagi/only_load_systemtestcase_if_puma_is_defined Only load SystemTestCase if Puma is defined
| * | | Only load SystemTestCase if Puma is definedyuuji.yaginuma2017-02-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SystemTestCase supports only Puma, and always load puma's file. https://github.com/rails/rails/blob/master/actionpack/lib/action_dispatch/system_testing/server.rb#L1 For that reason, the case of use Capybara but do not use Puma, it will cause an error. So we need to check about Puma is defined as well.
* | | | Merge pull request #28188 from ↵Andrew White2017-02-264-8/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | kamipo/use_max_identifier_length_for_index_name_length Use `max_identifier_length` for `index_name_length`
| * | | | Use `max_identifier_length` for `index_name_length` in PostgreSQL adapterRyuta Kamizono2017-02-274-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Actually `index_name_length` depend on `max_identifier_length`, not always 63.
* | | | | Merge pull request #28187 from kamipo/fix_intermittent_test_failureAndrew White2017-02-261-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix `test_apply_distinct_in_count` failure in PG adapter
| * | | | | Fix `test_apply_distinct_in_count` failure in PG adapterRyuta Kamizono2017-02-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` % ARCONN=postgresql be ruby -w -Itest test/cases/calculations_test.rb -n test_apply_distinct_in_count /Users/kamipo/src/github.com/rails/rails/activesupport/lib/active_support/core_ext/enumerable.rb:20: warning: method redefined; discarding old sum Using postgresql Run options: -n test_apply_distinct_in_count --seed 27731 F Finished in 0.163682s, 6.1094 runs/s, 30.5470 assertions/s. 1) Failure: CalculationsTest#test_apply_distinct_in_count [test/cases/calculations_test.rb:238]: Expected /\ASELECT(?! DISTINCT) COUNT\(DISTINCT\b/ to match "SHOW max_identifier_length". 1 runs, 5 assertions, 1 failures, 0 errors, 0 skips ``` https://travis-ci.org/rails/rails/jobs/205493811#L1933 https://travis-ci.org/rails/rails/jobs/205496299#L1562 https://travis-ci.org/rails/rails/jobs/205514765#L1562
* | | | | | Merge pull request #25274 from kamipo/fix_find_nth_with_limit_valueAndrew White2017-02-262-6/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix `find_nth` with `limit_value`
| * | | | | | Fix `find_nth` with `limit_value`Ryuta Kamizono2017-02-262-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the `index` exceeds a `limit`, simply return an empty result without querying the database.
* | | | | | | Merge pull request #28190 from annejohnson/update-i18n-guide-with-zero-optJon Moss2017-02-261-2/+8
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Update i18n guide to cover :zero key support in pluralization [ci skip]
| * | | | | | Update i18n guide to cover :zero key support in pluralization [ci skip]Anne Johnson2017-02-261-2/+8
|/ / / / / /
* | | | | | Merge pull request #28172 from kamipo/deprecate_supports_migrationsAndrew White2017-02-2613-338/+306
|\ \ \ \ \ \ | | | | | | | | | | | | | | Deprecate `supports_migrations?` on connection adapters
| * | | | | | Deprecate `supports_migrations?` on connection adaptersRyuta Kamizono2017-02-2713-338/+306
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `supports_migrations?` was added at 4160b518 to determine if schema statements (`create_table`, `drop_table`, etc) are implemented in the adapter. But all tested databases has been supported migrations since a4fc93c3 at least.
* | | | | | Merge pull request #28186 from kirs/patch-2Andrew White2017-02-261-1/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Refactor connection_pool_test
| * | | | | Refactor connection_pool_testKir Shatrov2017-02-261-1/+4
|/ / / / /
* | | | | [ci skip] Add CHANGELOG entry for #28183Andrew White2017-02-261-0/+4
| | | | |
* | | | | Merge pull request #28183 from eugeneius/having_select_columnAndrew White2017-02-262-1/+3
|\ \ \ \ \ | | | | | | | | | | | | Include selects in group query with having clause
| * | | | | Include selects in group query with having clauseEugene Kenny2017-02-262-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a grouped calculation contains a having clause that references a selected value, we need to include that selected value in the query. Postgres doesn't support referencing a selected value in a having clause, but other databases do; we can skip the test on the pg adapter but run it for the others. This was fixed before in 9a298a162c16e019fe6971e563e7f4916e86ced6, but the test coverage was lost in 5a05207d99b7e2678f9b42db2d9ffc21ec2c8c3b. The fix regressed in 6311975fb3c02f50730fd1e11b8dba8dd9c05306 and was removed in 97d46c17ea9113b0ce970167f5208c8d9170915c.
* | | | | | Merge pull request #28106 from jerry-tao/masterAndrew White2017-02-262-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | Remove unused params in RouteSet#add_route
| * | | | | Remove unused params.Jerry Tao2017-02-262-2/+2
|/ / / / /
* | | | | Merge pull request #28176 from kamipo/push_valid_type_up_to_abstract_adapterAndrew White2017-02-264-11/+3
|\ \ \ \ \ | |/ / / / |/| | | | Push `valid_type?` up to abstract adapter
| * | | | Push `valid_type?` up to abstract adapterRyuta Kamizono2017-02-264-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `valid_type?` should return true if a type exists in `native_database_types` at least. https://github.com/rails/rails/blob/v5.1.0.beta1/activerecord/lib/active_record/schema_dumper.rb#L136
* | | | | Merge pull request #28177 from kami-zh/remove-duplicated-privateAndrew White2017-02-261-102/+100
|\ \ \ \ \ | | | | | | | | | | | | Remove duplicated private method in ActiveRecord::FinderMethods
| * | | | | Remove duplicated private methodkami-zh2017-02-261-102/+100
| | |_|_|/ | |/| | |
* | | | | Merge pull request #28179 from kamipo/remove_useless_lineAndrew White2017-02-261-1/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove useless `select_values += select_values`
| * | | | | Remove useless `select_values += select_values`Ryuta Kamizono2017-02-261-1/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | `select_values` is a local variable defined at previous line. `select_values += select_values` is totally useless.
* | | | | Merge pull request #28180 from y-yagi/use_released_arelAndrew White2017-02-261-1/+0
|\ \ \ \ \ | |_|/ / / |/| | | | Use released arel
| * | | | Use released arelyuuji.yaginuma2017-02-261-1/+0
|/ / / / | | | | | | | | | | | | Follow up to ea9566f6cd1b4d3f0d8a5f03283b49423b89044d
* | | | Add Duration#before and #after as aliases for #ago and #sinceNick Johnstone2017-02-263-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's common in test cases at my job to have code like this: let(:today) { customer_start_date + 2.weeks } let(:earlier_date) { today - 5.days } With this change, we can instead write let(:today) { 2.weeks.after(customer_start_date) } let(:earlier_date) { 5.days.before(today) } Closes #27721
* | | | Merge pull request #28175 from sevenseacat/patch-1Kasper Timm Hansen2017-02-261-1/+1
|\ \ \ \ | | | | | | | | | | Fix typo 'affect' -> 'effect' [ci skip]
| * | | | Fix typo 'affect' -> 'effect' [ci skip]Rebecca Skinner2017-02-261-1/+1
|/ / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 22:25:02 +0000