From 5bb1ab4adee636e1accaeedcfc7c9aad5a3b2fa1 Mon Sep 17 00:00:00 2001
From: eileencodes <eileencodes@gmail.com>
Date: Fri, 28 Apr 2017 08:38:29 -0700
Subject: Update system test runner docs

It wasn't clear that system tests don't run with the rest of the test
suite and are part of a separate command.

This documents the `test:system` command as well as update the Rails
runner help documentation to make it clearer that system tests are run
via their own command by default.
---
 railties/lib/rails/commands/help/USAGE | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'railties/lib/rails/commands/help')

diff --git a/railties/lib/rails/commands/help/USAGE b/railties/lib/rails/commands/help/USAGE
index c5f8ab72bb..8eb98319d2 100644
--- a/railties/lib/rails/commands/help/USAGE
+++ b/railties/lib/rails/commands/help/USAGE
@@ -1,13 +1,14 @@
 The most common rails commands are:
- generate    Generate new code (short-cut alias: "g")
- console     Start the Rails console (short-cut alias: "c")
- server      Start the Rails server (short-cut alias: "s")
- test        Run tests (short-cut alias: "t")
- dbconsole   Start a console for the database specified in config/database.yml
-             (short-cut alias: "db")
+ generate     Generate new code (short-cut alias: "g")
+ console      Start the Rails console (short-cut alias: "c")
+ server       Start the Rails server (short-cut alias: "s")
+ test         Run tests except system tests (short-cut alias: "t")
+ test:system  Run system tests
+ dbconsole    Start a console for the database specified in config/database.yml
+              (short-cut alias: "db")
 <% unless engine? %>
- new         Create a new Rails application. "rails new my_app" creates a
-             new application called MyApp in "./my_app"
+ new          Create a new Rails application. "rails new my_app" creates a
+              new application called MyApp in "./my_app"
 <% end %>
 
 All commands can be run with -h (or --help) for more information.
-- 
cgit v1.2.3


From cfade1ec7ee7b5b51f3c1578e3474f9c156f2971 Mon Sep 17 00:00:00 2001
From: Kir Shatrov <shatrov@me.com>
Date: Thu, 22 Jun 2017 22:59:18 -0400
Subject: Enforce frozen string in Rubocop

---
 railties/lib/rails/commands/help/help_command.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'railties/lib/rails/commands/help')

diff --git a/railties/lib/rails/commands/help/help_command.rb b/railties/lib/rails/commands/help/help_command.rb
index 90d37217fc..68ca9f1c01 100644
--- a/railties/lib/rails/commands/help/help_command.rb
+++ b/railties/lib/rails/commands/help/help_command.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rails
   module Command
     class HelpCommand < Base # :nodoc:
-- 
cgit v1.2.3


From 87b3e226d65ac1ed371620bfdcd2f950c87cfece Mon Sep 17 00:00:00 2001
From: Matthew Draper <matthew@trebex.net>
Date: Sun, 2 Jul 2017 02:15:17 +0930
Subject: Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"

This reverts commit 3420a14590c0e6915d8b6c242887f74adb4120f9, reversing
changes made to afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.
---
 railties/lib/rails/commands/help/help_command.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'railties/lib/rails/commands/help')

diff --git a/railties/lib/rails/commands/help/help_command.rb b/railties/lib/rails/commands/help/help_command.rb
index 68ca9f1c01..90d37217fc 100644
--- a/railties/lib/rails/commands/help/help_command.rb
+++ b/railties/lib/rails/commands/help/help_command.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module Rails
   module Command
     class HelpCommand < Base # :nodoc:
-- 
cgit v1.2.3