aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | | Fixes routes to match verbs and path with -g optionAbhishek Jain2016-02-111-1/+9
| | | | |
* | | | | Use correct path in documentation.Tom von Schwerdtner2016-02-121-1/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | s/config\/production/config\/environments\/production/ [ci skip]
* | | | - Fixed and removed long arguments to rake routesVipul A M2016-02-121-3/+3
| |_|/ |/| | | | | | | | | | | | | | - Fixed related documentation and usage all around Fixes #23561
* | | Merge pull request #23528 from bensheldon/patch-1Richard Schneeman2016-02-101-1/+1
|\ \ \ | | | | | | | | Set database poolsize via rails_max_threads
| * | | Set postgresql poolsize via RAILS_MAX_THREADSBen Sheldon2016-02-101-1/+1
| | |/ | |/|
* | | Merge pull request #23512 from y-yagi/set_association_name_to_fixtureDavid Heinemeier Hansson2016-02-103-11/+10
|\ \ \ | |_|/ |/| | set association name to generated fixtures if attribute is reference
| * | set association name to generated fixtures if attribute is referenceyuuji.yaginuma2016-02-063-11/+10
| | | | | | | | | | | | | | | | | | | | | It has been changed to require `belongs_to` by default in Rails 5. Therefore in order to pass the controller test, have association of set to fixtures. Fixes #23384
* | | prevent apps in the railties test suite from running the evented monitorXavier Noria2016-02-101-3/+12
| | |
* | | include spring-watcher-listen in the Gemfile of new applicationsXavier Noria2016-02-103-0/+9
| | |
* | | enables the evented monitor in new applicationsXavier Noria2016-02-105-1/+35
| | |
* | | revert dev:cache to rake task, fixes #23410Scott Bronson2016-02-076-54/+49
| | |
* | | Remove unused private methodSyamil MJ2016-02-071-4/+0
| |/ |/|
* | Replace old Rails greeting referencesGenadi Samokovarov2016-02-061-1/+1
|/ | | | | | | A couple of the READMEs were still referring the old welcome page. This is a small change that goes over it. [ci skip]
* Fix mixing line filters with Minitest's -n filter.Kasper Timm Hansen2016-02-052-4/+36
| | | | | | | | | | | Previous commit accidentally broke mixing line filters with string -n filter. Fix by checking if it is a string and returning it. We also need to ensure the -n filter carry forward into any other composite filters. Fix by letting the named filter be extractable, so we'll keep this for the next runnable's run.
* move CHANGELOG entry to the appropriate position [ci skip]yuuji.yaginuma2016-02-051-2/+2
| | | | | Dummy apple icon files has been added after the 5.0.0.beta2 release. ref: #23455
* - app generate option --skip-sprockets leaves jquery-rails gem, which relies ↵Vipul A M2016-02-042-2/+3
| | | | | | | | on sprockets environment - Remove jquery-rails if --skip-sprockets is true Fixes #23431
* Update assertion on redis in generated GemfilePrem Sichanugrist2016-02-041-1/+1
| | | | | | | | Redis now included in Gemfile but commented out. This change was made in 91864439c7aebb6ca710831aac6781903a433904 and is causing the test failure. See https://travis-ci.org/rails/rails/jobs/106994913#L1025
* Merge pull request #23478 from vipulnsward/23470-pass-api-in-update-generatorRafael França2016-02-041-1/+1
|\ | | | | Pass api only option to rails rails:update task to update only based on api Apps
| * Pass api only option to rails rails:update task to update only based on API.Vipul A M2016-02-041-1/+1
| | | | | | | | Fixes #23470
* | Turbolinks has moved outDavid Heinemeier Hansson2016-02-041-1/+1
| | | | | | | | All grown up and shit!
* | Redis is now only needed if you want to use Action Cable in productionDavid Heinemeier Hansson2016-02-041-2/+2
| | | | | | | | So no need to have it on by default in the Gemfile.
* | rake stats dynamically scales nowAkira Matsuda2016-02-041-9/+21
| | | | | | | | So it can properly show stats for an app with 1,000,000+ LOC
* | Revert "Lines of code can be 100,000+ in a Rails app"Akira Matsuda2016-02-041-4/+4
| | | | | | | | | | | | This reverts commit 293bd95c3e77275193130bc14c986348aae8b0e2. This broke the header :<
* | Merge pull request #23458 from kamipo/activerecord_supports_mysql_5.0_and_upSean Griffin2016-02-032-2/+2
|\ \ | | | | | | Active Record supports MySQL >= 5.0
| * | Active Record supports MySQL >= 5.0Ryuta Kamizono2016-02-042-2/+2
| | | | | | | | | | | | | | | Currently some features uses `information_schema` (e.g. foreign key support). `information_schema` introduced since MySQL 5.0.
* | | Merge pull request #23456 from kaspth/line-filter-triggers-one-runnableKasper Timm Hansen2016-02-032-2/+26
|\ \ \ | |/ / |/| | Fix line filters running tests from multiple runnables.
| * | Fix model test path typo uncovered in previous commit.Kasper Timm Hansen2016-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because of the expanding whitelist for test filters, this test ended up running the tests on lines 4 and 9 in the post test even though the path wasn't right. Happened incidentally because the same line numbers were used in both account and post test. Add the .rb line so the file is required correctly and the filters are applied.
| * | Fix line filters running tests from multiple runnables.Kasper Timm Hansen2016-02-032-1/+25
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `derive_regexp` was written with the assumption that we were run from a blank slate — that if the filter didn't match we might as well return it because it was nil. This isn't the case because minitest calls `run` on every runnable. Which is any subclass of Minitest::Runnable, such as ActiveSupport::TestCase, ActionDispatch::IntegrationTest as well as any inheriting from those. Thus after the first `run` we'd have put in a composite filter in `options[:filter]` making the next `run` create a linked list when it failed to match the regexp and put the composite filter as the head. Every runnable would accumulate more and more of the same filters, which effectively acted like an expanding whitelist and we ran tests from other runnables. Clog the accumulation by returning nil if there's no filter to derive a regexp from. Note: we pass a seed in the tests because Minitest shuffles the runnables to ensure the whitelist is expanded enough that the failure is triggered.
* / Add dummy apple icon filesAlexey Zabelin2016-02-033-0/+4
|/ | | | | | | | Previously Safari would try to load these files when you visit localhost:3000. That created two exceptions in the log. It also caused the exception notifier to send them out. In response to #23427