From 6fbd405a2eb585591bb57de5adae71f890a24af3 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Thu, 22 Jun 2017 22:17:18 +0900
Subject: Clear screenshots files in `tmp:clear` task

If system test fails, it creates screenshot under `tmp/screenshots`.
https://github.com/rails/rails/blob/34fe2a4fc778d18b7fe6bdf3629c1481bee789b9/actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb#L45

But currently, screenshot files is not cleared by `tmp:clear` task.
This patch make clears screenshot files with `tmp:clear` task as well
as other tmp files.
---
 guides/source/command_line.md | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'guides')

diff --git a/guides/source/command_line.md b/guides/source/command_line.md
index 3360496c08..9fddbf76b6 100644
--- a/guides/source/command_line.md
+++ b/guides/source/command_line.md
@@ -262,12 +262,12 @@ $ bin/rails db:migrate
 ==  CreateHighScores: migrated (0.0019s) ======================================
 ```
 
-INFO: Let's talk about unit tests. Unit tests are code that tests and makes assertions 
-about code. In unit testing, we take a little part of code, say a method of a model, 
-and test its inputs and outputs. Unit tests are your friend. The sooner you make 
-peace with the fact that your quality of life will drastically increase when you unit 
-test your code, the better. Seriously. Please visit 
-[the testing guide](http://guides.rubyonrails.org/testing.html) for an in-depth 
+INFO: Let's talk about unit tests. Unit tests are code that tests and makes assertions
+about code. In unit testing, we take a little part of code, say a method of a model,
+and test its inputs and outputs. Unit tests are your friend. The sooner you make
+peace with the fact that your quality of life will drastically increase when you unit
+test your code, the better. Seriously. Please visit
+[the testing guide](http://guides.rubyonrails.org/testing.html) for an in-depth
 look at unit testing.
 
 Let's see the interface Rails created for us.
@@ -533,7 +533,8 @@ The `tmp:` namespaced tasks will help you clear and create the `Rails.root/tmp`
 
 * `rails tmp:cache:clear` clears `tmp/cache`.
 * `rails tmp:sockets:clear` clears `tmp/sockets`.
-* `rails tmp:clear` clears all cache and sockets files.
+* `rails tmp:screenshots:clear` clears `tmp/screenshots`.
+* `rails tmp:clear` clears all cache, sockets and screenshot files.
 * `rails tmp:create` creates tmp directories for cache, sockets and pids.
 
 ### Miscellaneous
-- 
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

---
 guides/Rakefile                                                | 1 +
 guides/bug_report_templates/action_controller_gem.rb           | 1 +
 guides/bug_report_templates/action_controller_master.rb        | 1 +
 guides/bug_report_templates/active_job_gem.rb                  | 1 +
 guides/bug_report_templates/active_job_master.rb               | 1 +
 guides/bug_report_templates/active_record_gem.rb               | 1 +
 guides/bug_report_templates/active_record_master.rb            | 1 +
 guides/bug_report_templates/active_record_migrations_gem.rb    | 1 +
 guides/bug_report_templates/active_record_migrations_master.rb | 1 +
 guides/bug_report_templates/benchmark.rb                       | 1 +
 guides/bug_report_templates/generic_gem.rb                     | 1 +
 guides/bug_report_templates/generic_master.rb                  | 1 +
 guides/rails_guides.rb                                         | 1 +
 guides/rails_guides/generator.rb                               | 1 +
 guides/rails_guides/helpers.rb                                 | 1 +
 guides/rails_guides/indexer.rb                                 | 1 +
 guides/rails_guides/kindle.rb                                  | 1 +
 guides/rails_guides/levenshtein.rb                             | 1 +
 guides/rails_guides/markdown.rb                                | 1 +
 guides/rails_guides/markdown/renderer.rb                       | 1 +
 guides/w3c_validator.rb                                        | 1 +
 21 files changed, 21 insertions(+)

(limited to 'guides')

diff --git a/guides/Rakefile b/guides/Rakefile
index 3a6f10040f..653255a6b5 100644
--- a/guides/Rakefile
+++ b/guides/Rakefile
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 namespace :guides do
   desc 'Generate guides (for authors), use ONLY=foo to process just "foo.md"'
   task generate: "generate:html"
diff --git a/guides/bug_report_templates/action_controller_gem.rb b/guides/bug_report_templates/action_controller_gem.rb
index 8b7aa893fd..49fe6c61c2 100644
--- a/guides/bug_report_templates/action_controller_gem.rb
+++ b/guides/bug_report_templates/action_controller_gem.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/action_controller_master.rb b/guides/bug_report_templates/action_controller_master.rb
index 3dd66c95ec..1aca491f03 100644
--- a/guides/bug_report_templates/action_controller_master.rb
+++ b/guides/bug_report_templates/action_controller_master.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/active_job_gem.rb b/guides/bug_report_templates/active_job_gem.rb
index 252b270a0c..7184e47df7 100644
--- a/guides/bug_report_templates/active_job_gem.rb
+++ b/guides/bug_report_templates/active_job_gem.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/active_job_master.rb b/guides/bug_report_templates/active_job_master.rb
index 7591470440..75b15958dc 100644
--- a/guides/bug_report_templates/active_job_master.rb
+++ b/guides/bug_report_templates/active_job_master.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/active_record_gem.rb b/guides/bug_report_templates/active_record_gem.rb
index 61d4e8d395..e5d1ff24f6 100644
--- a/guides/bug_report_templates/active_record_gem.rb
+++ b/guides/bug_report_templates/active_record_gem.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/active_record_master.rb b/guides/bug_report_templates/active_record_master.rb
index 8bbc1ef19e..66f923e52a 100644
--- a/guides/bug_report_templates/active_record_master.rb
+++ b/guides/bug_report_templates/active_record_master.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/active_record_migrations_gem.rb b/guides/bug_report_templates/active_record_migrations_gem.rb
index 00ba3c1cd6..2d7b3ef05e 100644
--- a/guides/bug_report_templates/active_record_migrations_gem.rb
+++ b/guides/bug_report_templates/active_record_migrations_gem.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/active_record_migrations_master.rb b/guides/bug_report_templates/active_record_migrations_master.rb
index 52c9028b0f..363360828d 100644
--- a/guides/bug_report_templates/active_record_migrations_master.rb
+++ b/guides/bug_report_templates/active_record_migrations_master.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/benchmark.rb b/guides/bug_report_templates/benchmark.rb
index 54433b34dd..91466f56e0 100644
--- a/guides/bug_report_templates/benchmark.rb
+++ b/guides/bug_report_templates/benchmark.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/generic_gem.rb b/guides/bug_report_templates/generic_gem.rb
index 4dcd04ea27..d22af83e25 100644
--- a/guides/bug_report_templates/generic_gem.rb
+++ b/guides/bug_report_templates/generic_gem.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/generic_master.rb b/guides/bug_report_templates/generic_master.rb
index ed45726e92..168b639843 100644
--- a/guides/bug_report_templates/generic_master.rb
+++ b/guides/bug_report_templates/generic_master.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/rails_guides.rb b/guides/rails_guides.rb
index 0f611c8f2b..52e66d5324 100644
--- a/guides/rails_guides.rb
+++ b/guides/rails_guides.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 $:.unshift __dir__
 
 as_lib = File.expand_path("../activesupport/lib", __dir__)
diff --git a/guides/rails_guides/generator.rb b/guides/rails_guides/generator.rb
index 35f014747c..04ab89093a 100644
--- a/guides/rails_guides/generator.rb
+++ b/guides/rails_guides/generator.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "set"
 require "fileutils"
 
diff --git a/guides/rails_guides/helpers.rb b/guides/rails_guides/helpers.rb
index 520aa7f7cc..f68e1f597f 100644
--- a/guides/rails_guides/helpers.rb
+++ b/guides/rails_guides/helpers.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "yaml"
 
 module RailsGuides
diff --git a/guides/rails_guides/indexer.rb b/guides/rails_guides/indexer.rb
index c58b6b85a2..63dbfd5e2c 100644
--- a/guides/rails_guides/indexer.rb
+++ b/guides/rails_guides/indexer.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_support/core_ext/object/blank"
 require "active_support/core_ext/string/inflections"
 
diff --git a/guides/rails_guides/kindle.rb b/guides/rails_guides/kindle.rb
index 9536d0bd3b..87a369a15a 100644
--- a/guides/rails_guides/kindle.rb
+++ b/guides/rails_guides/kindle.rb
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "kindlerb"
 require "nokogiri"
diff --git a/guides/rails_guides/levenshtein.rb b/guides/rails_guides/levenshtein.rb
index 40c6a5c372..90bb40dfc2 100644
--- a/guides/rails_guides/levenshtein.rb
+++ b/guides/rails_guides/levenshtein.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module RailsGuides
   module Levenshtein
     # This code is based directly on the Text gem implementation.
diff --git a/guides/rails_guides/markdown.rb b/guides/rails_guides/markdown.rb
index 02d58601c4..cad66b5d6d 100644
--- a/guides/rails_guides/markdown.rb
+++ b/guides/rails_guides/markdown.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "redcarpet"
 require "nokogiri"
 require "rails_guides/markdown/renderer"
diff --git a/guides/rails_guides/markdown/renderer.rb b/guides/rails_guides/markdown/renderer.rb
index 7ac3d417a4..583a8d348f 100644
--- a/guides/rails_guides/markdown/renderer.rb
+++ b/guides/rails_guides/markdown/renderer.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module RailsGuides
   class Markdown
     class Renderer < Redcarpet::Render::HTML
diff --git a/guides/w3c_validator.rb b/guides/w3c_validator.rb
index 4671e040ca..a97599ad3b 100644
--- a/guides/w3c_validator.rb
+++ b/guides/w3c_validator.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # ---------------------------------------------------------------------------
 #
 # This script validates the generated guides against the W3C Validator.
-- 
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.
---
 guides/Rakefile                                                | 1 -
 guides/bug_report_templates/action_controller_gem.rb           | 1 -
 guides/bug_report_templates/action_controller_master.rb        | 1 -
 guides/bug_report_templates/active_job_gem.rb                  | 1 -
 guides/bug_report_templates/active_job_master.rb               | 1 -
 guides/bug_report_templates/active_record_gem.rb               | 1 -
 guides/bug_report_templates/active_record_master.rb            | 1 -
 guides/bug_report_templates/active_record_migrations_gem.rb    | 1 -
 guides/bug_report_templates/active_record_migrations_master.rb | 1 -
 guides/bug_report_templates/benchmark.rb                       | 1 -
 guides/bug_report_templates/generic_gem.rb                     | 1 -
 guides/bug_report_templates/generic_master.rb                  | 1 -
 guides/rails_guides.rb                                         | 1 -
 guides/rails_guides/generator.rb                               | 1 -
 guides/rails_guides/helpers.rb                                 | 1 -
 guides/rails_guides/indexer.rb                                 | 1 -
 guides/rails_guides/kindle.rb                                  | 1 -
 guides/rails_guides/levenshtein.rb                             | 1 -
 guides/rails_guides/markdown.rb                                | 1 -
 guides/rails_guides/markdown/renderer.rb                       | 1 -
 guides/w3c_validator.rb                                        | 1 -
 21 files changed, 21 deletions(-)

(limited to 'guides')

diff --git a/guides/Rakefile b/guides/Rakefile
index 653255a6b5..3a6f10040f 100644
--- a/guides/Rakefile
+++ b/guides/Rakefile
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 namespace :guides do
   desc 'Generate guides (for authors), use ONLY=foo to process just "foo.md"'
   task generate: "generate:html"
diff --git a/guides/bug_report_templates/action_controller_gem.rb b/guides/bug_report_templates/action_controller_gem.rb
index 49fe6c61c2..8b7aa893fd 100644
--- a/guides/bug_report_templates/action_controller_gem.rb
+++ b/guides/bug_report_templates/action_controller_gem.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/action_controller_master.rb b/guides/bug_report_templates/action_controller_master.rb
index 1aca491f03..3dd66c95ec 100644
--- a/guides/bug_report_templates/action_controller_master.rb
+++ b/guides/bug_report_templates/action_controller_master.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/active_job_gem.rb b/guides/bug_report_templates/active_job_gem.rb
index 7184e47df7..252b270a0c 100644
--- a/guides/bug_report_templates/active_job_gem.rb
+++ b/guides/bug_report_templates/active_job_gem.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/active_job_master.rb b/guides/bug_report_templates/active_job_master.rb
index 75b15958dc..7591470440 100644
--- a/guides/bug_report_templates/active_job_master.rb
+++ b/guides/bug_report_templates/active_job_master.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/active_record_gem.rb b/guides/bug_report_templates/active_record_gem.rb
index e5d1ff24f6..61d4e8d395 100644
--- a/guides/bug_report_templates/active_record_gem.rb
+++ b/guides/bug_report_templates/active_record_gem.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/active_record_master.rb b/guides/bug_report_templates/active_record_master.rb
index 66f923e52a..8bbc1ef19e 100644
--- a/guides/bug_report_templates/active_record_master.rb
+++ b/guides/bug_report_templates/active_record_master.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/active_record_migrations_gem.rb b/guides/bug_report_templates/active_record_migrations_gem.rb
index 2d7b3ef05e..00ba3c1cd6 100644
--- a/guides/bug_report_templates/active_record_migrations_gem.rb
+++ b/guides/bug_report_templates/active_record_migrations_gem.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/active_record_migrations_master.rb b/guides/bug_report_templates/active_record_migrations_master.rb
index 363360828d..52c9028b0f 100644
--- a/guides/bug_report_templates/active_record_migrations_master.rb
+++ b/guides/bug_report_templates/active_record_migrations_master.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/benchmark.rb b/guides/bug_report_templates/benchmark.rb
index 91466f56e0..54433b34dd 100644
--- a/guides/bug_report_templates/benchmark.rb
+++ b/guides/bug_report_templates/benchmark.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/generic_gem.rb b/guides/bug_report_templates/generic_gem.rb
index d22af83e25..4dcd04ea27 100644
--- a/guides/bug_report_templates/generic_gem.rb
+++ b/guides/bug_report_templates/generic_gem.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/bug_report_templates/generic_master.rb b/guides/bug_report_templates/generic_master.rb
index 168b639843..ed45726e92 100644
--- a/guides/bug_report_templates/generic_master.rb
+++ b/guides/bug_report_templates/generic_master.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 begin
   require "bundler/inline"
 rescue LoadError => e
diff --git a/guides/rails_guides.rb b/guides/rails_guides.rb
index 52e66d5324..0f611c8f2b 100644
--- a/guides/rails_guides.rb
+++ b/guides/rails_guides.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 $:.unshift __dir__
 
 as_lib = File.expand_path("../activesupport/lib", __dir__)
diff --git a/guides/rails_guides/generator.rb b/guides/rails_guides/generator.rb
index 04ab89093a..35f014747c 100644
--- a/guides/rails_guides/generator.rb
+++ b/guides/rails_guides/generator.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "set"
 require "fileutils"
 
diff --git a/guides/rails_guides/helpers.rb b/guides/rails_guides/helpers.rb
index f68e1f597f..520aa7f7cc 100644
--- a/guides/rails_guides/helpers.rb
+++ b/guides/rails_guides/helpers.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "yaml"
 
 module RailsGuides
diff --git a/guides/rails_guides/indexer.rb b/guides/rails_guides/indexer.rb
index 63dbfd5e2c..c58b6b85a2 100644
--- a/guides/rails_guides/indexer.rb
+++ b/guides/rails_guides/indexer.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "active_support/core_ext/object/blank"
 require "active_support/core_ext/string/inflections"
 
diff --git a/guides/rails_guides/kindle.rb b/guides/rails_guides/kindle.rb
index 87a369a15a..9536d0bd3b 100644
--- a/guides/rails_guides/kindle.rb
+++ b/guides/rails_guides/kindle.rb
@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# frozen_string_literal: true
 
 require "kindlerb"
 require "nokogiri"
diff --git a/guides/rails_guides/levenshtein.rb b/guides/rails_guides/levenshtein.rb
index 90bb40dfc2..40c6a5c372 100644
--- a/guides/rails_guides/levenshtein.rb
+++ b/guides/rails_guides/levenshtein.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module RailsGuides
   module Levenshtein
     # This code is based directly on the Text gem implementation.
diff --git a/guides/rails_guides/markdown.rb b/guides/rails_guides/markdown.rb
index cad66b5d6d..02d58601c4 100644
--- a/guides/rails_guides/markdown.rb
+++ b/guides/rails_guides/markdown.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "redcarpet"
 require "nokogiri"
 require "rails_guides/markdown/renderer"
diff --git a/guides/rails_guides/markdown/renderer.rb b/guides/rails_guides/markdown/renderer.rb
index 583a8d348f..7ac3d417a4 100644
--- a/guides/rails_guides/markdown/renderer.rb
+++ b/guides/rails_guides/markdown/renderer.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module RailsGuides
   class Markdown
     class Renderer < Redcarpet::Render::HTML
diff --git a/guides/w3c_validator.rb b/guides/w3c_validator.rb
index a97599ad3b..4671e040ca 100644
--- a/guides/w3c_validator.rb
+++ b/guides/w3c_validator.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 # ---------------------------------------------------------------------------
 #
 # This script validates the generated guides against the W3C Validator.
-- 
cgit v1.2.3