aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #30208 from kamipo/extract_primary_key_to_abstract_reflectionRafael França2017-08-141-8/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Extract `primary_key` to `AbstractReflection`
| * | | | | | | Extract `primary_key` to `AbstractReflection`Ryuta Kamizono2017-08-121-8/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #27609 from kamipo/fix_association_primary_keyRafael França2017-08-144-21/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix `reflection.association_primary_key` for `has_many` association
| * | | | | | | Fix `reflection.association_primary_key` for `has_many` associationsRyuta Kamizono2017-08-134-21/+25
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is incorrect to treat `options[:primary_key]` as `association_primary_key` if `has_many` associations because the `:primary_key` means the column on the owner record, not on the association record. It will break `ids_reader` and `ids_writer`. ```ruby people(:david).essay_ids # => ActiveRecord::StatementInvalid: Mysql2::Error: Unknown column 'essays.first_name' in 'field list': SELECT `essays`.first_name FROM `essays` WHERE `essays`.`writer_id` = 'David' ``` Fixes #14439.
* | | | | | | Merge pull request #30229 from kamipo/allow_serialize_with_custom_coderRafael França2017-08-143-9/+54
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow `serialize` with a custom coder on `json` and `array` columns
| * | | | | | | Allow `serialize` with a custom coder on `json` and `array` columnsRyuta Kamizono2017-08-133-9/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already have a test case for `serialize` with a custom coder in `PostgresqlHstoreTest`. https://github.com/rails/rails/blob/v5.1.3/activerecord/test/cases/adapters/postgresql/hstore_test.rb#L316-L335
* | | | | | | | Merge pull request #30214 from kirs/uniqueness-scope-validatorRafael França2017-08-142-0/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Check :scope input in Uniqueness validator
| * | | | | | | | Check :scope input in Uniqueness validatorKir Shatrov2017-08-132-0/+11
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #30236 from padi/find-each-example-updateRafael França2017-08-141-1/+6
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Completes ActiveRecord::Batches.find_each example [ci skip]
| * | | | | | | Completes ActiveRecord::Batches.find_each example [ci skip]Marc Rendl Ignacio2017-08-131-1/+6
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The previous paragraph mentions that you can hand off the same processing queue to multiple workers. This completes the following example below it.
* | | | | | | Merge pull request #30255 from lourenci/change-assets-path-of-pipelineVipul A M2017-08-151-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Fix asset pipeline guide [ci skip]
| * | | | | | Fix asset pipeline guide [skip ci]Leandro Lourenci2017-08-141-2/+2
| | | | | | |
* | | | | | | Move test to its proper placeGeorge Claghorn2017-08-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveStorage::Filename is a model, so its test case belongs in test/models.
* | | | | | | Merge pull request #30231 from kamipo/remove_unused_source_type_infoRafael França2017-08-141-10/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove unused `source_type_info` in `RuntimeReflection`
| * | | | | | | Remove unused `source_type_info` in `RuntimeReflection`Ryuta Kamizono2017-08-131-10/+7
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | `source_type_info` is only used for `constraints` in `PolymorphicReflection`.
* | | | | | | Merge pull request #30244 from yhirano55/refactor_max_age_secondsRafael França2017-08-142-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Refactor max-age seconds
| * | | | | | | Refactor max-age secondsYoshiyuki Hirano2017-08-142-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #30233 from kamipo/remove_duplicated_join_id_forRafael França2017-08-141-10/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove duplicated `join_id_for`
| * | | | | | | | Remove duplicated `join_id_for`Ryuta Kamizono2017-08-131-10/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | The primary key on the owner record is abstracted as `join_foreign_key`.
* | | | | | | | Merge pull request #30235 from bogdanvlviv/omit-additional-removing-cable_ymlRafael França2017-08-141-1/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Omit additional removing `config/cable.yml`
| * | | | | | | | Omit additional removing `config/cable.yml` by the app generatorbogdanvlviv2017-08-131-1/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | `config/cable.yml` is never created if `--skip-action-cable` is given.
* | | | | | | | Merge pull request #30239 from bogdanvlviv/improve-plugin_generator_codeRafael França2017-08-141-2/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Improve plugin generator codebase
| * | | | | | | | Remove `:force` from PASSTHROUGH_OPTIONS for plugin generatorbogdanvlviv2017-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `:force` is setted inside the method `generate_test_dummy`
| * | | | | | | | Register `--api` option for plugin generator by PASSTHROUGH_OPTIONS constantbogdanvlviv2017-08-131-2/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #30252 from rails/activestorage-service-ciRafael França2017-08-142-3/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Run Active Storage service tests in CI
| * | | | | | | | Run Active Storage service tests in CIGeorge Claghorn2017-08-142-3/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #30241 from yhirano55/optimize_routes_indentationRafael Mendonça França2017-08-145-34/+39
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize routes indentation
| * | | | | | | | | Optimize routes indentationYoshiyuki Hirano2017-08-145-33/+38
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #29891 from pat/frozen-string-literals-railtiesRafael França2017-08-14311-18/+638
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Railties updates for frozen string literals.
| * | | | | | | | | Allow for frozen string pragma in generated files.Pat Allan2017-08-141-2/+2
| | | | | | | | | |
| * | | | | | | | | Add frozen string pragma to expected routes files.Pat Allan2017-08-141-0/+2
| | | | | | | | | |
| * | | | | | | | | Adding frozen_string_literal pragma to Railties.Pat Allan2017-08-14311-1/+618
| | | | | | | | | |
| * | | | | | | | | Railties updates for frozen string literals.Pat Allan2017-08-1414-15/+16
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #30206 from yukihirop/improve_activerecord_rdocKasper Timm Hansen2017-08-141-0/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add document that you rake test single file by using DB(ex. postgresql)
| * | | | | | | | | Add document that you rake test single file by using DB(ex. postgresql) [ci ↵yukihirop2017-08-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skip]
* | | | | | | | | | Merge pull request #29994 from y-yagi/fix_test_runner_helpKasper Timm Hansen2017-08-143-22/+18
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Show minitest options in test runner help
| * | | | | | | | | Show minitest options in test runner helpyuuji.yaginuma2017-07-313-22/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #29572, minitest options are available but are no longer showed in help. This fixed to show minitest option in help as with Rails 5.1.2. **before** ``` ./bin/rails t --help You can run a single test by appending a line number to a filename: bin/rails test test/models/user_test.rb:27 You can run multiple files and directories at the same time: bin/rails test test/controllers test/integration/login_test.rb By default test failures and errors are reported inline during a run. Rails options: -w, --warnings Run with Ruby warnings enabled -e, --environment Run tests in the ENV environment -b, --backtrace Show the complete backtrace -d, --defer-output Output test failures and errors after the test run -f, --fail-fast Abort test run on first failure or error -c, --[no-]color Enable color in the output ``` **after** ``` ./bin/rails t --help You can run a single test by appending a line number to a filename: bin/rails test test/models/user_test.rb:27 You can run multiple files and directories at the same time: bin/rails test test/controllers test/integration/login_test.rb By default test failures and errors are reported inline during a run. minitest options: -h, --help Display this help. -s, --seed SEED Sets random seed. Also via env. Eg: SEED=n rake -v, --verbose Verbose. Show progress processing files. -n, --name PATTERN Filter run on /regexp/ or string. --exclude PATTERN Exclude /regexp/ or string from run. Known extensions: rails, pride -w, --warnings Run with Ruby warnings enabled -e, --environment Run tests in the ENV environment -b, --backtrace Show the complete backtrace -d, --defer-output Output test failures and errors after the test run -f, --fail-fast Abort test run on first failure or error -c, --[no-]color Enable color in the output -p, --pride Pride. Show your testing pride! ```
* | | | | | | | | | Merge pull request #30251 from yhirano55/fix_testing_guideRyuta Kamizono2017-08-151-2/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | Fix testing guide [skip ci]
| * | | | | | | | | Fix testing guide [skip ci]Yoshiyuki Hirano2017-08-141-2/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #30250 from koic/should_escape_regexp_wildcard_characterMatthew Draper2017-08-143-4/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Should escape regexp wildcard character `.`
| * | | | | | | | | Should escape regexp wildcard character `.`Koichi ITO2017-08-143-4/+4
| | | | | | | | | |
* | | | | | | | | | Merge pull request #30249 from yhirano55/fix_debugging_rails_application_guideVipul A M2017-08-141-5/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Fix debugging rails application [ci skip]
| * | | | | | | | | Fix debugging rails application [ci skip]Yoshiyuki Hirano2017-08-141-5/+9
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #30171 from ↵Kasper Timm Hansen2017-08-145-56/+92
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kaspth/verifier-encryptor-null-serializer-metadata Perform self-serialization once metadata is involved.
| * | | | | | | | | Perform self-serialization once metadata is involved.Kasper Timm Hansen2017-08-135-56/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for metadata even when using ActiveSupport::MessageEncryptor::NullSerializer.
* | | | | | | | | | Merge pull request #30240 from y-yagi/clear_mail_after_testKasper Timm Hansen2017-08-141-3/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Clear mail after test
| * | | | | | | | | | Clear mail after testyuuji.yaginuma2017-08-141-3/+2
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If clear it before the test, the mail of the last executed test will not be correctly cleared. Therefore, executing the test with seed below will result in an error. ``` ./bin/test -w --seed 55480 Run options: --seed 55480 # Running: ...........................................................................................................................................................F Failure: MailDeliveryTest#test_does_not_increment_the_deliveries_collection_on_error [/home/yaginuma/program/rails/master_y_yagi/rails/actionmailer/test/delivery_methods_test.rb:221]: --- expected +++ actual @@ -1 +1 @@ -[] +[#<Mail::Message:47011389364640, Multipart: false, Headers: <Date: Mon, 14 Aug 2017 07:48:40 +0900>, <From: test-sender@test.com>, <To: test-receiver@test.com>, <Message-ID: <5990d748ea5b2_29342ac1af8bcf40886f7@yaginuma.mail>>, <Subject: Test Subject>, <Mime-Version: 1.0>, <Content-Type: text/plain>, <Content-Transfer-Encoding: 7bit>>] bin/test test/delivery_methods_test.rb:216 ```
* | | | | | | | | | Merge pull request #30243 from ↵Matthew Draper2017-08-142-12/+18
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/fix_ci_failure_due_to_reference_type_mismatch Fix CI failure due to reference type mismatch
| * | | | | | | | | Fix CI failure due to reference type mismatchRyuta Kamizono2017-08-142-12/+18
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Firm.id` is a bigint if mysql2 adapter is used, but `firm_id` is an integer. It will cause an out of range error. https://travis-ci.org/rails/rails/jobs/264112814#L776 https://travis-ci.org/rails/rails/jobs/264112835#L919
* | | | | | | | | Merge pull request #30237 from koic/remove_unnecessary_include_in_rubocopMatthew Draper2017-08-141-1/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove unnecessary Include parameter in rubocop.yml