aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #23795 from claudiob/replace-rack-with-rails-commandDavid Heinemeier Hansson2016-02-243-6/+50
|\ \ \ \ | |/ / / |/| | | AppGenerator: Replace 'rake' with 'rails_command'
| * | | Invoke 'rails' instead of 'rake' in AppGeneratorclaudiob2016-02-202-11/+11
| | | | | | | | | | | | | | | | | | | | Follows the convention from Rails 5 of invoking tasks on the command-line with `rails …` rather than `rake …`.
| * | | AppGenerator: Replace 'rake' with 'rails_command'claudiob2016-02-203-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Rails 5.0 is switching the Rails command line from 'rake …' to 'rails …', it makes sense to also replace the `rake` method in the Rails templates API. Based on feedback from @matthewd and @kaspth, I chose to replace `rake` with `rails_command`, which is less confusing than the alternatives `rails` or `command` or `rails_run` and is not Thor-reserved word like `task`.
* | | | Merge branch 'actionmailer-cache'Rafael Mendonça França2016-02-243-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | This is a rebased version of #22825. Closes #22825.
| * | | | Change ActionMailer's default caching configuration and update generator's ↵Stan Lo2016-02-233-0/+12
| | |/ / | |/| | | | | | | | | | environment templates
* | | | Use the trick to get beta releases in the GemfileRafael Mendonça França2016-02-231-1/+1
| | | |
* | | | New apps get the Turbolinks beta gemSam Stephenson2016-02-231-2/+2
| | | |
* | | | Switch to `data-turbolinks-track="reload"`Sam Stephenson2016-02-232-4/+4
|/ / /
* | | Merge pull request #23734 from schneems/schneems/stdout-againRichard Schneeman2016-02-232-0/+15
|\ \ \ | | | | | | | | Alternative to #23638 log to STDOUT via env var
| * | | Alternative to #23638 log to STDOUT via env varschneems2016-02-172-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | People who deploy to containers or other places where they might have some sort of a log wrapping service use stdout. With this change new rails apps can be configured to output to STDOUT via setting `RAILS_LOG_TO_STDOUT` to any value. This allows container images or services to set the value for all apps without having to modify configuration for each application. If an app wants to opt out, they can either delete from the env hash, or remove that configuration. cc/ @rafaelfranca
* | | | Merge pull request #23789 from ↵Rafael França2016-02-234-10/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | wisetara/wisetara/deprecate-args-ActiveSupport__TestCase#assert_nothing_raised-for-pr Wisetara/deprecate args active support test case#assert nothing raised for pr
| * | | | remove args from assert_nothing_raised in testsTara Scherner de la Fuente2016-02-224-10/+10
| | | | |
* | | | | reestablish previous connection after creating all databasesAaron Patterson2016-02-231-0/+13
|/ / / / | | | | | | | | | | | | | | | | | | | | creating all databases mutates the connection pool. This patch restores the connection pool to the connection spec established before creating all databases. Fixes #23279
* | | | Merge pull request #23669 from maclover7/internal-routesRafael França2016-02-221-4/+4
|\ \ \ \ | | | | | | | | | | Add `internal` attribute to routes
| * | | | Add `internal` attribute to routesJon Moss2016-02-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is meant to provide a way for Action Cable, Sprockets, and possibly other Rack applications to mark themselves as internal, and to exclude themselves from the routing inspector, and thus `rails routes` / `rake routes`. I think this is the only way to have mounted Rack apps be marked as internal, within AD/Journey. Another option would be to create an array of regexes for internal apps, and then to iterate over that everytime a request comes through. Also, I only had the first `add_route` method set `internal`'s default to false, to avoid littering it all over the codebase.
* | | | | Generate ApplicationCable files if they do not already existJon Moss2016-02-221-0/+12
| | | | |
* | | | | Generate ApplicationRecord if it does not already existJon Moss2016-02-221-0/+8
| | | | |
* | | | | Generate `config/cable.yml` in `rails:update` commandJon Moss2016-02-221-0/+5
|/ / / /
* | | | make sure `rake test` respects TESTOPTSAaron Patterson2016-02-222-1/+15
| | | | | | | | | | | | | | | | | | | | We should be able to pass options to minitest via TESTOPTS environment variable
* | | | [ci skip] Mention testing fore-runners.Kasper Timm Hansen2016-02-211-0/+2
| | | | | | | | | | | | | | | | Get it? ( ͡° ͜ʖ ͡°)
* | | | Merge pull request #23799 from y-yagi/use_method_provided_by_minitestKasper Timm Hansen2016-02-211-7/+1
|\ \ \ \ | | | | | | | | | | use method provided by minitest
| * | | | use method provided by minitestyuuji.yaginuma2016-02-211-7/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | The process of converting `Test` to `String` is already defined in minitest. I think it is better to use that for the consistency of output content. ref: https://github.com/seattlerb/minitest/blob/master/lib/minitest/test.rb#L261..L267
* / | | Make collection caching explicit.Kasper Timm Hansen2016-02-201-0/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having collection caching that wraps templates and automatically tries to infer if they are cachable proved to be too much of a hassle. We'd rather have it be something you explicitly turn on. This removes much of the code and docs to explain the previous automatic behavior. This change also removes scoped cache keys and passing cache_options.
* | | Merge pull request #23756 from tenderlove/move_digest_cacheAaron Patterson2016-02-181-2/+3
|\ \ \ | | | | | | | | move digest cache on to the DetailsKey object
| * | | move digest cache on to the DetailsKey objectAaron Patterson2016-02-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves digest calculation cache on to the details key object. Before, the digest cache was a class level ivar, and one of the keys was the hash value of the details key object: https://github.com/rails/rails/blob/13c4cc3b5aea02716b7459c0da641438077f5236/actionview/lib/action_view/digestor.rb#L28 An object's hash value is not unique, so it's possible for this cache key to produce colliding keys with no resolution. This commit move cache on to the details key object itself, so we know that the digests are always unique per details key object.
* | | | set `skip_listen` option to dummy appplicationyuuji.yaginuma2016-02-182-0/+9
|/ / / | | | | | | | | | | | | | | | If you want to use `EventedFileUpdateChecker`, need to specify `listen` to plugin's gemspec. However, the default is not specified `listen` to plugin's gemspec, `EventedFileUpdateChecker` should be disabled.
* | | Merge pull request #23730 from y-yagi/fail_fast_when_test_errorAndrew White2016-02-174-5/+20
|\ \ \ | |/ / |/| | modify to `error` also abort when specify fail fast option
| * | modify to `error` also abort when specify fail fast optionyuuji.yaginuma2016-02-174-5/+20
| | |
* | | Implement ActionController::Parameters#inspectBenjamin Quorning2016-02-171-1/+1
| | | | | | | | | | | | Now that AC::Parameters is no longer a Hash, it shouldn't look like a hash.
* | | remove unused methodyuuji.yaginuma2016-02-171-4/+0
|/ / | | | | | | `app_templates_dir` is unused since dc53fe9.
* | adds --skip-listen to the application generator [closes #23590]Xavier Noria2016-02-176-13/+42
| |
* | Merge pull request #23630 from akshaymohite/correct-test-name-api-onlyYves Senn2016-02-161-1/+1
|\ \ | | | | | | Correct config option from only_api to api_only in test
| * | Correct config option from only_api to api_only in testAkshay2016-02-121-1/+1
| | |
* | | reset `ActionMailer::Base.deliveries` in `ActionDispatch::IntegrationTest`.Yves Senn2016-02-161-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever you are sending emails in integration tests using the `:test` delivery method you need to make sure that `ActionMailer::Base.deliveries` is reset after every test. This piece of boilerplate code is present in all my applications that send emails. Let's have `ActionDispatch::IntegrationTest` reset the deliveries automatically.
* | | fix more failing tests due to 07e422f ... :pray:Yves Senn2016-02-151-2/+2
| | |
* | | fixing the build take II. :sweat:Yves Senn2016-02-151-1/+1
| | |
* | | fix build broken by 07e422f58d61da0.Yves Senn2016-02-151-1/+1
| | |
* | | Merge pull request #23631 from y-yagi/generate_mailer_views_in_apiYves Senn2016-02-154-4/+20
|\ \ \ | | | | | | | | generate mailer views in Rails API
| * | | generate mailer views in Rails APIyuuji.yaginuma2016-02-154-4/+20
| | | | | | | | | | | | | | | | | | | | View files is necessary to send mail, it should be generated even Rails API. Fixes #23617
* | | | test runner, relay minitest information about the error location.Yves Senn2016-02-152-2/+2
| | | | | | | | | | | | | | | | | | | | This is a follow-up to ea70c29 to bring back the assertion error location information provided by minitest.
* | | | Revert "Prefer Minitest's location for test failures."Yves Senn2016-02-152-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0db310586ac3e15be95d2ef27ff40cfa24c05c10. Closes #23686. Conflicts: railties/test/application/test_runner_test.rb It's possible that the `result.location` returned by minitest is outside the test file itself. For example in the case of mocha. This resulted in bad rerun snipptets: ``` bin/rails test app/models/deliveries/delivery.rb:103 ``` Let's always use the first line of the failed test-case in our rerun snippet. We can display the line number of the assertion error elsewhere.
* | | | Merge pull request #23569 from Gaurav2728/no_doc_of_some_railtie_methodsVipul A M2016-02-151-4/+7
|\ \ \ \ | | | | | | | | | | mark as #:nodoc: [ci skip]
| * | | | mark as #:nodoc: [ci skip]Gaurav Sharma2016-02-151-4/+7
| | | | | | | | | | | | | | | can’t be instantiate directly or may be no need for doc.
* | | | | Merge pull request #23664 from y-yagi/remove_test_order_from_environment_fileYves Senn2016-02-151-3/+0
|\ \ \ \ \ | |/ / / / |/| | | | remove `active_support.test_order` from environment file
| * | | | remove `active_support.test_order` from environment fileyuuji.yaginuma2016-02-141-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | The default test order has been changed to `:random` in 5f777e4b5ee2e3e8e6fd0e2a208ec2a4d25a960d. Therefore, it is no more need to be specified in the environment file.
* | | | | Merge pull request #23505 from kaspth/inject-rails-config-through-railtieKasper Timm Hansen2016-02-141-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | Inject Rails related configuration through Railtie
| * | | | Inject Rails' channel paths in engine.Kasper Timm Hansen2016-02-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were explicitly referencing Rails.root in ActionCable::Server::Configuration.initialize, thereby coupling ourselves to Rails. Instead add `app/channels` to Rails' app paths and assign the existent files to `channel_paths`. Users can still append to those load paths with `<<` and `push` in `config/application.rb`. This means we can remove the custom `Dir` lookup in `channel_paths` and the Rails and root definitions in the tests.
* | | | | Fix expected hash syntax.Kasper Timm Hansen2016-02-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f70e8bd2 set a new bar for tests, but they weren't updated. Update their expectation.
* | | | | Use Ruby 1.9 hash syntaxRafael Mendonça França2016-02-121-1/+1
| | | | |
* | | | | Merge pull request #23611 from abhishekjain16/routes_optionsKasper Timm Hansen2016-02-121-1/+9
|\ \ \ \ \ | | | | | | | | | | | | Fix routes to match verb and URL path with -g option also.