update from PR rails#36222

Author: aminamos

actioncable/app/javascript/action_cable/consumer.js

@@ -6,7 +6,7 @@ import Subscriptions from "./subscriptions"
 // The Consumer instance is also the gateway to establishing subscriptions to desired channels through the #createSubscription
 // method.
 //
-// The following example shows how this can be setup:
+// The following example shows how this can be set up:
 //
 //   App = {}
 //   App.cable = ActionCable.createConsumer("ws://example.com/accounts/1")

actioncable/lib/action_cable/channel/base.rb

@@ -194,7 +194,7 @@ def unsubscribe_from_channel # :nodoc:
       end
 
       private
-        # Called once a consumer has become a subscriber of the channel. Usually the place to setup any streams
+        # Called once a consumer has become a subscriber of the channel. Usually the place to set up any streams
         # you want this channel to be sending to the subscriber.
         def subscribed # :doc:
           # Override in subclasses

actioncable/lib/action_cable/channel/test_case.rb

@@ -209,7 +209,7 @@ def determine_default_channel(name)
           end
         end
 
-        # Setup test connection with the specified identifiers:
+        # Set up test connection with the specified identifiers:
         #
         #   class ApplicationCable < ActionCable::Connection::Base
         #     identified_by :user, :token

actioncable/lib/action_cable/connection/test_case.rb

@@ -101,7 +101,7 @@ def initialize(request)
     #     assert_equal "1", connection.user.id
     #   end
     #
-    # You can also setup the correct cookies before the connection request:
+    # You can also set up the correct cookies before the connection request:
     #
     #   def test_connect_with_cookies
     #     # Plain cookies:

actioncable/lib/action_cable/server/base.rb

@@ -27,7 +27,7 @@ def initialize(config: self.class.config)
         @remote_connections = @event_loop = @worker_pool = @pubsub = nil
       end
 
-      # Called by Rack to setup the server.
+      # Called by Rack to set up the server.
       def call(env)
         setup_heartbeat_timer
         config.connection_class.call.new(self, env).process

actioncable/test/connection/base_test.rb

@@ -76,7 +76,7 @@ def send_async(method, *args)
       connection = open_connection
       connection.process
 
-      # Setup the connection
+      # Set up the connection
       connection.send :handle_open
       assert connection.connected
 

actionmailbox/test/dummy/bin/setup

@@ -10,8 +10,8 @@ def system!(*args)
 end
 
 chdir APP_ROOT do
-  # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file.
+  # This script is a starting point to set up your application.
+  # Add necessary set up steps to this file.
 
   puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'

actionmailer/lib/action_mailer/base.rb

@@ -20,7 +20,7 @@ module ActionMailer
   #
   # The generated model inherits from <tt>ApplicationMailer</tt> which in turn
   # inherits from <tt>ActionMailer::Base</tt>. A mailer model defines methods
-  # used to generate an email message. In these methods, you can setup variables to be used in
+  # used to generate an email message. In these methods, you can set up variables to be used in
   # the mailer views, options on the mail itself such as the <tt>:from</tt> address, and attachments.
   #
   #   class ApplicationMailer < ActionMailer::Base
@@ -873,7 +873,7 @@ def mail(headers = {}, &block)
 
       create_parts_from_responses(message, responses)
 
-      # Setup content type, reapply charset and handle parts order
+      # Set up content type, reapply charset and handle parts order
       message.content_type = set_content_type(message, content_type, headers[:content_type])
       message.charset      = charset
 

actiontext/test/dummy/bin/setup

@@ -10,8 +10,8 @@ def system!(*args)
 end
 
 chdir APP_ROOT do
-  # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file.
+  # This script is a starting point to set up your application.
+  # Add necessary set up steps to this file.
 
   puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'

actionview/app/assets/javascripts/rails-ujs/utils/ajax.coffee

@@ -45,7 +45,7 @@ prepareOptions = (options) ->
 
 createXHR = (options, done) ->
   xhr = new XMLHttpRequest()
-  # Open and setup xhr
+  # Open and set up xhr
   xhr.open(options.type, options.url, true)
   xhr.setRequestHeader('Accept', options.accept)
   # Set Content-Type only when sending a string

actionview/lib/action_view/base.rb

@@ -27,7 +27,7 @@ module ActionView #:nodoc:
   #     Name: <%= person.name %><br/>
   #   <% end %>
   #
-  # The loop is setup in regular embedding tags <tt><% %></tt>, and the name is written using the output embedding tag <tt><%= %></tt>. Note that this
+  # The loop is set up in regular embedding tags <tt><% %></tt>, and the name is written using the output embedding tag <tt><%= %></tt>. Note that this
   # is not just a usage suggestion. Regular output functions like print or puts won't work with ERB templates. So this would be wrong:
   #
   #   <%# WRONG %>

actionview/lib/action_view/helpers/asset_url_helper.rb

@@ -52,7 +52,7 @@ module Helpers #:nodoc:
     # solution being slower. You should be sure to measure your actual
     # performance across targeted browsers both before and after this change.
     #
-    # To implement the corresponding hosts you can either setup four actual
+    # To implement the corresponding hosts you can either set up four actual
     # hosts or use wildcard DNS to CNAME the wildcard to a single asset host.
     # You can read more about setting up your DNS CNAME records from your ISP.
     #

actionview/lib/action_view/renderer/abstract_renderer.rb

@@ -14,7 +14,7 @@ module ActionView
   #
   # Whenever the +render+ method is called on the base +Renderer+ class, a new
   # renderer object of the correct type is created, and the +render+ method on
-  # that new object is called in turn. This abstracts the setup and rendering
+  # that new object is called in turn. This abstracts the set up and rendering
   # into a separate classes for partials and templates.
   class AbstractRenderer #:nodoc:
     delegate :template_exists?, :any_templates?, :formats, to: :@lookup_context

actionview/lib/action_view/renderer/partial_renderer.rb

@@ -370,7 +370,7 @@ def render_partial(view, template)
       #
       # If +options[:partial]+ is a string, then the <tt>@path</tt> instance variable is
       # set to that string. Otherwise, the +options[:partial]+ object must
-      # respond to +to_partial_path+ in order to setup the path.
+      # respond to +to_partial_path+ in order to set up the path.
       def setup(context, options, as, block)
         @options = options
         @block   = block

actionview/lib/action_view/rendering.rb

@@ -33,7 +33,7 @@ def initialize
       super
     end
 
-    # Overwrite process to setup I18n proxy.
+    # Overwrite process to set up I18n proxy.
     def process(*) #:nodoc:
       old_config, I18n.config = I18n.config, I18nProxy.new(I18n.config, lookup_context)
       super

actionview/test/ujs/public/test/data-remote.js

@@ -47,7 +47,7 @@ module('data-remote', {
 asyncTest('ctrl-clicking on a link does not fire ajaxyness', 0, function() {
   var link = $('a[data-remote]')
 
-  // Ideally, we'd setup an iframe to intercept normal link clicks
+  // Ideally, we'd set up an iframe to intercept normal link clicks
   // and add a test to make sure the iframe:loaded event is triggered.
   // However, jquery doesn't actually cause a native `click` event and
   // follow links using `trigger('click')`, it only fires bindings.
@@ -66,7 +66,7 @@ asyncTest('ctrl-clicking on a link does not fire ajaxyness', 0, function() {
 asyncTest('right/mouse-wheel-clicking on a link does not fire ajaxyness', 0, function() {
   var link = $('a[data-remote]')
 
-  // Ideally, we'd setup an iframe to intercept normal link clicks
+  // Ideally, we'd set up an iframe to intercept normal link clicks
   // and add a test to make sure the iframe:loaded event is triggered.
   // However, jquery doesn't actually cause a native `click` event and
   // follow links using `trigger('click')`, it only fires bindings.
@@ -184,7 +184,7 @@ asyncTest('clicking on a button with data-remote attribute', 5, function() {
 asyncTest('right/mouse-wheel-clicking on a button with data-remote attribute does not fire ajaxyness', 0, function() {
   var button = $('button[data-remote]')
 
-  // Ideally, we'd setup an iframe to intercept normal link clicks
+  // Ideally, we'd set up an iframe to intercept normal link clicks
   // and add a test to make sure the iframe:loaded event is triggered.
   // However, jquery doesn't actually cause a native `click` event and
   // follow links using `trigger('click')`, it only fires bindings.

activemodel/lib/active_model/validator.rb

@@ -85,7 +85,7 @@ module ActiveModel
   #
   # It can be useful to access the class that is using that validator when there are prerequisites such
   # as an +attr_accessor+ being present. This class is accessible via <tt>options[:class]</tt> in the constructor.
-  # To setup your validator override the constructor.
+  # To set up your validator override the constructor.
   #
   #   class MyValidator < ActiveModel::Validator
   #     def initialize(options={})

activerecord/examples/performance.rb

@@ -70,7 +70,7 @@ def self.email
 
 # pre-compute the insert statements and fake data compilation,
 # so the benchmarks below show the actual runtime for the execute
-# method, minus the setup steps
+# method, minus the set up steps
 
 # Using the same paragraph for all exhibits because it is very slow
 # to generate unique paragraphs for all exhibits.

activerecord/lib/active_record/fixtures.rb

@@ -192,7 +192,7 @@ class FixtureClassNotFound < ActiveRecord::ActiveRecordError #:nodoc:
   # When *not* to use transactional tests:
   #
   # 1. You're testing whether a transaction works correctly. Nested transactions don't commit until
-  #    all parent transactions commit, particularly, the fixtures transaction which is begun in setup
+  #    all parent transactions commit, particularly, the fixtures transaction which is begun in set up
   #    and rolled back in teardown. Thus, you won't be able to verify
   #    the results of your transaction until Active Record supports nested transactions or savepoints (in progress).
   # 2. Your database does not support transactions. Every Active Record database supports transactions except MySQL MyISAM.

guides/source/5_1_release_notes.md

@@ -89,7 +89,7 @@ screenshots.
 Rails now allows management of application secrets in a secure way,
 inspired by the [sekrets](https://github.com/ahoward/sekrets) gem.
 
-Run `bin/rails secrets:setup` to setup a new encrypted secrets file. This will
+Run `bin/rails secrets:setup` to set up a new encrypted secrets file. This will
 also generate a master key, which must be stored outside of the repository. The
 secrets themselves can then be safely checked into the revision control system,
 in an encrypted form.

guides/source/action_cable_overview.md

@@ -9,8 +9,8 @@ incorporate real-time features into your Rails application.
 After reading this guide, you will know:
 
 * What Action Cable is and its integration backend and frontend
-* How to setup Action Cable
-* How to setup channels
+* How to set up Action Cable
+* How to set up channels
 * Deployment and Architecture setup for running Action Cable
 
 --------------------------------------------------------------------------------
@@ -627,7 +627,7 @@ and unpacked for the data argument arriving as `received`.
 ### More Complete Examples
 
 See the [rails/actioncable-examples](https://github.com/rails/actioncable-examples)
-repository for a full example of how to setup Action Cable in a Rails app and adding channels.
+repository for a full example of how to set up Action Cable in a Rails app and adding channels.
 
 ## Configuration
 

guides/source/active_record_multiple_databases.md

@@ -7,7 +7,7 @@ This guide covers using multiple databases with your Rails application.
 
 After reading this guide you will know:
 
-* How to setup your application for multiple databases.
+* How to set up your application for multiple databases.
 * How automatic connection switching works.
 * What features are supported and what's still a work in progress.
 

guides/source/active_record_postgresql.md

@@ -19,7 +19,7 @@ installed. Older versions are not supported.
 
 To get started with PostgreSQL have a look at the
 [configuring Rails guide](configuring.html#configuring-a-postgresql-database).
-It describes how to properly setup Active Record for PostgreSQL.
+It describes how to properly set up Active Record for PostgreSQL.
 
 Datatypes
 ---------

guides/source/contributing_to_ruby_on_rails.md

@@ -187,7 +187,7 @@ Contributing to the Rails Code
 
 ### Setting Up a Development Environment
 
-To move on from submitting bugs to helping resolve existing issues or contributing your own code to Ruby on Rails, you _must_ be able to run its test suite. In this section of the guide, you'll learn how to setup the tests on your own computer.
+To move on from submitting bugs to helping resolve existing issues or contributing your own code to Ruby on Rails, you _must_ be able to run its test suite. In this section of the guide, you'll learn how to set up the tests on your own computer.
 
 #### The Easy Way
 
@@ -291,7 +291,7 @@ scenarios. Ideally, they should be based on real-world scenarios extracted
 from production applications.
 
 You can use the [benchmark template](https://github.com/rails/rails/blob/master/guides/bug_report_templates/benchmark.rb)
-as a starting point. It includes the boilerplate code to setup a benchmark
+as a starting point. It includes the boilerplate code to set up a benchmark
 using the [benchmark-ips](https://github.com/evanphx/benchmark-ips) gem. The
 template is designed for testing relatively self-contained changes that can be
 inlined into the script.

guides/source/development_dependencies_install.md

@@ -3,7 +3,7 @@
 Development Dependencies Install
 ================================
 
-This guide covers how to setup an environment for Ruby on Rails core development.
+This guide covers how to set up an environment for Ruby on Rails core development.
 
 After reading this guide, you will know:
 
@@ -168,7 +168,7 @@ mysql> GRANT ALL PRIVILEGES ON inexistent_activerecord_unittest.*
        to 'rails'@'localhost';
 ```
 
-PostgreSQL's authentication works differently. To setup the development environment
+PostgreSQL's authentication works differently. To set up the development environment
 with your development account, on Linux or BSD, you just have to run:
 
 ```bash
@@ -242,4 +242,4 @@ if you don't need to run Active Record tests.
 
 ### Contribute to Rails
 
-After you've setup everything, read how you can start [contributing](contributing_to_ruby_on_rails.html#running-an-application-against-your-local-branch).
+After you've set up everything, read how you can start [contributing](contributing_to_ruby_on_rails.html#running-an-application-against-your-local-branch).

guides/source/getting_started.md

@@ -168,7 +168,7 @@ of the files and folders that Rails created by default:
 | File/Folder | Purpose |
 | ----------- | ------- |
 |app/|Contains the controllers, models, views, helpers, mailers, channels, jobs, and assets for your application. You'll focus on this folder for the remainder of this guide.|
-|bin/|Contains the rails script that starts your app and can contain other scripts you use to setup, update, deploy, or run your application.|
+|bin/|Contains the rails script that starts your app and can contain other scripts you use to set up, update, deploy, or run your application.|
 |config/|Configure your application's routes, database, and more. This is covered in more detail in [Configuring Rails Applications](configuring.html).|
 |config.ru|Rack configuration for Rack based servers used to start the application. For more information about Rack, see the [Rack website](https://rack.github.io/).|
 |db/|Contains your current database schema, as well as the database migrations.|

guides/source/security.md

@@ -151,7 +151,7 @@ rotation.
 Once users with SHA1 digested signed cookies should no longer have a chance to
 have their cookies rewritten, remove the rotation.
 
-While you can setup as many rotations as you'd like it's not common to have many
+While you can set up as many rotations as you'd like it's not common to have many
 rotations going at any one time.
 
 For more details on key rotation with encrypted and signed messages as

railties/lib/rails/application.rb

@@ -46,7 +46,7 @@ module Rails
   # process. From the moment you require "config/application.rb" in your app,
   # the booting process goes like this:
   #
-  #   1)  require "config/boot.rb" to setup load paths
+  #   1)  require "config/boot.rb" to set up load paths
   #   2)  require railties and engines
   #   3)  Define Rails.application as "class MyApp::Application < Rails::Application"
   #   4)  Run config.before_configuration callbacks

railties/lib/rails/generators/rails/app/templates/bin/setup.tt

@@ -8,7 +8,7 @@ def system!(*args)
 end
 
 FileUtils.chdir APP_ROOT do
-  # This script is a way to setup or update your development environment automatically.
+  # This script is a way to set up or update your development environment automatically.
   # This script is idempotent, so that you can run it at anytime and get an expectable outcome.
   # Add necessary setup steps to this file.
 

railties/lib/rails/generators/test_case.rb

@@ -11,7 +11,7 @@ module Generators
     # Disable color in output. Easier to debug.
     no_color!
 
-    # This class provides a TestCase for testing generators. To setup, you need
+    # This class provides a TestCase for testing generators. To set up, you need
     # just to configure the destination and set which generator is being tested:
     #
     #   class AppGeneratorTest < Rails::Generators::TestCase

railties/test/generators/app_generator_test.rb

@@ -98,7 +98,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper
   arguments [destination_root]
 
-  # brings setup, teardown, and some tests
+  # brings set up, teardown, and some tests
   include SharedGeneratorTests
 
   def default_files

railties/test/generators/plugin_generator_test.rb

@@ -30,7 +30,7 @@ def application_path
     "#{destination_root}/test/dummy"
   end
 
-  # brings setup, teardown, and some tests
+  # brings set up, teardown, and some tests
   include SharedGeneratorTests
 
   def test_invalid_plugin_name_raises_an_error

railties/test/generators/shared_generator_tests.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Tests, setup, and teardown common to the application and plugin generator suites.
+# Tests, set up, and teardown common to the application and plugin generator suites.
 #
 module SharedGeneratorTests
   def setup