Merge pull request rails#55329 from rails/fxn/american-english

British English -> American English

Author: fxn

actionpack/test/controller/routing_test.rb

@@ -495,7 +495,7 @@ def test_named_route_with_nested_controller
     assert_equal("http://test.host/admin/user", setup_for_named_route.users_url)
   end
 
-  def test_optimised_named_route_with_host
+  def test_optimized_named_route_with_host
     rs.draw do
       get "page" => "content#show_page", :as => "pages", :host => "foo.com"
     end

actionpack/test/dispatch/routing_test.rb

@@ -5063,7 +5063,7 @@ def app
     APP
   end
 
-  def test_paths_with_partial_dynamic_segments_are_recognised
+  def test_paths_with_partial_dynamic_segments_are_recognized
     get "/david-bowie/changes-song"
     assert_equal 200, response.status
     assert_params artist: "david-bowie", song: "changes"
@@ -5204,7 +5204,7 @@ def app
     APP
   end
 
-  def test_paths_with_partial_dynamic_segments_are_recognised
+  def test_paths_with_partial_dynamic_segments_are_recognized
     get "/test_internal/123"
     assert_equal 200, response.status
 

activejob/test/support/do_not_perform_enqueued_jobs.rb

@@ -6,7 +6,7 @@ module DoNotPerformEnqueuedJobs
   included do
     setup do
       # /rails/activejob/test/adapters/test.rb sets these configs to true, but
-      # in this specific case we want to test enqueueing behaviour.
+      # in this specific case we want to test enqueueing behavior.
       @perform_enqueued_jobs = queue_adapter.perform_enqueued_jobs
       @perform_enqueued_at_jobs = queue_adapter.perform_enqueued_at_jobs
       queue_adapter.perform_enqueued_jobs = queue_adapter.perform_enqueued_at_jobs = false

activerecord/CHANGELOG.md

@@ -416,7 +416,7 @@
     `WITH RECURSIVE` or `DISTINCT` statements. Those were never supported and were ignored
     when generating the SQL query.
 
-    An error will be raised in a future Rails release. This behaviour will be consistent
+    An error will be raised in a future Rails release. This behavior will be consistent
     with `delete_all` which currently raises an error for unsupported statements.
 
     *Edouard Chin*

activerecord/lib/active_record/inheritance.rb

@@ -97,7 +97,7 @@ def finder_needs_type_condition? # :nodoc:
       # Returns the first class in the inheritance hierarchy that descends from either an
       # abstract class or from <tt>ActiveRecord::Base</tt>.
       #
-      # Consider the following behaviour:
+      # Consider the following behavior:
       #
       #   class ApplicationRecord < ActiveRecord::Base
       #     self.abstract_class = true

activerecord/test/cases/autosave_association_test.rb

@@ -1802,7 +1802,7 @@ def test_mark_for_destruction_is_ignored_without_autosave_true
     assert_not_predicate ship, :valid?
   end
 
-  def test_recognises_inverse_polymorphic_association_changes_with_same_foreign_key
+  def test_recognizes_inverse_polymorphic_association_changes_with_same_foreign_key
     chef_a = chefs(:gordon_ramsay)
     chef_b = chefs(:marco_pierre_white)
 

activerecord/test/cases/relations_test.rb

@@ -1366,13 +1366,13 @@ def test_create_with_array
   def test_create_with_block
     sparrow = Bird.create do |bird|
       bird.name = "sparrow"
-      bird.color = "grey"
+      bird.color = "gray"
     end
 
     assert_kind_of Bird, sparrow
     assert_predicate sparrow, :persisted?
     assert_equal "sparrow", sparrow.name
-    assert_equal "grey", sparrow.color
+    assert_equal "gray", sparrow.color
   end
 
   def test_create_bang_with_array

activesupport/lib/active_support/core_ext/date_and_time/compatibility.rb

@@ -17,7 +17,7 @@ module Compatibility
     singleton_class.silence_redefinition_of_method :preserve_timezone
 
     #--
-    # This re-implements the behaviour of the mattr_reader, instead
+    # This re-implements the behavior of the mattr_reader, instead
     # of prepending on to it, to avoid overcomplicating a module that
     # is in turn included in several places. This will all go away in
     # Rails 8.0 anyway.

guides/source/active_job_basics.md

@@ -427,9 +427,9 @@ enables a powerful yet sharp tool: taking advantage of transactional integrity
 to ensure some action in your app is not committed unless your job is also committed
 and vice versa, and ensuring that your job won't be enqueued until the transaction
 within which you're enqueuing it is committed. This can be very powerful and useful,
-but it can also backfire if you base some of your logic on this behaviour,
+but it can also backfire if you base some of your logic on this behavior,
 and in the future, you move to another active job backend, or if you simply move
-Solid Queue to its own database, and suddenly the behaviour changes under you.
+Solid Queue to its own database, and suddenly the behavior changes under you.
 
 Because this can be quite tricky and many people shouldn't need to worry about it,
 by default Solid Queue is configured in a different database as the main app.

guides/source/active_record_composite_primary_keys.md

@@ -268,7 +268,7 @@ class BooksController < ApplicationController
     id = params.extract_value(:id)
     # Find the book using the composite ID.
     @book = Book.find(id)
-    # use the default rendering behaviour to render the show view.
+    # use the default rendering behavior to render the show view.
   end
 end
 ```