aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Remove deprecated code in ssl middlewareRafael Mendonça França2016-10-101-2/+2
|
* Remove deprecated support to :text in renderRafael Mendonça França2016-10-1010-69/+69
|
* Allow the use of listen's 3.1.x branch.Esteban Santana Santana2016-10-032-1/+5
| | | | | | When the initial evented monitor feature was written, the latest version of listen was the 3.0.x series. Since then the listen project has moved on to the 3.1.x series. This patch allows the use of the new versions.
* remove `mongrel` once againyuuji.yaginuma2016-09-291-1/+1
| | | | `mongrel` was removed in #26408. But have back accidentally in #26414.
* use `active_support/testing/autorun` in `bin/test` scriptyuuji.yaginuma2016-09-272-1/+9
| | | | | | | 29f0fbd5db643b885665e4a14c7de3bf6c0d9c96 has changed that always call `Minitest.autorun` in `active_support/testing/autorun`. Therefore, when used directly `Minitest.run`, tests are performed twice.
* Merge pull request #26414 from rails/rails-commandsKasper Timm Hansen2016-09-2638-766/+1005
|\ | | | | Initial Rails Commands Infrastructure
| * Apply test command changes.Kasper Timm Hansen2016-09-261-1/+3
| |
| * Fix server command tests.Kasper Timm Hansen2016-09-251-1/+2
| |
| * Fix dbconsole tests.Kasper Timm Hansen2016-09-252-28/+59
| |
| * Apply Rafaels review fixes.Kasper Timm Hansen2016-09-253-3/+4
| |
| * Fix console tests.Kasper Timm Hansen2016-09-253-7/+33
| |
| * Remove the old command files.Kasper Timm Hansen2016-09-2514-880/+0
| | | | | | | | | | Wash out your old! These adhoc scripts are replaced by the new commands.
| * Per Dr. Eileen's orders :)Kasper Timm Hansen2016-09-253-5/+7
| | | | | | | | Prescribed some review fixes for myself!
| * Simplify auxiliary command files directory finding.Kasper Timm Hansen2016-09-251-1/+1
| | | | | | | | | | Still vulnerable to different file structures. We likely want something more robust when we tackle in app commands.
| * Run engine commands through command infrastructure.Kasper Timm Hansen2016-09-256-14/+54
| |
| * Initial command structure.Kasper Timm Hansen2016-09-2525-160/+1176
| |
* | Merge pull request #26579 from y-yagi/remove_unnecessary_rails_env_settingKasper Timm Hansen2016-09-252-4/+0
|\ \ | |/ |/| remove unnecessary `RAILS_ENV` setting
| * remove unnecessary `RAILS_ENV` settingyuuji.yaginuma2016-09-222-4/+0
| | | | | | | | | | | | | | `RAILS_ENV` is always set in the initialization process of test runner. https://github.com/rails/rails/blob/9fa07095a35be2d8cb5adcc992b988e73a6d9719/railties/lib/rails/test_unit/minitest_plugin.rb#L74 Therefore, it is not necessary to set in `test_helper`.
* | Use autorun when running via Rake.Kasper Timm Hansen2016-09-251-3/+13
| | | | | | | | | | | | | | Makes sure we get support for `Minitest.after_run` hooks and don't accidentally run tests twice. Requires overriding minitest `run` to respect the TESTOPTS variable.
* | Revise setting of run_with_rails_extension.Kasper Timm Hansen2016-09-252-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Rails test runner supports three ways to run tests: directly, via rake, or ruby. When Running with Ruby ala `ruby -Itest test/models/post_test.rb` our test file would be evaluated first, requiring `test_helper` and then `active_support/testing/autorun` that would then require the test file (which it hadn't been before) thus reevaluating it. This caused exceptions if using Active Support's declarative syntax. Fix this by shifting around when we set the how we're run to closer mimick the require order. If we're running with `bin/rails test` the test command file is run first and we then set `run_with_rails_extension`, later we hit `active_support/testing/autorun` and do nothing — because we've been run elsewhere. If we at this point haven't set `run_with_rails_extension` we've been running with `ruby` this whole time and thus we set that. We should always trigger `Minitest.autorun` as it doesn't hurt to call it twice. Consolidate the two methods into a single one that better brings out the intent of why they're there.
* | Require `active_support/testing/autorun`.Kasper Timm Hansen2016-09-251-2/+1
| | | | | | | | | | | | | | | | Revise the require in the test command to use `active_support/testing/autorun` and spare us the minitest spec syntax as detailed in 5da4d51. Also move the require to the top of the file for consistency with the rest of Rails' requires across the project.
* | Merge pull request #26610 from mechanicles/as-to-active-supportJon Moss2016-09-241-1/+1
|\ \ | | | | | | AS => Active Support [ci skip]
| * | AS => Active Support [ci skip]Santosh Wadghule2016-09-251-1/+1
| |/
* | Merge pull request #26515 from grosser/grosser/after_runArthur Nogueira Neves2016-09-233-4/+40
|\ \ | |/ |/| support minitest after_run
| * switch to autorun to support after_run and patch lessMichael Grosser2016-09-231-3/+1
| |
| * support minitest after_run for parity to regular minitestMichael Grosser2016-09-163-1/+25
| | | | | | | | see https://github.com/seattlerb/minitest/blob/f9605387e4af7d657921a83aaf0ae364f6d26a57/lib/minitest.rb#L51-L65
| * improve test coverageMichael Grosser2016-09-162-4/+18
| |
* | Merge pull request #26543 from y-yagi/use_rails_command_in_restart_testKasper Timm Hansen2016-09-191-7/+7
|\ \ | | | | | | use rails command in restart task test
| * | use rails command in restart task testyuuji.yaginuma2016-09-191-7/+7
| | |
* | | [ci skip] Fixed commas according to Oxford comma in rdoc and guidesAndrey Molchanov2016-09-172-2/+2
|/ /
* / improve error message when include assertions failMichael Grosser2016-09-1613-50/+50
|/ | | | | | assert [1, 3].includes?(2) fails with unhelpful "Asserting failed" message assert_includes [1, 3], 2 fails with "Expected [1, 3] to include 2" which makes it easier to debug and more obvious what went wrong
* Merge pull request #26469 from y-yagi/remove_useless_optionRafael França2016-09-141-5/+0
|\ | | | | remove useless `gemfile` option
| * remove useless `gemfile` optionyuuji.yaginuma2016-09-121-5/+0
| | | | | | | | | | | | | | Rails application for test creates with `--skip-gemfile` option. https://github.com/rails/rails/blob/master/railties/test/isolation/abstract_unit.rb#L333 Therefore, regardless of the option, Gemfile is not created.
* | Merge pull request #26487 from prathamesh-sonpatki/move-preload-section-upRichard Schneeman2016-09-141-7/+8
|\ \ | | | | | | Move comment about disconnecting pool close to comment about preload
| * | Move comment about disconnecting pool close to comment about preloadPrathamesh Sonpatki2016-09-141-7/+8
| | | | | | | | | | | | - These two comments are connected to each other so kept them back to back.
* | | fix broken generators testyuuji.yaginuma2016-09-142-2/+2
|/ / | | | | | | Follow up to 92703a9ea5d8b96f30e0b706b801c9185ef14f0e
* | Do not point to the 5-0-stable branchRafael Mendonça França2016-09-131-1/+1
| | | | | | | | Master based applications should be pointing to master
* | Merge pull request #26314 from frodsan/puma-ar-disconnectRichard Schneeman2016-09-131-0/+8
|\ \ | | | | | | Disconnects all connections in the pool before forking.
| * | Disconnects all connections in the pool before forking.Francesco Rodriguez2016-08-291-0/+8
| | | | | | | | | | | | See discussion in https://github.com/puma/puma/issues/1001
* | | [ci skip] Update Levenshtein code with better attribution.Kasper Timm Hansen2016-09-121-1/+3
| |/ |/| | | | | Lacks some proper creds to the homies who went the... distance ;)
* | use correct Gemfile in `bin/setup` testyuuji.yaginuma2016-09-111-0/+18
| | | | | | | | | | | | | | Currently, `bin/setup` test uses Gemfile of Rails. But this Gemfile is not a file to be used in Rails application. Add a Gemfile to Rails application that is created for test, it has been modified to use the Gemfile.
* | Remove the word "mongrel" from documentsRyunosuke Sato2016-09-071-1/+1
| | | | | | | | | | | | | | | | | | Currently mongrel is not maintained. And it couldn't be built with any Ruby versions that supported by Rails. It is reasonable to remove the word "mongrel" in order to avoid confusion from newcomer.
* | Fix Remaining Case-In-Assignment Statement FormattingAlex Kitchens2016-09-061-7/+8
| | | | | | | | | | | | | | | | | | Recently, the Rails team made an effort to keep the source code consistent, using Ruboco (bb1ecdcc677bf6e68e0252505509c089619b5b90 and below). Some of the case statements were missed. This changes the case statements' formatting and is consistent with changes in 810dff7c9fa9b2a38eb1560ce0378d760529ee6b and db63406cb007ab3756d2a96d2e0b5d4e777f8231.
* | Allow download of email attachments in the Mailer Preview template.jpd8002016-09-021-1/+4
| |
* | fixes remaining RuboCop issues [Vipul A M, Xavier Noria]Xavier Noria2016-09-013-11/+11
| |
* | Fix styleschneems2016-08-301-26/+26
| |
* | Address comment via @dhh, better option namingschneems2016-08-301-4/+4
| |
* | Set unknown_asset_fallback false only new appsschneems2016-08-291-1/+1
| |
* | Move default to different initializerschneems2016-08-292-4/+4
| | | | | | | | | | Is this usage correct? cc/ @prathamesh-sonpatki
* | Thanks rubocopschneems2016-08-291-1/+1
| |