aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22967 from schneems/schneems/generic-metadataSean Griffin2016-01-084-7/+27
|\ | | | | Prevent destructive action on production database
| * Fixing tests and re-locating error checking.schneems2016-01-082-3/+3
| |
| * Prevent destructive action on production databaseschneems2016-01-074-7/+27
| | | | | | | | | | | | | | This PR introduces a key/value type store to Active Record that can be used for storing internal values. It is an alternative implementation to #21237 cc @sgrif @matthewd. It is possible to run your tests against your production database by accident right now. While infrequently, but as an anecdotal data point, Heroku receives a non-trivial number of requests for a database restore due to this happening. In these cases the loss can be large. To prevent against running tests against production we can store the "environment" version that was used when migrating the database in a new internal table. Before executing tests we can see if the database is a listed in `protected_environments` and abort. There is a manual escape valve to force this check from happening with environment variable `DISABLE_DATABASE_ENVIRONMENT_CHECK=1`.
* | Default new apps to tag logs with `request_id`schneems2016-01-061-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In high volume applications it can be very difficult to figure out what is happening in logs because each request is not easily identified. For example 3 requests could look something like this: ``` Started GET "/" for 72.48.77.213 at 2016-01-06 20:30:21 +0000 Rendered welcome/index.html.erb within layouts/application (0.1ms) Started GET "/" for 72.48.77.213 at 2016-01-06 20:30:22 +0000 Started GET "/" for 72.48.77.213 at 2016-01-06 20:30:23 +0000 Rendered welcome/index.html.erb within layouts/application (0.1ms) Processing by WelcomeController#index as HTML Completed 200 OK in 5ms (Views: 3.8ms | ActiveRecord: 0.0ms) Processing by WelcomeController#index as HTML Rendered welcome/index.html.erb within layouts/application (0.1ms) Completed 200 OK in 5ms (Views: 3.8ms | ActiveRecord: 0.0ms) Processing by WelcomeController#index as HTML Completed 200 OK in 5ms (Views: 3.8ms | ActiveRecord: 0.0ms) ``` The `:request_id` log tag ensures that each request is tagged with a unique identifier. While they are still interleaved it is possible to figure out which lines belong to which requests. Like: ``` [c6034478-4026-4ded-9e3c-088c76d056f1] Started GET "/" for 72.48.77.213 at 2016-01-06 20:30:21 +0000 [c6034478-4026-4ded-9e3c-088c76d056f1] Rendered welcome/index.html.erb within layouts/application (0.1ms) [abuqw781-5026-6ded-7e2v-788c7md0L6fQ] Started GET "/" for 72.48.77.213 at 2016-01-06 20:30:22 +0000 [acfab2a7-f1b7-4e15-8bf6-cdaa008d102c] Started GET "/" for 72.48.77.213 at 2016-01-06 20:30:23 +0000 [abuqw781-5026-6ded-7e2v-788c7md0L6fQ] Rendered welcome/index.html.erb within layouts/application (0.1ms) [c6034478-4026-4ded-9e3c-088c76d056f1] Processing by WelcomeController#index as HTML [c6034478-4026-4ded-9e3c-088c76d056f1] Completed 200 OK in 5ms (Views: 3.8ms | ActiveRecord: 0.0ms) [abuqw781-5026-6ded-7e2v-788c7md0L6fQ] Processing by WelcomeController#index as HTML [abuqw781-5026-6ded-7e2v-788c7md0L6fQ] Rendered welcome/index.html.erb within layouts/application (0.1ms) [abuqw781-5026-6ded-7e2v-788c7md0L6fQ] Completed 200 OK in 5ms (Views: 3.8ms | ActiveRecord: 0.0ms) [acfab2a7-f1b7-4e15-8bf6-cdaa008d102c] Processing by WelcomeController#index as HTML [acfab2a7-f1b7-4e15-8bf6-cdaa008d102c] Completed 200 OK in 5ms (Views: 3.8ms | ActiveRecord: 0.0ms) ``` Now if you have the logs and you find this unique ID you can filter to only look at information from that request. So a filtered log output would be very clear: ``` [c6034478-4026-4ded-9e3c-088c76d056f1] Started GET "/" for 72.48.77.213 at 2016-01-06 20:30:21 +0000 [c6034478-4026-4ded-9e3c-088c76d056f1] Rendered welcome/index.html.erb within layouts/application (0.1ms) [c6034478-4026-4ded-9e3c-088c76d056f1] Processing by WelcomeController#index as HTML [c6034478-4026-4ded-9e3c-088c76d056f1] Completed 200 OK in 5ms (Views: 3.8ms | ActiveRecord: 0.0ms) ``` In addition to this benefit the `:request_id` can be set via the `X-Request-ID` header so that the same request could be traced between multiple components. For example a request comes in Nginx (or another load balancer) could assign a request id. As the load balancer processes the request I can log using that id, then when the request is passed on to Rails, the same id is used. That way if a problem is determined to be not caused in Rails it could be traced back to other components with the same ID. You can set a value in nginx for example using something like this: ``` location / { proxy_pass http://upstream; proxy_set_header X-Request-Id $pid-$msec-$remote_addr-$request_length; } # http://stackoverflow.com/questions/17748735/setting-a-trace-id-in-nginx-load-balancer ``` Heroku sets this header value so problems like timeouts that are logged by like router can be traced back to specific request within the application. Whether you are using components that are setting request ID or not, all production applications can benefit from the additional debugging information of having a unique identifier for all requests. This change will only affect new applications, anyone can opt out by commenting or removing the line in `config/production.rb`.
* | Merge pull request #22939 from ↵Rafael França2016-01-061-0/+9
|\ \ | | | | | | | | | | | | y-yagi/make_generated_controller_test_file_work_correctly make generated controller test work correctly
| * | make generated controller test work correctlyyuuji.yaginuma2016-01-061-0/+9
| | | | | | | | | | | | | | | | | | | | | Since the `#file_name` that not consideration for the namespace, if generate a controller with a namespace, not the correct url helper generation, it had become an error to run the test. Modified to generate the correct url helper, even if it is produced a namespace with controller.
* | | Merge pull request #22275 from mastahyeti/per-form-csrfRafael França2016-01-061-1/+1
|\ \ \ | | | | | | | | Per-form CSRF tokens
| * | | add option for per-form CSRF tokensBen Toews2016-01-041-1/+1
| |/ /
* / / Provide a better error message if a user mistypes the name of script with runnerStephen Blackstone2016-01-051-0/+10
|/ / | | | | | | Add tests for detecting bad options for runner
* | correctly presence check of `application_record.rb` in pluginyuuji.yaginuma2016-01-021-0/+9
| |
* | add test of that `application_record.rb` is generated in pluginyuuji.yaginuma2016-01-021-3/+7
| |
* | Merge pull request #22826 from timrogers/actiondispatch-ssl-configRafael França2015-12-311-1/+8
|\ \ | | | | | | Configurable redirect and secure cookies for ActionDispatch::SSL
| * | Flexible configuration for ActionDispatch::SSLTim Rogers2015-12-291-1/+8
| | |
* | | Add sass-rails back to the default GemfileRafael Mendonça França2015-12-301-0/+7
|/ / | | | | | | It was removed by mistake at 877a411d0c16baa4e670dae9a28f5cfcc201adc1
* | Merge pull request #22756 from lucasmazza/lm-test-reporter-colored-outputKasper Timm Hansen2015-12-231-3/+35
|\ \ | | | | | | Add colored output to the new test reporter.
| * | Add colored output to the new test reporter.Lucas Mazza2015-12-221-3/+35
| | |
* | | remove cors initializer from rails appyuuji.yaginuma2015-12-221-0/+6
|/ / | | | | | | | | `rack-cors` gem is defined in Gemfile by default only if the api, not defined by default in rails app.
* | Merge pull request #22685 from jeyb/remove_cable_files_for_skip_action_cableRafael França2015-12-211-0/+3
|\ \ | | | | | | Ensure Action Cable files are removed when `skip_action_cable` is set.
| * | Ensure Action Cable files are removed when `skip_action_cable` is set.Jey Balachandran2015-12-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Action Cable generators creates four files which need to be removed if `skip_action_cable` is set. 1. `app/assets/javascripts/cable.coffee` 2. `app/channels/application_cable/channel.rb` 3. `app/channels/application_cable/connection.rb` 4. `config/redis/cable.yml` Fixes #22669.
* | | Use the generators options to not generate channel assetsRafael Mendonça França2015-12-211-6/+2
| | |
* | | Merge pull request #22727 from prathamesh-sonpatki/fix-masterKasper Timm Hansen2015-12-211-1/+4
|\ \ \ | | | | | | | | Ensure that assets are enabled back after the test that tests assets are disabled
| * | | Ensure that assets are enabled back after the test that tests assets are ↵Prathamesh Sonpatki2015-12-211-1/+4
| | | | | | | | | | | | | | | | disabled
* | | | Merge pull request #22684 from ↵Yves Senn2015-12-211-0/+9
|\ \ \ \ | |/ / / |/| | | | | | | | | | | teknofire/fix-using-add_resource-with-a-block-after-gem-call Fix using add_resource with a block after gem in custom generators
| * | | Fixes using `add_source` with a block after using `gem` in a custom railsWill Fisher2015-12-211-0/+9
| |/ / | | | | | | | | | generator template.
* | | Merge pull request #22692 from ryohashimoto/22669_api_generatorDavid Heinemeier Hansson2015-12-211-0/+30
|\ \ \ | | | | | | | | Action Cable channel generator doesn't create JS assets if options[:rails][:assets] is false
| * | | Action Cable channel generator should not create JS assets in --api modeRyo Hashimoto2015-12-191-0/+30
| |/ /
* / / display detailed information in inline reportingyuuji.yaginuma2015-12-214-6/+12
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The errors message only was not displayed, as if it did not use the inline reporting, modified to also information the method name and the like in error are displayed. ``` # before Failed assertion, no message given. bin/rails test test/models/user_test.rb:5 ``` ``` # after Failure: UserTest#test_the_truth: Failed assertion, no message given. bin/rails test test/models/user_test.rb:5 ```
* | Do not check the version anymoreRafael Mendonça França2015-12-181-2/+2
| | | | | | | | | | Our logic is complex now and we don't need to check the version to asset the behavior so I'm removing the checking here.
* | Allow normal version updates within a release seriesMatthew Draper2015-12-181-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We originally chose to apply very strict versioning on the `rails` entry in the Gemfile, because our future versioning policy was not strongly defined. Now it is, and our policy is very much designed on the expectation that people will regularly update to the latest patch level in their release series... so we should encourage that. Of course, Gemfile.lock will do its job and prevent unplanned updates, just as it does for every other gem in the bundle... but if you run `bundle update`, we want to get you the latest bug/security fixes without requiring a manual edit of the Gemfile entry. Our current version could be a few different shapes, so it takes a bit of work to find the right specifier, but in principle, we match anything of the form x.y.*, where x.y matches our current release series.
* | Merge pull request #22642 from seuros/remove-mysql-adapterMatthew Draper2015-12-181-3/+3
|\ \ | | | | | | | | | Remove legacy mysql adapter
| * | Remove legacy mysql adapterAbdelkader Boudih2015-12-171-3/+3
| | |
* | | ApplicationMailer should be generated by default just like every other ↵David Heinemeier Hansson2015-12-175-27/+3
| | | | | | | | | | | | Application* parent
* | | Fix warningRafael Mendonça França2015-12-171-1/+1
|/ /
* | README.rdoc -> README.md for newly generated pluginsyuuji.yaginuma2015-12-171-3/+3
| | | | | | | | I think Markdown is nowadays a better default.
* | Fix testsDavid Heinemeier Hansson2015-12-171-2/+0
| |
* | No longer uses keep now that we have ApplicationRecordDavid Heinemeier Hansson2015-12-161-1/+0
| |
* | Fix testDavid Heinemeier Hansson2015-12-161-1/+10
| |
* | Fix test now that cable is in there by default tooDavid Heinemeier Hansson2015-12-161-1/+1
| |
* | Merge branch 'master' into merge-action-cableRafael Mendonça França2015-12-1611-36/+49
|\ \
| * | Use sprockets 3 in the Rails 5 releaseRafael Mendonça França2015-12-162-6/+7
| | |
| * | Merge pull request #22567 from gsamokovarov/introduce-application-recordRafael França2015-12-164-1/+14
| |\ \ | | |/ | |/| Introduce ApplicationRecord, an Active Record layer supertype
| | * Introduce ApplicationRecord, an Active Record layer supertypeGenadi Samokovarov2015-12-164-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's pretty common for folks to monkey patch `ActiveRecord::Base` to work around an issue or introduce extra functionality. Instead of shoving even more stuff in `ActiveRecord::Base`, `ApplicationRecord` can hold all those custom work the apps may need. Now, we don't wanna encourage all of the application models to inherit from `ActiveRecord::Base`, but we can encourage all the models that do, to inherit from `ApplicationRecord`. Newly generated applications have `app/models/application_record.rb` present by default. The model generators are smart enough to recognize that newly generated models have to inherit from `ApplicationRecord`, but only if it's present.
| * | Run railties generated app tests in test enveileencodes2015-12-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running railties generated app tests in development env can cause unintended consequences. The environments are different and tests aren't meant to be run in development mode. The changes to the generator exposed this issue where the random test order in the generated apps could cause problems when those tests are run in development mode. Particularly we saw failures in `railties/test/application/rake_test.rb` generated apps that used the scaffold to create applications and then run the migration and immediately run the tests. The error we saw was `ActiveRecord::RecordNotFound: Couldn't find User with 'id'=980190962` and seemed to only occur if the destroy test ran first. I'm not entirely sure _why_ this causes that error to be thrown but I believe it is related to the environments being different.
| * | Update test generators to use ActionDispatch::IntegrationTestAbdelkader Boudih2015-12-154-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 5.1 `ActionController::TestCase` will be moved out of Rails into it's own gem. Please use `ActionDispatch::IntegrationTest` going forward. This changes the generators to use `ActionDispatch::IntegrationTest` and the required URL setup (rather than symbols) for each of the controller actions. Updated fix to #22076.
| * | Do not default to any SerializerSantiago Pastorino2015-12-151-2/+1
| |/ | | | | | | We will wait until 5.1 to make a decision
* | Accept a Pathname in Application#config_forRafael Mendonça França2015-12-151-0/+15
| | | | | | | | That would make possible to use it with action cable configuration.
* | Merge remote-tracking branch 'origin/master' into merge-action-cableRafael Mendonça França2015-12-157-29/+29
|\|
| * Internal test migrations use the private 'Current' versionMatthew Draper2015-12-154-15/+15
| | | | | | | | | | | | | | | | Apart from specific versioning support, our tests should focus on the behaviour of whatever version they're accompanying, regardless of when they were written. Application code should *not* do this.
| * Ensure generated migrations include a version numberMatthew Draper2015-12-153-14/+14
| |
* | Add option to skip Action CableRafael Mendonça França2015-12-141-0/+5
|/