Commit Graph

10901 Commits

Author SHA1 Message Date
Kasper Timm Hansen
cb609d75fe Color failure line by result code.
The static red color wouldn't paint skips in their designated yellow.

Use the color name we got from the result label earlier, which marks
skips as yellow.
2015-12-23 23:26:03 +01:00
Kasper Timm Hansen
33804c7d0f Rewrite aggregated results suppression.
I should have replaced the summary reporter with a subclass
the first time I wrote this.

For whatever reason, I didn't. Do it right and slim the methods added
to Minitest in the process.
2015-12-23 23:18:58 +01:00
Kasper Timm Hansen
b99e7297e7 [ci skip] Clarify why we're clearing reporters.
Minitest by default includes a summary reporter and a progress reporter.

To print colored output, we have to replace the progress reporter.
2015-12-23 23:16:54 +01:00
Kasper Timm Hansen
552e4e6b9e Merge pull request #22756 from lucasmazza/lm-test-reporter-colored-output
Add colored output to the new test reporter.
2015-12-23 23:07:14 +01:00
Rafael França
30e1101f9b Merge pull request #22757 from paulkogel/patch-1
seeds.rb.tt: fix English.
2015-12-22 14:02:48 -02:00
Sean Griffin
89fedb4dac Merge pull request #22755 from y-yagi/remove_cors_initializer_from_rails_app
remove cors initializer from rails app
2015-12-22 06:31:49 -07:00
Paul Kögel
e784fd00f5 seeds.rb.tt: fix English. 2015-12-22 14:20:39 +01:00
Lucas Mazza
7fa3a0c90a Add colored output to the new test reporter. 2015-12-22 10:58:05 -02:00
Yves Senn
0d1d50c2db release notes, extract notable changes from Railties CHANGELOG.
[ci skip]
2015-12-22 10:59:45 +01:00
yuuji.yaginuma
9917c0c255 remove cors initializer from rails app
`rack-cors` gem is defined in Gemfile by default only if the api,
not defined by default in rails app.
2015-12-22 18:39:08 +09:00
Matthew Draper
b5049bc995 Merge pull request #22753 from gwincr11/keeps-options-breaks-assets
Fix .keep file issue with ActionCable
2015-12-22 17:12:03 +10:30
Cory Gwin
a859108c82 Fix .keep file issue with ActionCable
Fixes #22708
Make sure the channels file is create in assets/javascript/ so require
tree works in asset pipeline.
2015-12-21 21:41:00 -08:00
claudiob
a5a2027749 Fix Rails tutorial link
[ci skip]

The old link is 404 not found.
The link matches what the rest of the documentation already points to:

* 2de2263118/guides/source/getting_started.md (L2052)
* 2de2263118/README.md (L74)
2015-12-21 17:25:09 -08:00
Rafael França
73dcf00c1f Merge pull request #22685 from jeyb/remove_cable_files_for_skip_action_cable
Ensure Action Cable files are removed when `skip_action_cable` is set.
2015-12-21 19:01:34 -02:00
Rafael Mendonça França
f51a30c666 Use the generators options to not generate channel assets 2015-12-21 18:58:08 -02:00
Jey Balachandran
96093e3cf7 Ensure Action Cable files are removed when skip_action_cable is set.
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.
2015-12-21 15:27:42 -05:00
Kasper Timm Hansen
daa890331e Merge pull request #22727 from prathamesh-sonpatki/fix-master
Ensure that assets are enabled back after the test that tests assets are disabled
2015-12-21 21:18:40 +01:00
Akshay Vishnoi
5bae9d4f30 [ci skip] No more no changes entries in the CHANGELOGs (cases left in #22718) 2015-12-22 01:20:29 +05:30
Prathamesh Sonpatki
8b8b6e9378 Ensure that assets are enabled back after the test that tests assets are disabled 2015-12-21 22:33:16 +05:30
Yves Senn
a88ab73f7e Merge pull request #22684 from teknofire/fix-using-add_resource-with-a-block-after-gem-call
Fix using add_resource with a block after gem in custom generators
2015-12-21 16:46:42 +01:00
Will Fisher
12dd2ca863 Fixes using add_source with a block after using gem in a custom rails
generator template.
2015-12-21 06:06:30 -09:00
David Heinemeier Hansson
26a8320c72 Merge pull request #22692 from ryohashimoto/22669_api_generator
Action Cable channel generator doesn't create JS assets if options[:rails][:assets] is false
2015-12-21 14:31:42 +01:00
Kasper Timm Hansen
9aff14f1ee Merge pull request #22698 from y-yagi/display_detail_info_on_inline_report
display detailed information in inline reporting
2015-12-21 12:40:47 +01:00
yuuji.yaginuma
4f8c36ab70 display detailed information in inline reporting
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
```
2015-12-21 07:48:53 +09:00
Vijay Dev
b691d62be9 Merge branch 'master' of github.com:rails/docrails 2015-12-20 12:33:46 +00:00
Richard Schneeman
fb77aa33f7 Merge pull request #22683 from gwincr11/No-Doc-Rails__Generators__Actions__CreateMigration
Add No Doc
2015-12-18 23:02:13 -06:00
Richard Schneeman
bf42c91c75 Merge pull request #22690 from claudiob/remove-blank-line
Remove blank line generated in config.ru
2015-12-18 23:00:08 -06:00
Ryo Hashimoto
61366f5a3d Action Cable channel generator should not create JS assets in --api mode 2015-12-19 13:43:11 +09:00
claudiob
70040184ab Remove blank line generated in config.ru
Follow the lines of the other `.tt` files ([example](1611ab4db1/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt (L26))) that have the space after the
condition to avoid too many white lines in the resulted file.
2015-12-18 20:22:18 -08:00
Cory Gwin
c640b2c251 Add No Doc
In reference to rails/rail#22403 add a :nodoc:
2015-12-18 20:05:42 -08:00
claudiob
7e21a7d9d4 Explain what initializer/config_serializer does
In line with the other initializers, add a short comment that explains
what happens when you change the value of the initializer.

[ci skip]
2015-12-18 20:03:29 -08:00
claudiob
175148b1d9 initializers/cookies_serializer is not new to 5.0
[ci skip]

The initializer has existed since 4.1, for instance see:
https://github.com/rails/rails/blob/v4.1.0/railties/lib/rails/generators/rails/app/templates/config/initializers/cookies_serializer.rb
2015-12-18 20:01:48 -08:00
eileencodes
099ddfdefd Add CHANGELOG headers for Rails 5.0.0.beta1 2015-12-18 15:58:25 -05:00
eileencodes
7eae0bb88e Change alpha to beta1 to prep for release of Rails 5
🎉 🍻
2015-12-18 12:14:09 -05:00
Rafael Mendonça França
376cfeb83e Don't need to use Array.wrap 2015-12-18 13:16:01 -02:00
Rafael Mendonça França
840b3dd9b2 Do not check the version anymore
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.
2015-12-18 12:39:19 -02:00
Rafael Mendonça França
b7660e0660 Merge pull request #22657 from matthewd/loosen-version
Allow normal version updates within a release series
2015-12-18 12:31:06 -02:00
David Heinemeier Hansson
ea4f0e2bab Refer to rails command instead of rake in a bunch of places
Still more to do. Please assist!
2015-12-18 13:01:10 +01:00
David Heinemeier Hansson
bced489ac7 Explain reason for eager loading 2015-12-18 13:01:10 +01:00
David Heinemeier Hansson
82f5dc5230 Explain Redis' role in Action Cable 2015-12-18 13:01:10 +01:00
David Heinemeier Hansson
e50ea481dd Bring comment in line with rest of initializers 2015-12-18 12:30:34 +01:00
David Heinemeier Hansson
569e03d721 Explain the concept of config initializers for backwards compatibility 2015-12-18 12:30:24 +01:00
David Heinemeier Hansson
8669d5b571 Fix spacing 2015-12-18 12:21:31 +01:00
David Heinemeier Hansson
28dcadc014 These options are not changed nearly often enough to warrant inclusion like this at a high level 2015-12-18 12:20:35 +01:00
David Heinemeier Hansson
e3dee30d56 Better explanation 2015-12-18 12:18:07 +01:00
David Heinemeier Hansson
3186fe582c Use the rails command, not rake, for all rails commands 2015-12-18 12:14:43 +01:00
David Heinemeier Hansson
719cddd67d README.md in the app is now used to describe the app itself, not Rails 2015-12-18 12:12:06 +01:00
David Heinemeier Hansson
9738ff91b1 More sensible ordering with the more important options first 2015-12-18 12:10:36 +01:00
David Heinemeier Hansson
7956d4014b List the major frameworks you can remove together 2015-12-18 12:07:44 +01:00
yuuji.yaginuma
703f1052ae fix indentation of generated controller test
```
# before
module Bukkits
  class UsersControllerTest < ActionDispatch::IntegrationTest
    include Engine.routes.url_helpers

      setup do
      @user = bukkits_users(:one)
    end
```

```
# after
module Bukkits
  class UsersControllerTest < ActionDispatch::IntegrationTest
    include Engine.routes.url_helpers

    setup do
      @user = bukkits_users(:one)
    end
```
2015-12-18 18:15:07 +09:00