Commit Graph

64251 Commits

Author SHA1 Message Date
Kasper Timm Hansen
fbeebded22 Merge pull request #30265 from yhirano55/fix_api_app_generator
Fix typo for api_app_generator_test
2017-08-15 12:35:32 +02:00
Yoshiyuki Hirano
029b633e39 Fix typo for api_app_generator_test 2017-08-15 16:07:41 +09:00
Ryuta Kamizono
d3c0dcff20 Formatting CHANGELOGs [ci skip]
Add missing backticks
Add missing *
Add missing .
2017-08-15 12:52:18 +09:00
Ryuta Kamizono
24ee261680 Merge pull request #30259 from yhirano55/fix_format_of_generator_docs
Fix format of generator docs [ci skip]
2017-08-15 12:33:50 +09:00
Yoshiyuki Hirano
f2007bfb2f Fix format of generator docs [ci skip] 2017-08-15 12:31:55 +09:00
Rafael Mendonça França
3fc47f4d82 Merge pull request #30169 from awortham/awortham/awortham/fix-sql-distinct-bug
Ensure sum honors distinct on has_many through
2017-08-14 18:31:42 -04:00
Rafael França
6b632336c1 Merge pull request #30215 from untidy-hair/clarify-abstract-or-not-in-tests
Clarify base_class tests on abstract STI vs concrete STI
2017-08-14 18:22:11 -04:00
Rafael França
cf91b96be3 Merge pull request #30073 from yalab/fixture_binary_helper
Add `binary` helper method to fixtures.
2017-08-14 18:13:32 -04:00
Rafael França
bef68862ae Merge pull request #30219 from yhirano55/fix_app_generator_api_options
Refactor `--api` option of the app generator
2017-08-14 18:11:46 -04:00
Rafael França
ccd973366b Merge pull request #30246 from yhirano55/fix_guide_command_line
Fix guide about command_line [ci skip]
2017-08-14 18:06:13 -04:00
Rafael França
2ffb12d457 Merge pull request #30208 from kamipo/extract_primary_key_to_abstract_reflection
Extract `primary_key` to `AbstractReflection`
2017-08-14 18:05:51 -04:00
Rafael França
8244a45e3e Merge pull request #27609 from kamipo/fix_association_primary_key
Fix `reflection.association_primary_key` for `has_many` association
2017-08-14 17:43:26 -04:00
Rafael França
efad56a0d9 Merge pull request #30229 from kamipo/allow_serialize_with_custom_coder
Allow `serialize` with a custom coder on `json` and `array` columns
2017-08-14 17:40:13 -04:00
Rafael França
509dfdca98 Merge pull request #30214 from kirs/uniqueness-scope-validator
Check :scope input in Uniqueness validator
2017-08-14 17:39:03 -04:00
Rafael França
0864735d81 Merge pull request #30236 from padi/find-each-example-update
Completes ActiveRecord::Batches.find_each example [ci skip]
2017-08-14 17:32:48 -04:00
Yoshiyuki Hirano
66b92ab81e Fix guide about command_line [ci skip] 2017-08-15 06:31:48 +09:00
Vipul A M
1e73c1d4f7 Merge pull request #30255 from lourenci/change-assets-path-of-pipeline
Fix asset pipeline guide [ci skip]
2017-08-15 02:00:24 +05:30
Aaron Wortham
566f1fd068 Ensure sum honors distinct on has_many through
When using a has_many through relation and then summing an attribute
the distinct was not being used. This will ensure that when summing
an attribute, the number is only used once when distinct has been used.
2017-08-14 13:22:59 -07:00
Leandro Lourenci
794d0e669e Fix asset pipeline guide [skip ci] 2017-08-14 17:15:34 -03:00
George Claghorn
3cfadd5fa2 Move test to its proper place
ActiveStorage::Filename is a model, so its test case belongs in test/models.
2017-08-14 16:04:11 -04:00
Rafael França
09dfabccd1 Merge pull request #30231 from kamipo/remove_unused_source_type_info
Remove unused `source_type_info` in `RuntimeReflection`
2017-08-14 16:01:21 -04:00
Rafael França
a684d7b4a0 Merge pull request #30244 from yhirano55/refactor_max_age_seconds
Refactor max-age seconds
2017-08-14 16:00:52 -04:00
Rafael França
f9f5772336 Merge pull request #30233 from kamipo/remove_duplicated_join_id_for
Remove duplicated `join_id_for`
2017-08-14 16:00:24 -04:00
Rafael França
f8a2562c5c Merge pull request #30235 from bogdanvlviv/omit-additional-removing-cable_yml
Omit additional removing `config/cable.yml`
2017-08-14 15:56:09 -04:00
Rafael França
58e07e94fa Merge pull request #30239 from bogdanvlviv/improve-plugin_generator_code
Improve plugin generator codebase
2017-08-14 15:55:52 -04:00
Rafael França
160473a1a6 Merge pull request #30252 from rails/activestorage-service-ci
Run Active Storage service tests in CI
2017-08-14 15:52:46 -04:00
Rafael Mendonça França
85fa9bdd55 Merge pull request #30241 from yhirano55/optimize_routes_indentation
Optimize routes indentation
2017-08-14 15:52:31 -04:00
Rafael França
5ccdd0bb6d Merge pull request #29891 from pat/frozen-string-literals-railties
Railties updates for frozen string literals.
2017-08-14 15:00:37 -04:00
Kasper Timm Hansen
5a5b4816f1 Merge pull request #30206 from yukihirop/improve_activerecord_rdoc
Add document that you rake test single file by using DB(ex. postgresql)
2017-08-14 20:42:12 +02:00
Kasper Timm Hansen
114bab9fa4 Merge pull request #29994 from y-yagi/fix_test_runner_help
Show minitest options in test runner help
2017-08-14 20:40:47 +02:00
Pat Allan
7f6a31433a Allow for frozen string pragma in generated files. 2017-08-14 19:57:45 +02:00
Pat Allan
7b01ae0bc3 Add frozen string pragma to expected routes files. 2017-08-14 19:50:20 +02:00
George Claghorn
3841fdc4e7 Run Active Storage service tests in CI 2017-08-14 13:48:17 -04:00
Pat Allan
acea68de02 Adding frozen_string_literal pragma to Railties. 2017-08-14 19:08:09 +02:00
Pat Allan
d435c92721 Railties updates for frozen string literals. 2017-08-14 19:00:24 +02:00
Ryuta Kamizono
5949cc05d3 Merge pull request #30251 from yhirano55/fix_testing_guide
Fix testing guide [skip ci]
2017-08-15 00:41:58 +09:00
Yoshiyuki Hirano
89ab59ea4d Fix testing guide [skip ci] 2017-08-14 23:57:50 +09:00
Matthew Draper
a0bd13fca3 Merge pull request #30250 from koic/should_escape_regexp_wildcard_character
Should escape regexp wildcard character `.`
2017-08-14 23:48:21 +09:30
Vipul A M
c4434171cd Merge pull request #30249 from yhirano55/fix_debugging_rails_application_guide
Fix debugging rails application [ci skip]
2017-08-14 18:59:03 +05:30
Yoshiyuki Hirano
b44b393243 Fix debugging rails application [ci skip] 2017-08-14 22:25:47 +09:00
Koichi ITO
2b6e85c190 Should escape regexp wildcard character . 2017-08-14 22:17:50 +09:00
Kasper Timm Hansen
57585b6f3b Merge pull request #30171 from kaspth/verifier-encryptor-null-serializer-metadata
Perform self-serialization once metadata is involved.
2017-08-14 14:15:48 +02:00
Kasper Timm Hansen
ee7acadfc6 Merge pull request #30240 from y-yagi/clear_mail_after_test
Clear mail after test
2017-08-14 14:03:39 +02:00
Matthew Draper
dbcf7dc79c Merge pull request #30243 from kamipo/fix_ci_failure_due_to_reference_type_mismatch
Fix CI failure due to reference type mismatch
2017-08-14 19:47:04 +09:30
Yoshiyuki Hirano
77e8b9b586 Refactor max-age seconds 2017-08-14 17:44:15 +09:00
Ryuta Kamizono
a516dfd4b4 Fix CI failure due to reference type mismatch
`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
2017-08-14 17:27:54 +09:00
Yoshiyuki Hirano
d1dabde8a2 Optimize routes indentation 2017-08-14 08:12:56 +09:00
yuuji.yaginuma
2f469dc308 Clear mail after test
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
```
2017-08-14 07:49:13 +09:00
bogdanvlviv
cc15b343e5
Remove :force from PASSTHROUGH_OPTIONS for plugin generator
`:force` is setted inside the method `generate_test_dummy`
2017-08-13 23:38:24 +03:00
bogdanvlviv
08e894e8e8
Register --api option for plugin generator by PASSTHROUGH_OPTIONS constant 2017-08-13 23:34:08 +03:00