aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #29317 from alexcameron89/fix_persistence_save_testMatthew Draper2017-06-021-21/+7
|\ | | | | Use existing class in PersistenceTest::SaveTest
| * Use existing class in PersistenceTest::SaveTestAlex Kitchens2017-06-011-21/+7
|/ | | | | | | | | | | Creating a new class for widgets was causing failing tests because it clashed with other widget classes. This test does not need to create its own class, so I changed it to an existing class. ``` ARCONN=mysql2 bin/test --seed 25364 test/cases/*test.rb -n \ "/^(?:PrimaryKeyIntegerTest#(?:test_primary_key_with_serial_integer_are_automatically_numbered)|PersistenceTest::SaveTest#(?:test_save_touch_false))$/" ```
* Merge pull request #29287 from alexcameron89/fix-db-statement-test-48104Matthew Draper2017-06-011-0/+1
|\ | | | | Fix random minitest error: database_statements_test
| * Reset primary key sequence in FixturesResetPkSequenceTestsAlex Kitchens2017-05-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The primary key sequence for each test in FixturesResetPkSequenceTest is reset. The state in some of the FixturesResetPkSequenceTest tests are leaking, causing failurse in others. Using a seed of `48104`, the `FixturesResetPkSequenceTest#test_resets_to_min_pk_with_specified_pk_and_sequence` runs before the `DatabaseStatementsTest` tests, and the tests fail with duplicate primary key errors: ``` Run options: --seed 48104 -n "/^(?:FixturesResetPkSequenceTest#(?:test_resets_to_min_pk_with_specified_pk_and_sequence)|DatabaseStatementsTest#(?:test_create_should_return_the_inserted_id|test_exec_insert|test_insert_should_return_the_inserted_id))$/" .EEE 1) Error: DatabaseStatementsTest#test_exec_insert: ActiveRecord::RecordNotUnique: PG::UniqueViolation: ERROR: duplicate key value violates unique constraint "accounts_pkey" DETAIL: Key (id)=(2) already exists. 2) Error: DatabaseStatementsTest#test_create_should_return_the_inserted_id: ActiveRecord::RecordNotUnique: PG::UniqueViolation: ERROR: duplicate key value violates unique constraint "accounts_pkey" DETAIL: Key (id)=(3) already exists. 3) Error: DatabaseStatementsTest#test_insert_should_return_the_inserted_id: ActiveRecord::RecordNotUnique: PG::UniqueViolation: ERROR: duplicate key value violates unique constraint "accounts_pkey" DETAIL: Key (id)=(4) already exists. ```
* | Merge pull request #29298 from alexcameron89/minitest-59389Rafael França2017-05-311-0/+2
|\ \ | | | | | | Ensure fixtures are loaded for FoxyFixturesTest
| * | Ensure fixtures are loaded for FoxyFixturesTestAlex Kitchens2017-05-311-0/+2
|/ / | | | | | | | | | | | | Ensure that the fixtures are properly loaded for FoxyFixturesTest When tests are randomized, FoxyFixturesTest often fails due to unloaded fixtures.
* | Merge pull request #29291 from y-yagi/make_sure_to_disable_extension_after_testMatthew Draper2017-05-311-6/+2
|\ \ | |/ |/| Make sure to disable extension after test
| * Make sure to disable extension after testyuuji.yaginuma2017-05-311-6/+2
|/ | | | | If keep the extension, can not test properly to make sure that extension can be enabled.
* Merge pull request #29277 from y-yagi/reset_time_zone_to_previous_valueKasper Timm Hansen2017-05-301-1/+8
|\ | | | | Reset time zone to previous value
| * Reset time zone to previous valueyuuji.yaginuma2017-05-301-1/+8
|/ | | | | | | | | | | Since `CurrentAttributesTest` changed the global time zone, it is necessary to restore the original value after changing the test. The reproduction step: ``` ./bin/test -w --seed 5549 test/current_attributes_test.rb test/core_ext/date_ext_test.rb ```
* Merge branch 'master' into unlock-minitestKasper Timm Hansen2017-05-29421-2199/+3517
|\
| * Merge pull request #29248 from yawboakye/rename-should-rename-table-pkeyGuillermo Iguaran2017-05-292-4/+28
| |\ | | | | | | `rename_table` should rename primary key index name
| | * `rename_table` renames primary key index nameYaw Boakye2017-05-292-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Formerly, `rename_table` only renamed primary key index name if the column's data type was sequential (serial, etc in PostgreSQL). The problem with that is tables whose primary keys had other data types (e.g. UUID) maintained the old primary key name. So for example, if the `cats` table has a UUID primary key, and the table is renamed to `felines`, the primary key index will still be called `cats_pkey` instead of `felines_pkey`. This PR corrects it.
| * | Add option for class_attribute default (#29270)David Heinemeier Hansson2017-05-2947-161/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow a default value to be declared for class_attribute * Convert to using class_attribute default rather than explicit setter * Removed instance_accessor option by mistake * False is a valid default value * Documentation
| * | Merge pull request #26628 from mjhoy/fix-number-to-human-25742Eileen M. Uchitelle2017-05-295-30/+79
| |\ \ | | | | | | | | round before calculating exponent in number_to_human_converter
| | * | number_to_human_converter: round before calculating exponentMichael Hoy2017-03-162-4/+8
| | | | | | | | | | | | | | | | fixes #25664
| | * | number_to_rounded_converter: extract rounding logicMichael Hoy2017-03-163-26/+71
| | | |
| * | | Doh. We are doing this on secrets:setup. Revert "Ignore the encrypted ↵David Heinemeier Hansson2017-05-291-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | secrets key file that is created by rails secrets:setup" This reverts commit 75500476eb7e953a06cc64e67ecc57b13ef8cc99.
| * | | Merge pull request #29266 from ojiry/add-elm-option-to-generator-descEileen M. Uchitelle2017-05-291-1/+1
| |\ \ \ | | | | | | | | | | [ci skip] Add elm option of webpack to generator description
| | * | | Add elm option of webpack to generator descriptionRyoji Yoshioka2017-05-291-1/+1
| | | |/ | | |/|
| * | | Merge pull request #29264 from gsamokovarov/assert-changes-listingMatthew Draper2017-05-291-0/+2
| |\ \ \ | | | | | | | | | | List assert_{,no_}changes in the testing guide
| | * | | List assert_{,no_}changes in the testing guideGenadi Samokovarov2017-05-291-0/+2
| | |/ / | | | | | | | | | | | | | | | | This lists the `assert_changes` and `assert_no_changes` methods in the guides. [ci skip]
| * | | Merge pull request #29265 from koic/remove_redundant_test_assertionMatthew Draper2017-05-291-6/+0
| |\ \ \ | | | | | | | | | | Remove a redundant test assertion
| | * | | Remove a redundant test assertionKoichi ITO2017-05-291-6/+0
| | |/ /
| * / / Ignore the encrypted secrets key file that is created by rails secrets:setupDavid Heinemeier Hansson2017-05-291-0/+3
| |/ /
| * | Merge pull request #29208 from ↵Guillermo Iguaran2017-05-283-2/+13
| |\ \ | | | | | | | | | | | | | | | | kamipo/default_env_fall_back_to_default_env_when_rails_env_or_rack_env_is_empty_string `DEFAULT_ENV` falls back to `default_env` when `RAILS_ENV` or `RACK_ENV` is an empty string
| | * | `DEFAULT_ENV` falls back to `default_env` when `RAILS_ENV` or `RACK_ENV` is ↵Ryuta Kamizono2017-05-253-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | an empty string Follow up of #27399.
| * | | Merge pull request #29262 from ↵Guillermo Iguaran2017-05-283-2/+36
| |\ \ \ | | | | | | | | | | | | | | | | | | | | kamipo/deprecate_passing_arguments_with_block_to_count_and_sum Deprecate passing arguments and block at the same time to `count` and `sum` in `ActiveRecord::Calculations`
| | * | | Deprecate passing arguments and block at the same time to `count` and `sum` ↵Ryuta Kamizono2017-05-293-2/+36
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | in `ActiveRecord::Calculations` `select`, `count`, and `sum` in `Relation` are also `Enumerable` method that can be passed block. `select` with block already doesn't take arguments since 4fc3366. This is follow up of that.
| * | | Merge pull request #29258 from koic/remove_redundant_command_recorder_testMatthew Draper2017-05-291-5/+0
| |\ \ \ | | | | | | | | | | Remove a redundant test case of command_recorder_test
| | * | | Remove a redundant test case of command_recorder_testKoichi ITO2017-05-291-5/+0
| | | | |
| * | | | Merge pull request #29257 from ↵Kasper Timm Hansen2017-05-281-3/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | clupprich/remove-action-dispatch-callbacks-to-prepare-mention Remove mentions of deprecated callbacks on ActionDispatch::Callbacks
| | * | | | Remove mentions of deprecated callbacks on ActionDispatch::CallbacksChristoph Lupprich2017-05-281-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionDispatch::Callbacks.to_prepare was removed in #27587 [ci skip]
| * | | | | Merge pull request #29146 from y-yagi/fix_29138Kasper Timm Hansen2017-05-282-2/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | Correctly set user_supplied_options when there is no whitespace in option specification
| | * | | | | Correctly set user_supplied_options when there is no whitespace in option ↵yuuji.yaginuma2017-05-242-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specification Current `user_supplied_options` method can not set the value correctly if there is no space between option and value (e.g., `-p9000`). This makes it possible to set the value correctly in the case like the above. Fixes #29138
| * | | | | | Merge pull request #29108 from inopinatus/ujs-sgjs-ie9-supportKasper Timm Hansen2017-05-281-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix server-generated JS response processing on IE9
| | * | | | | | Fix server-generated JS response processing on IE9 when using rails-ujs and ↵Josh Goodall2017-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remote: true
| * | | | | | | Merge pull request #29074 from ↵Kasper Timm Hansen2017-05-283-13/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/remove_returning_true_in_internal_callbacks Remove returning true in internal callbacks
| | * | | | | | | Remove returning true in internal callbacksRyuta Kamizono2017-05-143-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `display_deprecation_warning_for_false_terminator` was removed since 3a25cdc.
| * | | | | | | | Merge pull request #28132 from mikeycgto/aead-encrypted-cookiesKasper Timm Hansen2017-05-2810-108/+295
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | AEAD encrypted cookies and sessions
| | * | | | | | | | AEAD encrypted cookies and sessionsMichael Coyne2017-05-2210-108/+295
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes encrypted cookies from AES in CBC HMAC mode to Authenticated Encryption using AES-GCM. It also provides a cookie jar to transparently upgrade encrypted cookies to this new scheme. Some other notable changes include: - There is a new application configuration value: +use_authenticated_cookie_encryption+. When enabled, AEAD encrypted cookies will be used. - +cookies.signed+ does not raise a +TypeError+ now if the name of an encrypted cookie is used. Encrypted cookies using the same key as signed cookies would be verified and serialization would then fail due the message still be encrypted.
| * | | | | | | | | Merge pull request #29253 from kamipo/prevent_extra_queryMatthew Draper2017-05-292-6/+12
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | Prevent extra `current_database` query for `encoding`/`collation`/`ctype`
| | * | | | | | | | Prevent extra `current_database` query for `encoding`/`collation`/`ctype`Ryuta Kamizono2017-05-282-6/+12
| | | | | | | | | |
| * | | | | | | | | Merge pull request #28969 from ↵Matthew Draper2017-05-284-14/+16
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/refactor_enum_to_use_value_instead_of_label Refactor enum to use `value` instead of `label` in the scope
| | * | | | | | | | | Refactor enum to use `value` instead of `label` in the scopeRyuta Kamizono2017-05-074-14/+16
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #29003 from kamipo/delegate_ast_and_locked_to_arel_explicitlyMatthew Draper2017-05-284-1/+13
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | Delegate `ast` and `locked` to `arel` explicitly
| | * | | | | | | | | Delegate `ast` and `locked` to `arel` explicitlyRyuta Kamizono2017-05-064-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `ast` and `locked` are used in the internal but delegating to `arel` is depend on `method_missing`. If a model class is defined these methods, `select_all` will be broken. It should be delegated to `arel` explicitly.
| * | | | | | | | | | Merge pull request #29097 from ↵Matthew Draper2017-05-283-6/+20
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EilisHamilton/fix_uncountable_pluralization_locale Fix pluralization of uncountables when given a locale
| | * | | | | | | | | | Fix pluralization of uncountables when given a localeEilis Hamilton2017-05-193-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously apply_inflections would only use the :en uncountables rather then the ones for the locale that was passed to pluralize or singularize. This changes apply_inflections to take a locale which it will use to find the uncountables.
| * | | | | | | | | | | Merge pull request #29197 from kamipo/enable_extending_even_if_scope_returns_nilMatthew Draper2017-05-282-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Enable extending even if scope returns nil
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-01 04:54:17 +0000