1 files changed, 27 insertions, 30 deletions
diff --git a/guides/source/engines.md b/guides/source/engines.md
index ac9dd38359..3031c62928 100644
--- a/guides/source/engines.md
+++ b/guides/source/engines.md
@@ -369,14 +369,11 @@ create      app/views/blorgh/articles/new.html.erb
 create      app/views/blorgh/articles/_form.html.erb
 invoke    test_unit
 create      test/controllers/blorgh/articles_controller_test.rb
+create      test/system/blorgh/articles_test.rb
 invoke    helper
 create      app/helpers/blorgh/articles_helper.rb
-invoke  test_unit
-create    test/application_system_test_case.rb
-create    test/system/articles_test.rb
+invoke      test_unit
 invoke  assets
-invoke    js
-create      app/assets/javascripts/blorgh/articles.js
 invoke    css
 create      app/assets/stylesheets/blorgh/articles.css
 invoke  css
@@ -416,9 +413,8 @@ be isolated from those routes that are within the application. The
 Next, the `scaffold_controller` generator is invoked, generating a controller
 called `Blorgh::ArticlesController` (at
 `app/controllers/blorgh/articles_controller.rb`) and its related views at
-`app/views/blorgh/articles`. This generator also generates a test for the
-controller (`test/controllers/blorgh/articles_controller_test.rb`) and a helper
-(`app/helpers/blorgh/articles_helper.rb`).
+`app/views/blorgh/articles`. This generator also generates tests for the
+controller (`test/controllers/blorgh/articles_controller_test.rb` and `test/system/blorgh/articles_test.rb`) and a helper (`app/helpers/blorgh/articles_helper.rb`).
 
 Everything this generator has created is neatly namespaced. The controller's
 class is defined within the `Blorgh` module:
@@ -447,10 +443,7 @@ end
 This helps prevent conflicts with any other engine or application that may have
 an article resource as well.
 
-Finally, the assets for this resource are generated in two files:
-`app/assets/javascripts/blorgh/articles.js` and
-`app/assets/stylesheets/blorgh/articles.css`. You'll see how to use these a little
-later.
+Finally, the assets for this resource are generated in one file: `app/assets/stylesheets/blorgh/articles.css`. You'll see how to use these a little later.
 
 You can see what the engine has so far by running `rails db:migrate` at the root
 of our engine to run the migration generated by the scaffold generator, and then
@@ -601,9 +594,8 @@ invoke  test_unit
 create    test/controllers/blorgh/comments_controller_test.rb
 invoke  helper
 create    app/helpers/blorgh/comments_helper.rb
+invoke    test_unit
 invoke  assets
-invoke    js
-create      app/assets/javascripts/blorgh/comments.js
 invoke    css
 create      app/assets/stylesheets/blorgh/comments.css
 ```
@@ -1159,10 +1151,11 @@ end
 ```
 
 ```ruby
-# Blorgh/app/models/article.rb
-
-class Article < ApplicationRecord
-  has_many :comments
+# Blorgh/app/models/blorgh/article.rb
+module Blorgh
+  class Article < ApplicationRecord
+    has_many :comments
+  end
 end
 ```
 
@@ -1180,12 +1173,13 @@ end
 ```
 
 ```ruby
-# Blorgh/app/models/article.rb
-
-class Article < ApplicationRecord
-  has_many :comments
-  def summary
-    "#{title}"
+# Blorgh/app/models/blorgh/article.rb
+module Blorgh
+  class Article < ApplicationRecord
+    has_many :comments
+    def summary
+      "#{title}"
+    end
   end
 end
 ```
@@ -1217,10 +1211,11 @@ end
 ```
 
 ```ruby
-# Blorgh/app/models/article.rb
-
-class Article < ApplicationRecord
-  include Blorgh::Concerns::Models::Article
+# Blorgh/app/models/blorgh/article.rb
+module Blorgh
+  class Article < ApplicationRecord
+    include Blorgh::Concerns::Models::Article
+  end
 end
 ```
 
@@ -1423,7 +1418,7 @@ s.add_development_dependency "moo"
 
 Both kinds of dependencies will be installed when `bundle install` is run inside
 of the application. The development dependencies for the gem will only be used
-when the tests for the engine are running.
+when the development and tests for the engine are running.
 
 Note that if you want to immediately require dependencies when the engine is
 required, you should require them before the engine's initialization. For
@@ -1558,4 +1553,6 @@ These are the available configuration hooks. They do not hook into any particula
 
 ### Example
 
-`config.before_configuration { puts 'I am called before any initializers' }`
+```ruby
+config.before_configuration { puts 'I am called before any initializers' }
+```