From 62f91ab2d9c1692738ae18caad3528ae1a9c40ee Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Wed, 21 Sep 2022 23:33:44 -0500
Subject: [PATCH 01/20] Create test.yml

---
 .github/workflows/test.yml | 68 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 00000000..ac760cb8
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,68 @@
+# This workflow uses actions that are not certified by GitHub.  They are
+# provided by a third-party and are governed by separate terms of service,
+# privacy policy, and support documentation.
+#
+# This workflow will install a prebuilt Ruby version, install dependencies, and
+# run tests and linters.
+name: "Ruby on Rails CI"
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    services:
+      postgres:
+        image: postgres:11-alpine
+        ports:
+          - "5432:5432"
+        env:
+          POSTGRES_DB: rails_test
+          POSTGRES_USER: rails
+          POSTGRES_PASSWORD: password
+    env:
+      RAILS_ENV: test
+      NODE_ENV: test
+      DATABASE_URL: "postgres://rails:password@localhost:5432/rails_test"
+      DRIVER: selenium_chrome
+      CHROME_BIN: /usr/bin/google-chrome
+      USE_COVERALLS: true
+    steps:
+      - name: Install Chrome
+        uses: browser-actions/setup-chrome@latest
+      - name: Check Chrome version
+        run: chrome --version
+      - name: Check Chrome version
+        run: google-chrome --version
+      - name: Set Display environment variable
+        run: "export DISPLAY=:99"
+      - name: Checkout code
+        uses: actions/checkout@v3
+      # Add or replace dependency steps here
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@0a29871fe2b0200a17a4497bae54fe5df0d973aa # v1.115.3
+        with:
+          ruby: 3.x
+          bundler-cache: true
+      # Add or replace database setup steps here
+      - name: Set up database schema
+        run: bin/rails db:schema:load
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+      - name: Build
+        run: |
+          npm install
+          npx webpack
+      # Add or replace test runners here
+      - name: Run tests with xvfb
+        uses: GabrielBB/xvfb-action@v1
+        with:
+          run: bundle exec rake react_on_rails:locale
+          working-directory: ./ #optional
+          options: ":99 -ac -screen scn 1600x1200x16"

From 9ea4512c8c6ad1160b743f9e49b0d4b1477826ee Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Thu, 22 Sep 2022 14:02:08 -0500
Subject: [PATCH 02/20] remove mini_racer

---
 Gemfile      | 4 ----
 Gemfile.lock | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 46c66a66..848f44d8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,10 +41,6 @@ gem "sdoc", group: :doc
 # Use Rails Html Sanitizer for HTML sanitization
 gem "rails-html-sanitizer"
 
-# See https://github.com/sstephenson/execjs#readme for more supported runtimes
-# mini_racer is probably faster than therubyracer
-gem "mini_racer", platforms: :ruby
-
 gem "autoprefixer-rails"
 
 gem "awesome_print"
diff --git a/Gemfile.lock b/Gemfile.lock
index 602b157a..1a40854b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -140,7 +140,6 @@ GEM
     json (2.6.1)
     launchy (2.5.0)
       addressable (~> 2.7)
-    libv8-node (16.10.0.0)
     listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -154,8 +153,6 @@ GEM
     method_source (1.0.0)
     mini_mime (1.1.2)
     mini_portile2 (2.6.1)
-    mini_racer (0.6.0)
-      libv8-node (~> 16.10.0.0)
     minitest (5.15.0)
     nio4r (2.5.8)
     nokogiri (1.12.5)
@@ -380,7 +377,6 @@ DEPENDENCIES
   jbuilder
   launchy
   listen
-  mini_racer
   pg
   pry
   pry-byebug

From e39120762ddd5b9e3e96cb0aafd0e8a0dc68fd3d Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Thu, 22 Sep 2022 23:00:31 -0500
Subject: [PATCH 03/20] misc changes

---
 .github/workflows/test.yml | 4 ++--
 .nvmrc                     | 2 +-
 package.json               | 4 ++--
 yarn.lock                  | 9 ---------
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ac760cb8..966f78b1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -57,8 +57,8 @@ jobs:
           node-version: 16.x
       - name: Build
         run: |
-          npm install
-          npx webpack
+          npm install --legacy-peer-deps
+          bundle exec bin/webpacker
       # Add or replace test runners here
       - name: Run tests with xvfb
         uses: GabrielBB/xvfb-action@v1
diff --git a/.nvmrc b/.nvmrc
index 48082f72..b6a7d89c 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-12
+16
diff --git a/package.json b/package.json
index e50ee31b..473bc9f6 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
   "version": "1.1.0",
   "description": "Code from the React Webpack tutorial.",
   "engines": {
-    "node": "16.13.2",
-    "yarn": "1.22.17"
+    "node": "16",
+    "yarn": "1.22"
   },
   "repository": {
     "type": "git",
diff --git a/yarn.lock b/yarn.lock
index fd2ad060..1204b75c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -86,15 +86,6 @@
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
-"@babel/generator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.7.tgz#b42bf46a3079fa65e1544135f32e7958f048adbb"
-  integrity sha512-/ST3Sg8MLGY5HVYmrjOgL60ENux/HfO/CsUh7y4MalThufhE/Ff/6EibFDHi4jiDCaWfJKoqbE6oTh21c5hrRg==
-  dependencies:
-    "@babel/types" "^7.16.7"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
 "@babel/generator@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz#359d44d966b8cd059d543250ce79596f792f2ebe"

From b6c543f1d3724b739fdb8d98e3645d7364bfbe44 Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Wed, 28 Sep 2022 21:56:58 -0500
Subject: [PATCH 04/20] refine actions config

---
 .github/workflows/test.yml | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 966f78b1..d08df6c4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -34,35 +34,44 @@ jobs:
     steps:
       - name: Install Chrome
         uses: browser-actions/setup-chrome@latest
+
       - name: Check Chrome version
         run: chrome --version
+
       - name: Check Chrome version
         run: google-chrome --version
+
       - name: Set Display environment variable
         run: "export DISPLAY=:99"
+
       - name: Checkout code
         uses: actions/checkout@v3
-      # Add or replace dependency steps here
+
       - name: Install Ruby and gems
         uses: ruby/setup-ruby@0a29871fe2b0200a17a4497bae54fe5df0d973aa # v1.115.3
         with:
           ruby: 3.x
           bundler-cache: true
-      # Add or replace database setup steps here
-      - name: Set up database schema
-        run: bin/rails db:schema:load
+
       - name: Use Node.js 16.x
         uses: actions/setup-node@v3
         with:
           node-version: 16.x
-      - name: Build
-        run: |
-          npm install --legacy-peer-deps
-          bundle exec bin/webpacker
-      # Add or replace test runners here
+      - name: Install Node Packages
+        run: npm install --legacy-peer-deps
+
+      - name: Set up database schema
+        run: bin/rails db:schema:load
+
+      - name: Build i18n libraries
+        run: bundle exec rake react_on_rails:locale
+
+      - name: Build webpacker chunks
+        run: NODE_ENV=development bundle exec bin/webpacker
+
       - name: Run tests with xvfb
         uses: GabrielBB/xvfb-action@v1
         with:
-          run: bundle exec rake react_on_rails:locale
+          run: bundle exec rake
           working-directory: ./ #optional
           options: ":99 -ac -screen scn 1600x1200x16"

From f67f9a1faf9b77ae578690300e5bfb0044241cd1 Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Wed, 28 Sep 2022 22:06:12 -0500
Subject: [PATCH 05/20] update bootstrap-loader

---
 package.json |  5 ++---
 yarn.lock    | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 473bc9f6..90081b82 100644
--- a/package.json
+++ b/package.json
@@ -35,10 +35,10 @@
     "@rails/actioncable": "6.1.4-4",
     "autoprefixer": "^7.1.5",
     "axios": "^0.17.1",
-    "babel-loader": "8",
+    "babel-loader": "^8.2.3",
     "babel-plugin-macros": "^3.1.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-    "bootstrap-loader": "judahmeek/bootstrap-loader#judahmeek/webpack-5",
+    "bootstrap-loader": "4.0.0",
     "bootstrap-sass": "^3.3.7",
     "classnames": "^2.2.5",
     "compression-webpack-plugin": "9",
@@ -91,7 +91,6 @@
     "@webpack-cli/serve": "^1.6.0",
     "babel-eslint": "^8.0.2",
     "babel-jest": "^23.4.2",
-    "babel-loader": "^8.2.3",
     "body-parser": "^1.18.2",
     "eslint": "^8.6.0",
     "eslint-config-prettier": "^8.3.0",
diff --git a/yarn.lock b/yarn.lock
index 1204b75c..e3411840 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2238,13 +2238,13 @@ babel-jest@^23.4.2, babel-jest@^23.6.0:
     babel-plugin-istanbul "^4.1.6"
     babel-preset-jest "^23.2.0"
 
-babel-loader@8:
-  version "8.2.3"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d"
-  integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==
+babel-loader@^8.2.3:
+  version "8.2.5"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz#d45f585e654d5a5d90f5350a779d7647c5ed512e"
+  integrity sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==
   dependencies:
     find-cache-dir "^3.3.1"
-    loader-utils "^1.4.0"
+    loader-utils "^2.0.0"
     make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
@@ -2495,9 +2495,10 @@ boolify@^1.0.0:
   resolved "https://registry.yarnpkg.com/boolify/-/boolify-1.0.1.tgz#b5c09e17cacd113d11b7bb3ed384cc012994d86b"
   integrity sha1-tcCeF8rNET0Rt7s+04TMASmU2Gs=
 
-bootstrap-loader@judahmeek/bootstrap-loader#judahmeek/webpack-5:
-  version "3.0.4"
-  resolved "https://codeload.github.com/judahmeek/bootstrap-loader/tar.gz/f9addb04f657b0a5ff2bed701ab66ac28f9a9a62"
+bootstrap-loader@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/bootstrap-loader/-/bootstrap-loader-4.0.0.tgz#ca8f9534f35ecb15a824ca60a6abc9cd5b70150d"
+  integrity sha512-LzeZySPqDcfRmNZcddwfLc83D1Szv0EI0U3z2oiupoBCmCKXPJ4sMqhMZwSV6IRLuX6eZjG38uuiWgCLlFZPXg==
   dependencies:
     chalk "2.4.2"
     escape-regexp "0.0.1"
@@ -6478,7 +6479,7 @@ loader-utils@1.2.3:
     emojis-list "^2.0.0"
     json5 "^1.0.1"
 
-loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.4.0:
+loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
   integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==

From 738797f6a6ad11c0cf4ddf56321477a7822c6d06 Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Wed, 28 Sep 2022 22:16:52 -0500
Subject: [PATCH 06/20] background => before

---
 spec/system/pages_spec.rb      |  2 +-
 spec/system/shared/contexts.rb | 39 +++++++++++++---------------------
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/spec/system/pages_spec.rb b/spec/system/pages_spec.rb
index f95db2c8..c419de45 100644
--- a/spec/system/pages_spec.rb
+++ b/spec/system/pages_spec.rb
@@ -3,7 +3,7 @@
 require "rails_helper"
 
 shared_examples "Git Commit SHA" do
-  background { visit root_path }
+  before { visit root_path }
   it "displays the current git commit" do
     el = find("#git-commit-sha")
     expect(el.text).to eq expected_text
diff --git a/spec/system/shared/contexts.rb b/spec/system/shared/contexts.rb
index 1faa9bdc..b99c0f90 100644
--- a/spec/system/shared/contexts.rb
+++ b/spec/system/shared/contexts.rb
@@ -4,40 +4,33 @@
 
 # Pages
 shared_context "when React Router Demo", page: :main do
-  background { visit root_path }
+  before { visit root_path }
 end
 shared_context "when React Demo", page: :react_demo do
-  background { visit no_router_path }
+  before { visit no_router_path }
 end
 shared_context "when Simple Page", page: :simple do
-  background { visit simple_path }
+  before { visit simple_path }
 end
 shared_context "when Classic Page", page: :classic do
-  background { visit comments_path }
+  before { visit comments_path }
 end
 
 # Forms
 shared_context "when Horizontal Form", form: :horizontal do
-  background do
-    # added an extra click on this the non-default link to try to tease out a poltergeist crash
-    click_link "Inline Form"
-    expect(page).to have_css("form.commentForm.form-inline")
+  click_link "Inline Form"
+  expect(page).to have_css("form.commentForm.form-inline")
 
-    click_link "Horizontal Form"
-    expect(page).to have_css("form.commentForm.form-horizontal")
-  end
+  click_link "Horizontal Form"
+  expect(page).to have_css("form.commentForm.form-horizontal")
 end
 shared_context "when Inline Form", form: :inline do
-  background do
-    click_link "Inline Form"
-    expect(page).to have_css("form.commentForm.form-inline")
-  end
+  click_link "Inline Form"
+  expect(page).to have_css("form.commentForm.form-inline")
 end
 shared_context "when Stacked Form", form: :stacked do
-  background do
-    click_link "Stacked Form"
-    expect(page).to have_css("form.commentForm.form-stacked")
-  end
+  click_link "Stacked Form"
+  expect(page).to have_css("form.commentForm.form-stacked")
 end
 
 # Form Submission
@@ -47,11 +40,9 @@
   let(:name) { name }
   let(:text) { text }
 
-  background do
-    fill_in hint_name, with: name
-    fill_in hint_text, with: text
-    click_button "Post"
-  end
+  fill_in hint_name, with: name
+  fill_in hint_text, with: text
+  click_button "Post"
 end
 
 shared_context "when Form Submitted with Blank Fields", blank_form_submitted: true do

From 0cdc376e6e0544fbb6fa9e23c7fdee191f4df57d Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Wed, 28 Sep 2022 22:23:12 -0500
Subject: [PATCH 07/20] coveralls => coveralls_reborn

---
 Gemfile      |  2 +-
 Gemfile.lock | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index 848f44d8..bef86920 100644
--- a/Gemfile
+++ b/Gemfile
@@ -93,7 +93,7 @@ end
 group :test do
   gem "capybara"
   gem "capybara-screenshot"
-  gem "coveralls", require: false
+  gem 'coveralls_reborn', '~> 0.25.0', require: false
   gem "database_cleaner"
   gem "generator_spec"
   gem "launchy"
diff --git a/Gemfile.lock b/Gemfile.lock
index 1a40854b..beb38aab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -100,12 +100,11 @@ GEM
     coffee-script-source (1.12.2)
     concurrent-ruby (1.1.9)
     connection_pool (2.2.5)
-    coveralls (0.8.23)
-      json (>= 1.8, < 3)
-      simplecov (~> 0.16.1)
-      term-ansicolor (~> 1.3)
-      thor (>= 0.19.4, < 2.0)
-      tins (~> 1.6)
+    coveralls_reborn (0.25.0)
+      simplecov (>= 0.18.1, < 0.22.0)
+      term-ansicolor (~> 1.6)
+      thor (>= 0.20.3, < 2.0)
+      tins (~> 1.16)
     crass (1.0.6)
     database_cleaner (2.0.1)
       database_cleaner-active_record (~> 2.0.0)
@@ -307,11 +306,12 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    simplecov (0.16.1)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
     spring (4.0.0)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
@@ -327,7 +327,7 @@ GEM
       tins (~> 1.0)
     thor (1.2.1)
     tilt (2.0.10)
-    tins (1.30.0)
+    tins (1.31.1)
       sync
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
@@ -369,7 +369,7 @@ DEPENDENCIES
   capybara
   capybara-screenshot
   coffee-rails
-  coveralls
+  coveralls_reborn (~> 0.25.0)
   database_cleaner
   factory_bot_rails
   foreman

From 5d01dc854a8fbf56cde2f92259cf74e964412f90 Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Wed, 28 Sep 2022 23:03:02 -0500
Subject: [PATCH 08/20] fix specs

---
 spec/system/add_new_comment_spec.rb | 2 +-
 spec/system/edit_comment_spec.rb    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/system/add_new_comment_spec.rb b/spec/system/add_new_comment_spec.rb
index 343ab192..81a3cd41 100644
--- a/spec/system/add_new_comment_spec.rb
+++ b/spec/system/add_new_comment_spec.rb
@@ -57,7 +57,7 @@
   end
 
   context "when from classic page", page: :classic do
-    before { click_link "New Comment" }
+    click_link "New Comment"
 
     include_examples "New Comment Submission", false
   end
diff --git a/spec/system/edit_comment_spec.rb b/spec/system/edit_comment_spec.rb
index 0d0949bc..513314d9 100644
--- a/spec/system/edit_comment_spec.rb
+++ b/spec/system/edit_comment_spec.rb
@@ -13,7 +13,7 @@
     context "when edit is submitted" do
       let(:edited_name) { "Abraham Lincoln" }
 
-      include_context "Form Submitted", name: :edited_name
+      include_context "when Form Submitted", name: :edited_name
 
       it "comment is updated" do
         expect(page).to have_css(".comment", text: :edited_name)

From 89508d24aef2e3f30929e56ca35f49775cd86c71 Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Wed, 28 Sep 2022 23:27:32 -0500
Subject: [PATCH 09/20] fix specs?

---
 spec/system/edit_comment_spec.rb | 23 +++++++++--------------
 spec/system/shared/contexts.rb   |  9 ++-------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/spec/system/edit_comment_spec.rb b/spec/system/edit_comment_spec.rb
index 513314d9..84c36f61 100644
--- a/spec/system/edit_comment_spec.rb
+++ b/spec/system/edit_comment_spec.rb
@@ -8,25 +8,20 @@
   let(:comment) { Comment.first }
 
   context "when from classic page", page: :classic do
-    before { click_link "Edit", match: :first }
-
-    context "when edit is submitted" do
+    it "comment is updated when edit is submitted" do
+      click_link "Edit", match: :first
       let(:edited_name) { "Abraham Lincoln" }
 
       include_context "when Form Submitted", name: :edited_name
-
-      it "comment is updated" do
-        expect(page).to have_css(".comment", text: :edited_name)
-        expect(page).to have_css("#notice", text: "Comment was successfully updated.")
-      end
+      expect(page).to have_css(".comment", text: :edited_name)
+      expect(page).to have_css("#notice", text: "Comment was successfully updated.")
     end
 
-    context "when edit is submitted with blank fields", blank_form_submitted: true do
-      it "comment is not updated" do
-        expect(page).not_to have_success_message
-        expect(page).to have_failure_message
-        expect(page).not_to have_css(".comment", text: "")
-      end
+    it "comment is not updated when edit is submitted with blank fields", blank_form_submitted: true do
+      click_link "Edit", match: :first
+      expect(page).not_to have_success_message
+      expect(page).to have_failure_message
+      expect(page).not_to have_css(".comment", text: "")
     end
   end
 end
diff --git a/spec/system/shared/contexts.rb b/spec/system/shared/contexts.rb
index b99c0f90..cfc1a72f 100644
--- a/spec/system/shared/contexts.rb
+++ b/spec/system/shared/contexts.rb
@@ -35,13 +35,8 @@
 
 # Form Submission
 shared_context "when Form Submitted", form_submitted: true do |name: "Spicoli", text: "dude!"|
-  let(:hint_name) { "Your Name" }
-  let(:hint_text) { "Say something using markdown..." }
-  let(:name) { name }
-  let(:text) { text }
-
-  fill_in hint_name, with: name
-  fill_in hint_text, with: text
+  fill_in "Your Name", with: name
+  fill_in "Say something using markdown...", with: text
   click_button "Post"
 end
 

From ac02a9cbc46f67ed5631244832eeed5e5c05fa4e Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Wed, 28 Sep 2022 23:48:30 -0500
Subject: [PATCH 10/20] fix specs?!

---
 spec/system/add_new_comment_spec.rb | 27 ++++++++++++++++++---------
 spec/system/shared/contexts.rb      | 28 ----------------------------
 spec/system/shared/examples.rb      | 28 ++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/spec/system/add_new_comment_spec.rb b/spec/system/add_new_comment_spec.rb
index 81a3cd41..375384d7 100644
--- a/spec/system/add_new_comment_spec.rb
+++ b/spec/system/add_new_comment_spec.rb
@@ -6,51 +6,60 @@
 
 describe "Add new comment" do
   context "when React Router", page: :main, js: true, type: :system do
-    context "with Horizontal Form", form: :horizontal do
+    context "with Horizontal Form" do
+      include_examples "with Horizontal Form"
       include_examples "New Comment Submission", true
       include_examples "Validation errors displaying"
     end
 
-    context "with Inline Form", form: :inline do
+    context "with Inline Form" do
+      include_examples "with Inline Form"
       include_examples "New Comment Submission", true
       include_examples "Validation errors displaying"
     end
 
-    context "with Stacked Form", form: :stacked do
+    context "with Stacked Form" do
+      include_examples "with Stacked Form"
       include_examples "New Comment Submission", true
       include_examples "Validation errors displaying"
     end
   end
 
   context "when React/Redux", page: :react_demo, js: true, type: :system do
-    context "with Horizontal Form", form: :horizontal do
+    context "with Horizontal Form" do
+      include_examples "with Horizontal Form"
       include_examples "New Comment Submission", true
       include_examples "Validation errors displaying"
     end
 
-    context "with Inline Form", form: :inline do
+    context "with Inline Form" do
+      include_examples "with Inline Form"
       include_examples "New Comment Submission", true
       include_examples "Validation errors displaying"
     end
 
-    context "with Stacked Form", form: :stacked do
+    context "with Stacked Form" do
+      include_examples "with Stacked Form"
       include_examples "New Comment Submission", true
       include_examples "Validation errors displaying"
     end
   end
 
   context "when simple page", page: :simple, js: true, type: :system do
-    context "with Horizontal Form", form: :horizontal do
+    context "with Horizontal Form" do
+      include_examples "with Horizontal Form"
       include_examples "New Comment Submission", false
       include_examples "Validation errors displaying"
     end
 
-    context "with Inline Form", form: :inline do
+    context "with Inline Form" do
+      include_examples "with Inline Form"
       include_examples "New Comment Submission", false
       include_examples "Validation errors displaying"
     end
 
-    context "with the Stacked Form", form: :stacked do
+    context "with the Stacked Form" do
+      include_examples "with Stacked Form"
       include_examples "New Comment Submission", false
       include_examples "Validation errors displaying"
     end
diff --git a/spec/system/shared/contexts.rb b/spec/system/shared/contexts.rb
index cfc1a72f..458279b9 100644
--- a/spec/system/shared/contexts.rb
+++ b/spec/system/shared/contexts.rb
@@ -16,34 +16,6 @@
   before { visit comments_path }
 end
 
-# Forms
-shared_context "when Horizontal Form", form: :horizontal do
-  click_link "Inline Form"
-  expect(page).to have_css("form.commentForm.form-inline")
-
-  click_link "Horizontal Form"
-  expect(page).to have_css("form.commentForm.form-horizontal")
-end
-shared_context "when Inline Form", form: :inline do
-  click_link "Inline Form"
-  expect(page).to have_css("form.commentForm.form-inline")
-end
-shared_context "when Stacked Form", form: :stacked do
-  click_link "Stacked Form"
-  expect(page).to have_css("form.commentForm.form-stacked")
-end
-
-# Form Submission
-shared_context "when Form Submitted", form_submitted: true do |name: "Spicoli", text: "dude!"|
-  fill_in "Your Name", with: name
-  fill_in "Say something using markdown...", with: text
-  click_button "Post"
-end
-
-shared_context "when Form Submitted with Blank Fields", blank_form_submitted: true do
-  include_context "Form Submitted", name: "", text: ""
-end
-
 # Fixtures
 shared_context "when Existing Comment", existing_comment: true do
   before { Comment.create(author: "John Doe", text: "Hello there!") }
diff --git a/spec/system/shared/examples.rb b/spec/system/shared/examples.rb
index 9dc7e59e..84b23e71 100644
--- a/spec/system/shared/examples.rb
+++ b/spec/system/shared/examples.rb
@@ -63,3 +63,31 @@
     end
   end
 end
+
+
+
+# Forms
+shared_examples "with Inline Form" do
+  click_link "Inline Form"
+  expect(page).to have_css("form.commentForm.form-inline")
+end
+shared_examples "with Stacked Form" do
+  click_link "Stacked Form"
+  expect(page).to have_css("form.commentForm.form-stacked")
+end
+shared_examples "with Horizontal Form" do
+  include_examples "with Inline Form"
+  click_link "Horizontal Form"
+  expect(page).to have_css("form.commentForm.form-horizontal")
+end
+
+# Form Submission
+shared_examples "when Form Submitted", form_submitted: true do |name: "Spicoli", text: "dude!"|
+  fill_in "Your Name", with: name
+  fill_in "Say something using markdown...", with: text
+  click_button "Post"
+end
+
+shared_examples "when Form Submitted with Blank Fields", blank_form_submitted: true do
+  include_context "Form Submitted", name: "", text: ""
+end

From 2a11b698330e5a72e663bedb4d9edaf02c64b20e Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Thu, 29 Sep 2022 00:01:49 -0500
Subject: [PATCH 11/20] fix specsgit push

---
 spec/system/add_new_comment_spec.rb | 6 ------
 spec/system/destroy_comment_spec.rb | 3 ++-
 spec/system/edit_comment_spec.rb    | 4 +++-
 spec/system/shared/examples.rb      | 8 ++++++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/spec/system/add_new_comment_spec.rb b/spec/system/add_new_comment_spec.rb
index 375384d7..e6793331 100644
--- a/spec/system/add_new_comment_spec.rb
+++ b/spec/system/add_new_comment_spec.rb
@@ -64,10 +64,4 @@
       include_examples "Validation errors displaying"
     end
   end
-
-  context "when from classic page", page: :classic do
-    click_link "New Comment"
-
-    include_examples "New Comment Submission", false
-  end
 end
diff --git a/spec/system/destroy_comment_spec.rb b/spec/system/destroy_comment_spec.rb
index 984abd1a..484c45c6 100644
--- a/spec/system/destroy_comment_spec.rb
+++ b/spec/system/destroy_comment_spec.rb
@@ -4,10 +4,11 @@
 require "system/shared/contexts"
 
 describe "Destroy a comment", existing_comment: true do
-  context "when from classic page", page: :classic do
+  context "when from classic page" do
     let(:comment) { Comment.first }
 
     it "clicking destroy link destroys comment" do
+      include_examples "when from classic page"
       accept_confirm do
         click_link "Destroy", href: comment_path(comment)
       end
diff --git a/spec/system/edit_comment_spec.rb b/spec/system/edit_comment_spec.rb
index 84c36f61..5005d77e 100644
--- a/spec/system/edit_comment_spec.rb
+++ b/spec/system/edit_comment_spec.rb
@@ -7,8 +7,9 @@
 describe "Edit a comment", existing_comment: true do
   let(:comment) { Comment.first }
 
-  context "when from classic page", page: :classic do
+  context "when from classic page" do
     it "comment is updated when edit is submitted" do
+      include_examples "when from classic page"
       click_link "Edit", match: :first
       let(:edited_name) { "Abraham Lincoln" }
 
@@ -18,6 +19,7 @@
     end
 
     it "comment is not updated when edit is submitted with blank fields", blank_form_submitted: true do
+      include_examples "when from classic page"
       click_link "Edit", match: :first
       expect(page).not_to have_success_message
       expect(page).to have_failure_message
diff --git a/spec/system/shared/examples.rb b/spec/system/shared/examples.rb
index 84b23e71..96c5c928 100644
--- a/spec/system/shared/examples.rb
+++ b/spec/system/shared/examples.rb
@@ -64,8 +64,6 @@
   end
 end
 
-
-
 # Forms
 shared_examples "with Inline Form" do
   click_link "Inline Form"
@@ -91,3 +89,9 @@
 shared_examples "when Form Submitted with Blank Fields", blank_form_submitted: true do
   include_context "Form Submitted", name: "", text: ""
 end
+
+shared_examples "when from classic page" do
+  click_link "New Comment"
+
+  include_examples "New Comment Submission", false
+end

From 94fc2109724f13e1678f5a43e4f20700fa4e4e2c Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Thu, 29 Sep 2022 23:33:21 -0500
Subject: [PATCH 12/20] looks like contexts can no longer contain both actions
 & expectations

---
 spec/system/add_new_comment_spec.rb | 85 ++++++++++++++-----------
 spec/system/destroy_comment_spec.rb |  5 +-
 spec/system/edit_comment_spec.rb    | 13 ++--
 spec/system/shared/contexts.rb      | 29 +++++++++
 spec/system/shared/examples.rb      | 97 -----------------------------
 5 files changed, 90 insertions(+), 139 deletions(-)
 delete mode 100644 spec/system/shared/examples.rb

diff --git a/spec/system/add_new_comment_spec.rb b/spec/system/add_new_comment_spec.rb
index e6793331..21ab03da 100644
--- a/spec/system/add_new_comment_spec.rb
+++ b/spec/system/add_new_comment_spec.rb
@@ -1,67 +1,78 @@
 # frozen_string_literal: true
 
 require "rails_helper"
-require "system/shared/examples"
 require "system/shared/contexts"
 
 describe "Add new comment" do
   context "when React Router", page: :main, js: true, type: :system do
-    context "with Horizontal Form" do
-      include_examples "with Horizontal Form"
-      include_examples "New Comment Submission", true
-      include_examples "Validation errors displaying"
+    it "with Horizontal Form" do
+      click_link "Inline Form"
+      click_link "Horizontal Form"
+      submit_form
+      include_examples "check if comment is added", true
+      include_examples "expect successful validation"
     end
 
-    context "with Inline Form" do
-      include_examples "with Inline Form"
-      include_examples "New Comment Submission", true
-      include_examples "Validation errors displaying"
+    it "with Inline Form" do
+      click_link "Inline Form"
+      submit_form
+      include_examples "check if comment is added", true
+      include_examples "expect successful validation"
     end
 
-    context "with Stacked Form" do
-      include_examples "with Stacked Form"
-      include_examples "New Comment Submission", true
-      include_examples "Validation errors displaying"
+    it "with Stacked Form" do
+      click_link "Stacked Form"
+      submit_form
+      include_examples "check if comment is added", true
+      include_examples "expect successful validation"
     end
   end
 
   context "when React/Redux", page: :react_demo, js: true, type: :system do
-    context "with Horizontal Form" do
-      include_examples "with Horizontal Form"
-      include_examples "New Comment Submission", true
-      include_examples "Validation errors displaying"
+    it "with Horizontal Form" do
+      click_link "Inline Form"
+      click_link "Horizontal Form"
+      submit_form
+      include_examples "check if comment is added", true
+      include_examples "expect successful validation"
     end
 
-    context "with Inline Form" do
-      include_examples "with Inline Form"
-      include_examples "New Comment Submission", true
-      include_examples "Validation errors displaying"
+    it "with Inline Form" do
+      click_link "Inline Form"
+      submit_form
+      include_examples "check if comment is added", true
+      include_examples "expect successful validation"
     end
 
-    context "with Stacked Form" do
-      include_examples "with Stacked Form"
-      include_examples "New Comment Submission", true
-      include_examples "Validation errors displaying"
+    it "with Stacked Form" do
+      click_link "Stacked Form"
+      submit_form
+      include_examples "check if comment is added", true
+      include_examples "expect successful validation"
     end
   end
 
   context "when simple page", page: :simple, js: true, type: :system do
-    context "with Horizontal Form" do
-      include_examples "with Horizontal Form"
-      include_examples "New Comment Submission", false
-      include_examples "Validation errors displaying"
+    it "with Horizontal Form" do
+      click_link "Inline Form"
+      click_link "Horizontal Form"
+      submit_form
+      include_examples "check if comment is added", false
+      include_examples "expect successful validation"
     end
 
-    context "with Inline Form" do
-      include_examples "with Inline Form"
-      include_examples "New Comment Submission", false
-      include_examples "Validation errors displaying"
+    it "with Inline Form" do
+      click_link "Inline Form"
+      submit_form
+      include_examples "check if comment is added", false
+      include_examples "expect successful validation"
     end
 
-    context "with the Stacked Form" do
-      include_examples "with Stacked Form"
-      include_examples "New Comment Submission", false
-      include_examples "Validation errors displaying"
+    it "with the Stacked Form" do
+      click_link "Stacked Form"
+      submit_form
+      include_examples "check if comment is added", false
+      include_examples "expect successful validation"
     end
   end
 end
diff --git a/spec/system/destroy_comment_spec.rb b/spec/system/destroy_comment_spec.rb
index 484c45c6..ceb739e0 100644
--- a/spec/system/destroy_comment_spec.rb
+++ b/spec/system/destroy_comment_spec.rb
@@ -8,10 +8,13 @@
     let(:comment) { Comment.first }
 
     it "clicking destroy link destroys comment" do
-      include_examples "when from classic page"
+      click_link "New Comment"
+      submit_form(name: comment.author, text: comment.text)
+
       accept_confirm do
         click_link "Destroy", href: comment_path(comment)
       end
+
       expect(page).not_to have_css(".comment", text: comment.author)
       expect(page).not_to have_css(".comment", text: comment.text)
     end
diff --git a/spec/system/edit_comment_spec.rb b/spec/system/edit_comment_spec.rb
index 5005d77e..e04fcdfd 100644
--- a/spec/system/edit_comment_spec.rb
+++ b/spec/system/edit_comment_spec.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "rails_helper"
-require "system/shared/examples"
 require "system/shared/contexts"
 
 describe "Edit a comment", existing_comment: true do
@@ -9,18 +8,24 @@
 
   context "when from classic page" do
     it "comment is updated when edit is submitted" do
-      include_examples "when from classic page"
+      click_link "New Comment"
+      submit_form
+
       click_link "Edit", match: :first
       let(:edited_name) { "Abraham Lincoln" }
 
-      include_context "when Form Submitted", name: :edited_name
+      subit_form(name: :edited_name)
       expect(page).to have_css(".comment", text: :edited_name)
       expect(page).to have_css("#notice", text: "Comment was successfully updated.")
     end
 
     it "comment is not updated when edit is submitted with blank fields", blank_form_submitted: true do
-      include_examples "when from classic page"
+      click_link "New Comment"
+      submit_form
+
       click_link "Edit", match: :first
+      submit_form(name: "", text: "")
+
       expect(page).not_to have_success_message
       expect(page).to have_failure_message
       expect(page).not_to have_css(".comment", text: "")
diff --git a/spec/system/shared/contexts.rb b/spec/system/shared/contexts.rb
index 458279b9..45d0f24e 100644
--- a/spec/system/shared/contexts.rb
+++ b/spec/system/shared/contexts.rb
@@ -20,3 +20,32 @@
 shared_context "when Existing Comment", existing_comment: true do
   before { Comment.create(author: "John Doe", text: "Hello there!") }
 end
+
+shared_examples "check if comment is added" do |expect_comment_count|
+  expect(page).to have_css(".js-comment-author", text: name)
+  expect(page).to have_css(".js-comment-text", text: text)
+  expect(page).to have_no_content("Your comment was not saved!")
+  if expect_comment_count
+    expect(page).to have_css("#js-comment-count",
+                             text: "Comments: #{Comment.count}")
+  end
+end
+
+shared_examples "expect failed validation" do
+  expect(page).to have_content("Your comment was not saved!")
+  expect(page).to have_content("Author: can't be blank")
+  expect(page).to have_content("Text: can't be blank")
+end
+
+shared_examples "expect successful validation" do
+  expect(page).to have_no_content("Your comment was not saved!")
+  expect(page).to have_no_content("Author: can't be blank")
+  expect(page).to have_no_content("Text: can't be blank")
+end
+
+# Form Submission
+def submit_form(name: "Spicoli", text: "dude!")
+  fill_in "Your Name", with: name
+  fill_in "Say something using markdown...", with: text
+  click_button "Post"
+end
diff --git a/spec/system/shared/examples.rb b/spec/system/shared/examples.rb
deleted file mode 100644
index 96c5c928..00000000
--- a/spec/system/shared/examples.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-# frozen_string_literal: true
-
-require "rails_helper"
-require "system/shared/contexts"
-
-shared_examples "when New Comment Submission" do |expect_comment_count|
-  context "when the new comment is submitted" do
-    let(:name) { "John Smith" }
-    let(:text) { "Hello there!" }
-
-    include_context "Form Submitted", name: :name, text: :text
-
-    scenario "when comment is added" do
-      expect(page).to have_css(".js-comment-author", text: name)
-      expect(page).to have_css(".js-comment-text", text: text)
-      expect(page).to have_no_content("Your comment was not saved!")
-      if expect_comment_count
-        expect(page).to have_css("#js-comment-count",
-                                 text: "Comments: #{Comment.count}")
-      end
-    end
-  end
-
-  context "when the new comment is submitted with blank fields", blank_form_submitted: true do
-    let!(:comments_count) { all(".comment").size }
-
-    scenario "comment is not added" do
-      expect(page).to have_selector(".comment", count: comments_count)
-      if expect_comment_count
-        expect(page).to have_css("#js-comment-count",
-                                 text: "Comments: #{Comment.count}")
-      end
-    end
-  end
-
-  context "with iframe text" do
-    let(:iframe_text) { '<iframe src="http://www.w3schools.com"></iframe>' }
-
-    include_context "Form Submitted", text: :iframe_text
-
-    scenario "doesn't add an iframe" do
-      expect(page).not_to have_css("iframe")
-    end
-  end
-end
-
-shared_examples "Validation errors displaying" do
-  context "when the new comment is submitted with blank fields", blank_form_submitted: true do
-    scenario "validation errors displayed" do
-      expect(page).to have_content("Your comment was not saved!")
-      expect(page).to have_content("Author: can't be blank")
-      expect(page).to have_content("Text: can't be blank")
-
-      # with a successful consequent comment submitted
-      # the validation warnings should disappear
-      fill_in "Your Name", with: "Some name"
-      fill_in "Say something using markdown...", with: "Some text"
-      click_button "Post"
-
-      expect(page).to have_no_content("Your comment was not saved!")
-      expect(page).to have_no_content("Author: can't be blank")
-      expect(page).to have_no_content("Text: can't be blank")
-    end
-  end
-end
-
-# Forms
-shared_examples "with Inline Form" do
-  click_link "Inline Form"
-  expect(page).to have_css("form.commentForm.form-inline")
-end
-shared_examples "with Stacked Form" do
-  click_link "Stacked Form"
-  expect(page).to have_css("form.commentForm.form-stacked")
-end
-shared_examples "with Horizontal Form" do
-  include_examples "with Inline Form"
-  click_link "Horizontal Form"
-  expect(page).to have_css("form.commentForm.form-horizontal")
-end
-
-# Form Submission
-shared_examples "when Form Submitted", form_submitted: true do |name: "Spicoli", text: "dude!"|
-  fill_in "Your Name", with: name
-  fill_in "Say something using markdown...", with: text
-  click_button "Post"
-end
-
-shared_examples "when Form Submitted with Blank Fields", blank_form_submitted: true do
-  include_context "Form Submitted", name: "", text: ""
-end
-
-shared_examples "when from classic page" do
-  click_link "New Comment"
-
-  include_examples "New Comment Submission", false
-end

From 2d62318ff0ef54dab726a6cc0046e425b25ea367 Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Fri, 30 Sep 2022 00:12:11 -0500
Subject: [PATCH 13/20] fail forward

---
 spec/system/add_new_comment_spec.rb | 132 ++++++++++++++++++----------
 1 file changed, 84 insertions(+), 48 deletions(-)

diff --git a/spec/system/add_new_comment_spec.rb b/spec/system/add_new_comment_spec.rb
index 21ab03da..36fa6e8e 100644
--- a/spec/system/add_new_comment_spec.rb
+++ b/spec/system/add_new_comment_spec.rb
@@ -5,74 +5,110 @@
 
 describe "Add new comment" do
   context "when React Router", page: :main, js: true, type: :system do
-    it "with Horizontal Form" do
-      click_link "Inline Form"
-      click_link "Horizontal Form"
-      submit_form
-      include_examples "check if comment is added", true
-      include_examples "expect successful validation"
+    describe "with Horizontal Form" do
+      before {
+        click_link "Inline Form"
+        click_link "Horizontal Form"
+        submit_form
+      }
+      context "same examples" do
+        include_examples "check if comment is added", true
+        include_examples "expect successful validation"
+      end
     end
 
-    it "with Inline Form" do
-      click_link "Inline Form"
-      submit_form
-      include_examples "check if comment is added", true
-      include_examples "expect successful validation"
+    describe "with Inline Form" do
+      before {
+        click_link "Inline Form"
+        submit_form
+      }
+      context "same examples" do
+        include_examples "check if comment is added", true
+        include_examples "expect successful validation"
+      end
     end
 
-    it "with Stacked Form" do
-      click_link "Stacked Form"
-      submit_form
-      include_examples "check if comment is added", true
-      include_examples "expect successful validation"
+    describe "with Stacked Form" do
+      before {
+        click_link "Stacked Form"
+        submit_form
+      }
+      context "same examples" do
+        include_examples "check if comment is added", true
+        include_examples "expect successful validation"
+      end
     end
   end
 
   context "when React/Redux", page: :react_demo, js: true, type: :system do
-    it "with Horizontal Form" do
-      click_link "Inline Form"
-      click_link "Horizontal Form"
-      submit_form
-      include_examples "check if comment is added", true
-      include_examples "expect successful validation"
+    describe "with Horizontal Form" do
+      before {
+        click_link "Inline Form"
+        click_link "Horizontal Form"
+        submit_form
+      }
+      context "same examples" do
+        include_examples "check if comment is added", true
+        include_examples "expect successful validation"
+      end
     end
 
-    it "with Inline Form" do
-      click_link "Inline Form"
-      submit_form
-      include_examples "check if comment is added", true
-      include_examples "expect successful validation"
+    describe "with Inline Form" do
+      before {
+        click_link "Inline Form"
+        submit_form
+      }
+      context "same examples" do
+        include_examples "check if comment is added", true
+        include_examples "expect successful validation"
+      end
     end
 
-    it "with Stacked Form" do
-      click_link "Stacked Form"
-      submit_form
-      include_examples "check if comment is added", true
-      include_examples "expect successful validation"
+    describe "with Stacked Form" do
+      before {
+        click_link "Stacked Form"
+        submit_form
+      }
+      context "same examples" do
+        include_examples "check if comment is added", true
+        include_examples "expect successful validation"
+      end
     end
   end
 
   context "when simple page", page: :simple, js: true, type: :system do
-    it "with Horizontal Form" do
-      click_link "Inline Form"
-      click_link "Horizontal Form"
-      submit_form
-      include_examples "check if comment is added", false
-      include_examples "expect successful validation"
+    describe "with Horizontal Form" do
+      before {
+        click_link "Inline Form"
+        click_link "Horizontal Form"
+        submit_form
+      }
+      context "same examples" do
+        include_examples "check if comment is added", true
+        include_examples "expect successful validation"
+      end
     end
 
-    it "with Inline Form" do
-      click_link "Inline Form"
-      submit_form
-      include_examples "check if comment is added", false
-      include_examples "expect successful validation"
+    describe "with Inline Form" do
+      before {
+        click_link "Inline Form"
+        submit_form
+      }
+      context "same examples" do
+        include_examples "check if comment is added", true
+        include_examples "expect successful validation"
+      end
     end
 
-    it "with the Stacked Form" do
-      click_link "Stacked Form"
-      submit_form
-      include_examples "check if comment is added", false
-      include_examples "expect successful validation"
+    describe "with the Stacked Form" do
+      before {
+        click_link "Stacked Form"
+        submit_form
+      }
+      context "same examples" do
+        include_examples "check if comment is added", true
+        include_examples "expect successful validation"
+      end
     end
   end
 end

From d8b03d8c580684eb519923f1e4a3740889649619 Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Fri, 30 Sep 2022 00:21:43 -0500
Subject: [PATCH 14/20] page => subject

---
 spec/system/shared/contexts.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/spec/system/shared/contexts.rb b/spec/system/shared/contexts.rb
index 45d0f24e..0ded1f30 100644
--- a/spec/system/shared/contexts.rb
+++ b/spec/system/shared/contexts.rb
@@ -22,25 +22,25 @@
 end
 
 shared_examples "check if comment is added" do |expect_comment_count|
-  expect(page).to have_css(".js-comment-author", text: name)
-  expect(page).to have_css(".js-comment-text", text: text)
-  expect(page).to have_no_content("Your comment was not saved!")
+  is_expected.to have_css(".js-comment-author", text: name)
+  is_expected.to have_css(".js-comment-text", text: text)
+  is_expected.to have_no_content("Your comment was not saved!")
   if expect_comment_count
-    expect(page).to have_css("#js-comment-count",
+    is_expected.to have_css("#js-comment-count",
                              text: "Comments: #{Comment.count}")
   end
 end
 
 shared_examples "expect failed validation" do
-  expect(page).to have_content("Your comment was not saved!")
-  expect(page).to have_content("Author: can't be blank")
-  expect(page).to have_content("Text: can't be blank")
+  is_expected.to have_content("Your comment was not saved!")
+  is_expected.to have_content("Author: can't be blank")
+  is_expected.to have_content("Text: can't be blank")
 end
 
 shared_examples "expect successful validation" do
-  expect(page).to have_no_content("Your comment was not saved!")
-  expect(page).to have_no_content("Author: can't be blank")
-  expect(page).to have_no_content("Text: can't be blank")
+  is_expected.to have_no_content("Your comment was not saved!")
+  is_expected.to have_no_content("Author: can't be blank")
+  is_expected.to have_no_content("Text: can't be blank")
 end
 
 # Form Submission

From 06941ec60b22f27af4ac5ab312adae960e2e85ee Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Fri, 30 Sep 2022 00:37:13 -0500
Subject: [PATCH 15/20] failing more

---
 spec/system/add_new_comment_spec.rb | 105 +++++++++++++++++++++-------
 spec/system/shared/contexts.rb      |  27 -------
 2 files changed, 78 insertions(+), 54 deletions(-)

diff --git a/spec/system/add_new_comment_spec.rb b/spec/system/add_new_comment_spec.rb
index 36fa6e8e..5591831d 100644
--- a/spec/system/add_new_comment_spec.rb
+++ b/spec/system/add_new_comment_spec.rb
@@ -6,108 +6,159 @@
 describe "Add new comment" do
   context "when React Router", page: :main, js: true, type: :system do
     describe "with Horizontal Form" do
+      subject { page }
       before {
         click_link "Inline Form"
         click_link "Horizontal Form"
         submit_form
       }
-      context "same examples" do
-        include_examples "check if comment is added", true
-        include_examples "expect successful validation"
+      it "this sucks" do
+        is_expected.to have_css(".js-comment-author", text: name)
+        is_expected.to have_css(".js-comment-text", text: text)
+        is_expected.to have_no_content("Your comment was not saved!")
+        is_expected.to have_css("#js-comment-count", text: "Comments: #{Comment.count}")
+        is_expected.to have_no_content("Your comment was not saved!")
+        is_expected.to have_no_content("Author: can't be blank")
+        is_expected.to have_no_content("Text: can't be blank")
       end
     end
 
     describe "with Inline Form" do
+      subject { page }
       before {
         click_link "Inline Form"
         submit_form
       }
-      context "same examples" do
-        include_examples "check if comment is added", true
-        include_examples "expect successful validation"
+      it "this sucks" do
+        is_expected.to have_css(".js-comment-author", text: name)
+        is_expected.to have_css(".js-comment-text", text: text)
+        is_expected.to have_no_content("Your comment was not saved!")
+        is_expected.to have_css("#js-comment-count", text: "Comments: #{Comment.count}")
+        is_expected.to have_no_content("Your comment was not saved!")
+        is_expected.to have_no_content("Author: can't be blank")
+        is_expected.to have_no_content("Text: can't be blank")
       end
     end
 
     describe "with Stacked Form" do
+      subject { page }
       before {
         click_link "Stacked Form"
         submit_form
       }
-      context "same examples" do
-        include_examples "check if comment is added", true
-        include_examples "expect successful validation"
+      it "this sucks" do
+        is_expected.to have_css(".js-comment-author", text: name)
+        is_expected.to have_css(".js-comment-text", text: text)
+        is_expected.to have_no_content("Your comment was not saved!")
+        is_expected.to have_css("#js-comment-count", text: "Comments: #{Comment.count}")
+        is_expected.to have_no_content("Your comment was not saved!")
+        is_expected.to have_no_content("Author: can't be blank")
+        is_expected.to have_no_content("Text: can't be blank")
       end
     end
   end
 
   context "when React/Redux", page: :react_demo, js: true, type: :system do
     describe "with Horizontal Form" do
+      subject { page }
       before {
         click_link "Inline Form"
         click_link "Horizontal Form"
         submit_form
       }
-      context "same examples" do
-        include_examples "check if comment is added", true
-        include_examples "expect successful validation"
+      it "this sucks" do
+        is_expected.to have_css(".js-comment-author", text: name)
+        is_expected.to have_css(".js-comment-text", text: text)
+        is_expected.to have_no_content("Your comment was not saved!")
+        is_expected.to have_css("#js-comment-count", text: "Comments: #{Comment.count}")
+        is_expected.to have_no_content("Your comment was not saved!")
+        is_expected.to have_no_content("Author: can't be blank")
+        is_expected.to have_no_content("Text: can't be blank")
       end
     end
 
     describe "with Inline Form" do
+      subject { page }
       before {
         click_link "Inline Form"
         submit_form
       }
-      context "same examples" do
-        include_examples "check if comment is added", true
-        include_examples "expect successful validation"
+      it "this sucks" do
+        is_expected.to have_css(".js-comment-author", text: name)
+        is_expected.to have_css(".js-comment-text", text: text)
+        is_expected.to have_no_content("Your comment was not saved!")
+        is_expected.to have_css("#js-comment-count", text: "Comments: #{Comment.count}")
+        is_expected.to have_no_content("Your comment was not saved!")
+        is_expected.to have_no_content("Author: can't be blank")
+        is_expected.to have_no_content("Text: can't be blank")
       end
     end
 
     describe "with Stacked Form" do
+      subject { page }
       before {
         click_link "Stacked Form"
         submit_form
       }
-      context "same examples" do
-        include_examples "check if comment is added", true
-        include_examples "expect successful validation"
+      it "this sucks" do
+        is_expected.to have_css(".js-comment-author", text: name)
+        is_expected.to have_css(".js-comment-text", text: text)
+        is_expected.to have_no_content("Your comment was not saved!")
+        is_expected.to have_css("#js-comment-count", text: "Comments: #{Comment.count}")
+        is_expected.to have_no_content("Your comment was not saved!")
+        is_expected.to have_no_content("Author: can't be blank")
+        is_expected.to have_no_content("Text: can't be blank")
       end
     end
   end
 
   context "when simple page", page: :simple, js: true, type: :system do
     describe "with Horizontal Form" do
+      subject { page }
       before {
         click_link "Inline Form"
         click_link "Horizontal Form"
         submit_form
       }
-      context "same examples" do
-        include_examples "check if comment is added", true
-        include_examples "expect successful validation"
+      it "this sucks" do
+        is_expected.to have_css(".js-comment-author", text: name)
+        is_expected.to have_css(".js-comment-text", text: text)
+        is_expected.to have_no_content("Your comment was not saved!")
+        is_expected.to have_no_content("Your comment was not saved!")
+        is_expected.to have_no_content("Author: can't be blank")
+        is_expected.to have_no_content("Text: can't be blank")
       end
     end
 
     describe "with Inline Form" do
+      subject { page }
       before {
         click_link "Inline Form"
         submit_form
       }
-      context "same examples" do
-        include_examples "check if comment is added", true
-        include_examples "expect successful validation"
+      it "this sucks" do
+        is_expected.to have_css(".js-comment-author", text: name)
+        is_expected.to have_css(".js-comment-text", text: text)
+        is_expected.to have_no_content("Your comment was not saved!")
+        is_expected.to have_no_content("Your comment was not saved!")
+        is_expected.to have_no_content("Author: can't be blank")
+        is_expected.to have_no_content("Text: can't be blank")
       end
     end
 
     describe "with the Stacked Form" do
+      subject { page }
       before {
         click_link "Stacked Form"
         submit_form
       }
-      context "same examples" do
-        include_examples "check if comment is added", true
-        include_examples "expect successful validation"
+      it "this sucks" do
+        is_expected.to have_css(".js-comment-author", text: name)
+        is_expected.to have_css(".js-comment-text", text: text)
+        is_expected.to have_no_content("Your comment was not saved!")
+        is_expected.to have_no_content("Your comment was not saved!")
+        is_expected.to have_no_content("Author: can't be blank")
+        is_expected.to have_no_content("Text: can't be blank")
       end
     end
   end
diff --git a/spec/system/shared/contexts.rb b/spec/system/shared/contexts.rb
index 0ded1f30..59ff3d7e 100644
--- a/spec/system/shared/contexts.rb
+++ b/spec/system/shared/contexts.rb
@@ -16,33 +16,6 @@
   before { visit comments_path }
 end
 
-# Fixtures
-shared_context "when Existing Comment", existing_comment: true do
-  before { Comment.create(author: "John Doe", text: "Hello there!") }
-end
-
-shared_examples "check if comment is added" do |expect_comment_count|
-  is_expected.to have_css(".js-comment-author", text: name)
-  is_expected.to have_css(".js-comment-text", text: text)
-  is_expected.to have_no_content("Your comment was not saved!")
-  if expect_comment_count
-    is_expected.to have_css("#js-comment-count",
-                             text: "Comments: #{Comment.count}")
-  end
-end
-
-shared_examples "expect failed validation" do
-  is_expected.to have_content("Your comment was not saved!")
-  is_expected.to have_content("Author: can't be blank")
-  is_expected.to have_content("Text: can't be blank")
-end
-
-shared_examples "expect successful validation" do
-  is_expected.to have_no_content("Your comment was not saved!")
-  is_expected.to have_no_content("Author: can't be blank")
-  is_expected.to have_no_content("Text: can't be blank")
-end
-
 # Form Submission
 def submit_form(name: "Spicoli", text: "dude!")
   fill_in "Your Name", with: name

From 0e654a243a80a081ad78b7c1240312f93e6ebda6 Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Fri, 30 Sep 2022 01:00:22 -0500
Subject: [PATCH 16/20] try to fix stuff

---
 spec/system/add_new_comment_spec.rb | 37 +++++++++++++++--------------
 spec/system/destroy_comment_spec.rb |  1 +
 spec/system/edit_comment_spec.rb    |  1 +
 spec/system/shared/contexts.rb      | 14 -----------
 4 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/spec/system/add_new_comment_spec.rb b/spec/system/add_new_comment_spec.rb
index 5591831d..3919c047 100644
--- a/spec/system/add_new_comment_spec.rb
+++ b/spec/system/add_new_comment_spec.rb
@@ -5,6 +5,7 @@
 
 describe "Add new comment" do
   context "when React Router", page: :main, js: true, type: :system do
+    before { visit root_path }
     describe "with Horizontal Form" do
       subject { page }
       before {
@@ -13,8 +14,8 @@
         submit_form
       }
       it "this sucks" do
-        is_expected.to have_css(".js-comment-author", text: name)
-        is_expected.to have_css(".js-comment-text", text: text)
+        is_expected.to have_css(".js-comment-author", text: "Spicoli")
+        is_expected.to have_css(".js-comment-text", text: "dude!")
         is_expected.to have_no_content("Your comment was not saved!")
         is_expected.to have_css("#js-comment-count", text: "Comments: #{Comment.count}")
         is_expected.to have_no_content("Your comment was not saved!")
@@ -30,8 +31,8 @@
         submit_form
       }
       it "this sucks" do
-        is_expected.to have_css(".js-comment-author", text: name)
-        is_expected.to have_css(".js-comment-text", text: text)
+        is_expected.to have_css(".js-comment-author", text: "Spicoli")
+        is_expected.to have_css(".js-comment-text", text: "dude!")
         is_expected.to have_no_content("Your comment was not saved!")
         is_expected.to have_css("#js-comment-count", text: "Comments: #{Comment.count}")
         is_expected.to have_no_content("Your comment was not saved!")
@@ -47,8 +48,8 @@
         submit_form
       }
       it "this sucks" do
-        is_expected.to have_css(".js-comment-author", text: name)
-        is_expected.to have_css(".js-comment-text", text: text)
+        is_expected.to have_css(".js-comment-author", text: "Spicoli")
+        is_expected.to have_css(".js-comment-text", text: "dude!")
         is_expected.to have_no_content("Your comment was not saved!")
         is_expected.to have_css("#js-comment-count", text: "Comments: #{Comment.count}")
         is_expected.to have_no_content("Your comment was not saved!")
@@ -67,8 +68,8 @@
         submit_form
       }
       it "this sucks" do
-        is_expected.to have_css(".js-comment-author", text: name)
-        is_expected.to have_css(".js-comment-text", text: text)
+        is_expected.to have_css(".js-comment-author", text: "Spicoli")
+        is_expected.to have_css(".js-comment-text", text: "dude!")
         is_expected.to have_no_content("Your comment was not saved!")
         is_expected.to have_css("#js-comment-count", text: "Comments: #{Comment.count}")
         is_expected.to have_no_content("Your comment was not saved!")
@@ -84,8 +85,8 @@
         submit_form
       }
       it "this sucks" do
-        is_expected.to have_css(".js-comment-author", text: name)
-        is_expected.to have_css(".js-comment-text", text: text)
+        is_expected.to have_css(".js-comment-author", text: "Spicoli")
+        is_expected.to have_css(".js-comment-text", text: "dude!")
         is_expected.to have_no_content("Your comment was not saved!")
         is_expected.to have_css("#js-comment-count", text: "Comments: #{Comment.count}")
         is_expected.to have_no_content("Your comment was not saved!")
@@ -101,8 +102,8 @@
         submit_form
       }
       it "this sucks" do
-        is_expected.to have_css(".js-comment-author", text: name)
-        is_expected.to have_css(".js-comment-text", text: text)
+        is_expected.to have_css(".js-comment-author", text: "Spicoli")
+        is_expected.to have_css(".js-comment-text", text: "dude!")
         is_expected.to have_no_content("Your comment was not saved!")
         is_expected.to have_css("#js-comment-count", text: "Comments: #{Comment.count}")
         is_expected.to have_no_content("Your comment was not saved!")
@@ -121,8 +122,8 @@
         submit_form
       }
       it "this sucks" do
-        is_expected.to have_css(".js-comment-author", text: name)
-        is_expected.to have_css(".js-comment-text", text: text)
+        is_expected.to have_css(".js-comment-author", text: "Spicoli")
+        is_expected.to have_css(".js-comment-text", text: "dude!")
         is_expected.to have_no_content("Your comment was not saved!")
         is_expected.to have_no_content("Your comment was not saved!")
         is_expected.to have_no_content("Author: can't be blank")
@@ -137,8 +138,8 @@
         submit_form
       }
       it "this sucks" do
-        is_expected.to have_css(".js-comment-author", text: name)
-        is_expected.to have_css(".js-comment-text", text: text)
+        is_expected.to have_css(".js-comment-author", text: "Spicoli")
+        is_expected.to have_css(".js-comment-text", text: "dude!")
         is_expected.to have_no_content("Your comment was not saved!")
         is_expected.to have_no_content("Your comment was not saved!")
         is_expected.to have_no_content("Author: can't be blank")
@@ -153,8 +154,8 @@
         submit_form
       }
       it "this sucks" do
-        is_expected.to have_css(".js-comment-author", text: name)
-        is_expected.to have_css(".js-comment-text", text: text)
+        is_expected.to have_css(".js-comment-author", text: "Spicoli")
+        is_expected.to have_css(".js-comment-text", text: "dude!")
         is_expected.to have_no_content("Your comment was not saved!")
         is_expected.to have_no_content("Your comment was not saved!")
         is_expected.to have_no_content("Author: can't be blank")
diff --git a/spec/system/destroy_comment_spec.rb b/spec/system/destroy_comment_spec.rb
index ceb739e0..6ee9e1c5 100644
--- a/spec/system/destroy_comment_spec.rb
+++ b/spec/system/destroy_comment_spec.rb
@@ -5,6 +5,7 @@
 
 describe "Destroy a comment", existing_comment: true do
   context "when from classic page" do
+    before { visit comments_path }
     let(:comment) { Comment.first }
 
     it "clicking destroy link destroys comment" do
diff --git a/spec/system/edit_comment_spec.rb b/spec/system/edit_comment_spec.rb
index e04fcdfd..42a81a1c 100644
--- a/spec/system/edit_comment_spec.rb
+++ b/spec/system/edit_comment_spec.rb
@@ -7,6 +7,7 @@
   let(:comment) { Comment.first }
 
   context "when from classic page" do
+    before { visit comments_path }
     it "comment is updated when edit is submitted" do
       click_link "New Comment"
       submit_form
diff --git a/spec/system/shared/contexts.rb b/spec/system/shared/contexts.rb
index 59ff3d7e..9b751e85 100644
--- a/spec/system/shared/contexts.rb
+++ b/spec/system/shared/contexts.rb
@@ -2,20 +2,6 @@
 
 require "rails_helper"
 
-# Pages
-shared_context "when React Router Demo", page: :main do
-  before { visit root_path }
-end
-shared_context "when React Demo", page: :react_demo do
-  before { visit no_router_path }
-end
-shared_context "when Simple Page", page: :simple do
-  before { visit simple_path }
-end
-shared_context "when Classic Page", page: :classic do
-  before { visit comments_path }
-end
-
 # Form Submission
 def submit_form(name: "Spicoli", text: "dude!")
   fill_in "Your Name", with: name

From 0c3e8d1eca26eb0e68d0f7122efe31b58d641e52 Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Mon, 10 Oct 2022 16:58:51 -0500
Subject: [PATCH 17/20] more fixes

---
 app/models/git_commit_sha.rb          |  2 +-
 config/initializers/react_on_rails.rb |  5 +++--
 config/webpacker.yml                  |  3 ---
 spec/system/add_new_comment_spec.rb   | 11 ++++++++++-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/models/git_commit_sha.rb b/app/models/git_commit_sha.rb
index 57e45213..598ab20d 100644
--- a/app/models/git_commit_sha.rb
+++ b/app/models/git_commit_sha.rb
@@ -9,7 +9,7 @@ def self.current_sha
   end
 
   def self.reset_current_sha
-    self.current_sha = nil
+    @current_sha = nil
   end
 
   # Assumes the git CLI is available. This is not the case in production on Heroku.
diff --git a/config/initializers/react_on_rails.rb b/config/initializers/react_on_rails.rb
index e49fcc0b..7c1acdf6 100644
--- a/config/initializers/react_on_rails.rb
+++ b/config/initializers/react_on_rails.rb
@@ -3,8 +3,9 @@
 # Shown below are the defaults for configuration
 ReactOnRails.configure do |config|
   # Define the files for we need to check for webpack compilation when running tests
-  config.webpack_generated_files = %w[ app-bundle.js vendor-bundle.js app-bundle.css
-                                       vendor-bundle.css server-bundle.js ]
+  config.webpack_generated_files = %w[ client-bundle.js server-bundle.js ]
+
+  config.build_test_command = "RAILS_ENV=test bin/webpacker"
 
   # This is the file used for server rendering of React when using `(prerender: true)`
   # If you are never using server rendering, you may set this to "".
diff --git a/config/webpacker.yml b/config/webpacker.yml
index 161cb48f..285182e2 100644
--- a/config/webpacker.yml
+++ b/config/webpacker.yml
@@ -49,9 +49,6 @@ test:
   <<: *default
   compile: true
 
-  # Compile test packs to a separate directory
-  public_output_path: packs-test
-
 production:
   <<: *default
 
diff --git a/spec/system/add_new_comment_spec.rb b/spec/system/add_new_comment_spec.rb
index 3919c047..dfa4e03d 100644
--- a/spec/system/add_new_comment_spec.rb
+++ b/spec/system/add_new_comment_spec.rb
@@ -5,10 +5,10 @@
 
 describe "Add new comment" do
   context "when React Router", page: :main, js: true, type: :system do
-    before { visit root_path }
     describe "with Horizontal Form" do
       subject { page }
       before {
+        visit root_path
         click_link "Inline Form"
         click_link "Horizontal Form"
         submit_form
@@ -27,6 +27,7 @@
     describe "with Inline Form" do
       subject { page }
       before {
+        visit root_path
         click_link "Inline Form"
         submit_form
       }
@@ -44,6 +45,7 @@
     describe "with Stacked Form" do
       subject { page }
       before {
+        visit root_path
         click_link "Stacked Form"
         submit_form
       }
@@ -63,6 +65,7 @@
     describe "with Horizontal Form" do
       subject { page }
       before {
+        visit root_path
         click_link "Inline Form"
         click_link "Horizontal Form"
         submit_form
@@ -81,9 +84,11 @@
     describe "with Inline Form" do
       subject { page }
       before {
+        visit root_path
         click_link "Inline Form"
         submit_form
       }
+
       it "this sucks" do
         is_expected.to have_css(".js-comment-author", text: "Spicoli")
         is_expected.to have_css(".js-comment-text", text: "dude!")
@@ -98,6 +103,7 @@
     describe "with Stacked Form" do
       subject { page }
       before {
+        visit root_path
         click_link "Stacked Form"
         submit_form
       }
@@ -117,6 +123,7 @@
     describe "with Horizontal Form" do
       subject { page }
       before {
+        visit root_path
         click_link "Inline Form"
         click_link "Horizontal Form"
         submit_form
@@ -134,6 +141,7 @@
     describe "with Inline Form" do
       subject { page }
       before {
+        visit root_path
         click_link "Inline Form"
         submit_form
       }
@@ -150,6 +158,7 @@
     describe "with the Stacked Form" do
       subject { page }
       before {
+        visit root_path
         click_link "Stacked Form"
         submit_form
       }

From 93b74f799ea7e54c96845ba21dcf7dcbdef832d7 Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Tue, 11 Oct 2022 00:42:21 -0500
Subject: [PATCH 18/20] disable failing delete_comment_spec

---
 client/app/packs/bootstrap.js         |  1 -
 spec/system/destroy_comment_spec.rb   | 12 ++++++------
 spec/system/edit_comment_spec.rb      |  5 +++--
 spec/system/react_router_demo_spec.rb |  7 ++++++-
 4 files changed, 15 insertions(+), 10 deletions(-)
 delete mode 100644 client/app/packs/bootstrap.js

diff --git a/client/app/packs/bootstrap.js b/client/app/packs/bootstrap.js
deleted file mode 100644
index ce95fa89..00000000
--- a/client/app/packs/bootstrap.js
+++ /dev/null
@@ -1 +0,0 @@
-import 'bootstrap-loader';
diff --git a/spec/system/destroy_comment_spec.rb b/spec/system/destroy_comment_spec.rb
index 6ee9e1c5..ff4c66b0 100644
--- a/spec/system/destroy_comment_spec.rb
+++ b/spec/system/destroy_comment_spec.rb
@@ -5,16 +5,16 @@
 
 describe "Destroy a comment", existing_comment: true do
   context "when from classic page" do
-    before { visit comments_path }
-    let(:comment) { Comment.first }
+    let(:comment) { FactoryBot.build(:comment) }
+
+    xit "clicking destroy link destroys comment" do
+      visit comments_path
 
-    it "clicking destroy link destroys comment" do
       click_link "New Comment"
       submit_form(name: comment.author, text: comment.text)
 
-      accept_confirm do
-        click_link "Destroy", href: comment_path(comment)
-      end
+      click_link "Back"
+      click_link "Destroy"
 
       expect(page).not_to have_css(".comment", text: comment.author)
       expect(page).not_to have_css(".comment", text: comment.text)
diff --git a/spec/system/edit_comment_spec.rb b/spec/system/edit_comment_spec.rb
index 42a81a1c..162d7f8e 100644
--- a/spec/system/edit_comment_spec.rb
+++ b/spec/system/edit_comment_spec.rb
@@ -4,11 +4,11 @@
 require "system/shared/contexts"
 
 describe "Edit a comment", existing_comment: true do
-  let(:comment) { Comment.first }
+  let(:comment) { FactoryBot.build(:comment) }
 
   context "when from classic page" do
-    before { visit comments_path }
     it "comment is updated when edit is submitted" do
+      visit comments_path
       click_link "New Comment"
       submit_form
 
@@ -21,6 +21,7 @@
     end
 
     it "comment is not updated when edit is submitted with blank fields", blank_form_submitted: true do
+      visit comments_path
       click_link "New Comment"
       submit_form
 
diff --git a/spec/system/react_router_demo_spec.rb b/spec/system/react_router_demo_spec.rb
index 24218478..48c419b6 100644
--- a/spec/system/react_router_demo_spec.rb
+++ b/spec/system/react_router_demo_spec.rb
@@ -6,6 +6,7 @@
 describe "React Router Routes", js: true, type: :system do
   context "when Root URL", page: :main do
     it "shows comments section" do
+      visit root_path
       click_link "Comments (Root URL)"
       expect(page).to have_selector("h2", text: "Comments")
     end
@@ -13,13 +14,17 @@
 
   context "when /react-router URL", page: :main do
     it "shows 'React Router is working!' message" do
+      visit root_path
       click_link "Test React Router ('/react-router')"
       expect(page).to have_selector("h1", text: "React Router is working!")
     end
   end
 
   context "when /react-router/redirect URL", page: :main do
-    before { click_link "Test Redirect (url to '/react-router/redirect' which goes to root '/')" }
+    before {
+      visit root_path
+      click_link "Test Redirect (url to '/react-router/redirect' which goes to root '/')"
+    }
 
     it "shows comments section" do
       expect(page).to have_selector("h2", text: "Comments")

From 6fed8387f9155cc4f605efee730e067ed67efeee Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Tue, 11 Oct 2022 17:18:14 -0500
Subject: [PATCH 19/20] Fix all the things?

---
 app/views/comments/index.html.erb                |  6 +++++-
 .../bundles/comments/startup/ClientRouterApp.jsx | 14 ++++++--------
 .../comments/startup/NavigationBarApp.jsx        | 14 ++++++--------
 .../bundles/comments/startup/ServerRouterApp.jsx | 16 +++++++---------
 client/app/packs/client-bundle.js                |  1 +
 package.json                                     |  2 +-
 spec/system/destroy_comment_spec.rb              |  8 +++++---
 spec/system/edit_comment_spec.rb                 |  4 ++--
 yarn.lock                                        | 11 ++++-------
 9 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/app/views/comments/index.html.erb b/app/views/comments/index.html.erb
index 0cf6de0e..a35b7206 100644
--- a/app/views/comments/index.html.erb
+++ b/app/views/comments/index.html.erb
@@ -19,9 +19,13 @@
       <tr>
         <td><%= comment.author %></td>
         <td><%= comment.text %></td>
+      </tr>
+      <tr>
         <td><%= link_to 'Show', comment %></td>
         <td><%= link_to 'Edit', edit_comment_path(comment) %></td>
-        <td><%= link_to 'Destroy', comment, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+      <tr>
+        <td><%= link_to 'Destroy', comment, method: :delete, data: { method: :delete, confirm: 'Are you sure?' } %></td>
       </tr>
     <% end %>
   </tbody>
diff --git a/client/app/bundles/comments/startup/ClientRouterApp.jsx b/client/app/bundles/comments/startup/ClientRouterApp.jsx
index 8b34563e..9cbcffb6 100644
--- a/client/app/bundles/comments/startup/ClientRouterApp.jsx
+++ b/client/app/bundles/comments/startup/ClientRouterApp.jsx
@@ -5,17 +5,15 @@ import ReactOnRails from 'react-on-rails';
 import { BrowserRouter } from 'react-router-dom';
 import routes from '../routes/routes.jsx';
 
-function ClientRouterApp(_props, _railsContext) {
+function ClientRouterApp(_props) {
   const store = ReactOnRails.getStore('routerCommentsStore');
 
   // eslint-disable-next-line react/display-name
-  return function () {
-    return (
-      <Provider store={store}>
-        <BrowserRouter>{routes}</BrowserRouter>
-      </Provider>
-    );
-  };
+  return (
+    <Provider store={store}>
+      <BrowserRouter>{routes}</BrowserRouter>
+    </Provider>
+  );
 }
 
 export default ClientRouterApp;
diff --git a/client/app/bundles/comments/startup/NavigationBarApp.jsx b/client/app/bundles/comments/startup/NavigationBarApp.jsx
index 2f346d6f..5c4f40ba 100644
--- a/client/app/bundles/comments/startup/NavigationBarApp.jsx
+++ b/client/app/bundles/comments/startup/NavigationBarApp.jsx
@@ -23,18 +23,16 @@ function NavigationBarApp(_props, railsContext) {
   } else if (pathname === paths.NO_ROUTER_PATH) {
     store = ReactOnRails.getStore('commentsStore', false);
   } else {
-    return <NavigationBar {...{ pathname }} />;
+    return () => <NavigationBar {...{ pathname }} />;
   }
 
   // eslint interprets the return as a new component definition, which is not the case
   // eslint-disable-next-line react/display-name, react/no-unstable-nested-components
-  return function () {
-    return (
-      <Provider store={store}>
-        <NavigationBarContainer />
-      </Provider>
-    );
-  };
+  return () => (
+    <Provider store={store}>
+      <NavigationBarContainer />
+    </Provider>
+  );
 }
 
 export default NavigationBarApp;
diff --git a/client/app/bundles/comments/startup/ServerRouterApp.jsx b/client/app/bundles/comments/startup/ServerRouterApp.jsx
index be1a1c51..49a611b6 100644
--- a/client/app/bundles/comments/startup/ServerRouterApp.jsx
+++ b/client/app/bundles/comments/startup/ServerRouterApp.jsx
@@ -25,15 +25,13 @@ function ServerRouterApp(_props, railsContext) {
 
   // Important that you don't do this if you are redirecting or have an error.
   // eslint-disable-next-line react/display-name
-  return function () {
-    return (
-      <Provider store={store}>
-        <StaticRouter location={location} context={context}>
-          {routes}
-        </StaticRouter>
-      </Provider>
-    );
-  };
+  return () => (
+    <Provider store={store}>
+      <StaticRouter location={location} context={context}>
+        {routes}
+      </StaticRouter>
+    </Provider>
+  );
 }
 
 export default ServerRouterApp;
diff --git a/client/app/packs/client-bundle.js b/client/app/packs/client-bundle.js
index 024c62d8..67ef7f49 100644
--- a/client/app/packs/client-bundle.js
+++ b/client/app/packs/client-bundle.js
@@ -1,5 +1,6 @@
 import ReactOnRails from 'react-on-rails';
 import 'bootstrap-loader';
+import 'expose-loader?exposes=$,jQuery!jquery';
 import 'jquery-ujs';
 
 import App from '../bundles/comments/startup/App.jsx';
diff --git a/package.json b/package.json
index 90081b82..ea832b22 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "css-minimizer-webpack-plugin": "^3.3.1",
     "es5-shim": "^4.5.9",
     "estraverse": "^4.2.0",
-    "expose-loader": "^1.0.0",
+    "expose-loader": "^4.0.0",
     "immutable": "^3.8.2",
     "imports-loader": "^1.1.0",
     "intl": "^1.2.5",
diff --git a/spec/system/destroy_comment_spec.rb b/spec/system/destroy_comment_spec.rb
index ff4c66b0..cfa73f29 100644
--- a/spec/system/destroy_comment_spec.rb
+++ b/spec/system/destroy_comment_spec.rb
@@ -7,14 +7,16 @@
   context "when from classic page" do
     let(:comment) { FactoryBot.build(:comment) }
 
-    xit "clicking destroy link destroys comment" do
+    it "clicking destroy link destroys comment" do
       visit comments_path
 
       click_link "New Comment"
       submit_form(name: comment.author, text: comment.text)
-
       click_link "Back"
-      click_link "Destroy"
+
+      accept_confirm do
+        click_link "Destroy"
+      end
 
       expect(page).not_to have_css(".comment", text: comment.author)
       expect(page).not_to have_css(".comment", text: comment.text)
diff --git a/spec/system/edit_comment_spec.rb b/spec/system/edit_comment_spec.rb
index 162d7f8e..1b68737b 100644
--- a/spec/system/edit_comment_spec.rb
+++ b/spec/system/edit_comment_spec.rb
@@ -5,6 +5,7 @@
 
 describe "Edit a comment", existing_comment: true do
   let(:comment) { FactoryBot.build(:comment) }
+  let(:edited_name) { "Abraham Lincoln" }
 
   context "when from classic page" do
     it "comment is updated when edit is submitted" do
@@ -13,9 +14,8 @@
       submit_form
 
       click_link "Edit", match: :first
-      let(:edited_name) { "Abraham Lincoln" }
 
-      subit_form(name: :edited_name)
+      submit_form(name: :edited_name)
       expect(page).to have_css(".comment", text: :edited_name)
       expect(page).to have_css("#notice", text: "Comment was successfully updated.")
     end
diff --git a/yarn.lock b/yarn.lock
index e3411840..ba3ab974 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4349,13 +4349,10 @@ exports-loader@0.7.0:
     loader-utils "^1.1.0"
     source-map "0.5.0"
 
-expose-loader@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-1.0.3.tgz#5686d3b78cac8831c4af11c3dc361563deb8a9c0"
-  integrity sha512-gP6hs3vYeWIqyoVfsApGQcgCEpbcI1xe+celwI31zeDhXz2q03ycBC1+75IlQUGaYvj6rAloFIe/NIBnEElLsQ==
-  dependencies:
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
+expose-loader@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-4.0.0.tgz#aa6f06f57cbc904175de4fe4eaff6211337e0231"
+  integrity sha512-kUEvHyf6MPR2ubZCL9aziP9Br5wxMvq1cghTpYhM6MW52NPq+7hXixw2EqQuI1SvGb1fDjc2ehJOg6645wR6ww==
 
 express@^4.16.2, express@^4.17.1:
   version "4.17.2"

From ef41335b7bcef294b34a9c1d40c0d3edb95046a9 Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Tue, 11 Oct 2022 17:55:46 -0500
Subject: [PATCH 20/20] clarify expectations

---
 spec/system/add_new_comment_spec.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/spec/system/add_new_comment_spec.rb b/spec/system/add_new_comment_spec.rb
index dfa4e03d..05d55901 100644
--- a/spec/system/add_new_comment_spec.rb
+++ b/spec/system/add_new_comment_spec.rb
@@ -13,7 +13,7 @@
         click_link "Horizontal Form"
         submit_form
       }
-      it "this sucks" do
+      it "should have the submitted comment" do
         is_expected.to have_css(".js-comment-author", text: "Spicoli")
         is_expected.to have_css(".js-comment-text", text: "dude!")
         is_expected.to have_no_content("Your comment was not saved!")
@@ -31,7 +31,7 @@
         click_link "Inline Form"
         submit_form
       }
-      it "this sucks" do
+      it "should have the submitted comment" do
         is_expected.to have_css(".js-comment-author", text: "Spicoli")
         is_expected.to have_css(".js-comment-text", text: "dude!")
         is_expected.to have_no_content("Your comment was not saved!")
@@ -49,7 +49,7 @@
         click_link "Stacked Form"
         submit_form
       }
-      it "this sucks" do
+      it "should have the submitted comment" do
         is_expected.to have_css(".js-comment-author", text: "Spicoli")
         is_expected.to have_css(".js-comment-text", text: "dude!")
         is_expected.to have_no_content("Your comment was not saved!")
@@ -70,7 +70,7 @@
         click_link "Horizontal Form"
         submit_form
       }
-      it "this sucks" do
+      it "should have the submitted comment" do
         is_expected.to have_css(".js-comment-author", text: "Spicoli")
         is_expected.to have_css(".js-comment-text", text: "dude!")
         is_expected.to have_no_content("Your comment was not saved!")
@@ -89,7 +89,7 @@
         submit_form
       }
 
-      it "this sucks" do
+      it "should have the submitted comment" do
         is_expected.to have_css(".js-comment-author", text: "Spicoli")
         is_expected.to have_css(".js-comment-text", text: "dude!")
         is_expected.to have_no_content("Your comment was not saved!")
@@ -107,7 +107,7 @@
         click_link "Stacked Form"
         submit_form
       }
-      it "this sucks" do
+      it "should have the submitted comment" do
         is_expected.to have_css(".js-comment-author", text: "Spicoli")
         is_expected.to have_css(".js-comment-text", text: "dude!")
         is_expected.to have_no_content("Your comment was not saved!")
@@ -128,7 +128,7 @@
         click_link "Horizontal Form"
         submit_form
       }
-      it "this sucks" do
+      it "should have the submitted comment" do
         is_expected.to have_css(".js-comment-author", text: "Spicoli")
         is_expected.to have_css(".js-comment-text", text: "dude!")
         is_expected.to have_no_content("Your comment was not saved!")
@@ -145,7 +145,7 @@
         click_link "Inline Form"
         submit_form
       }
-      it "this sucks" do
+      it "should have the submitted comment" do
         is_expected.to have_css(".js-comment-author", text: "Spicoli")
         is_expected.to have_css(".js-comment-text", text: "dude!")
         is_expected.to have_no_content("Your comment was not saved!")
@@ -162,7 +162,7 @@
         click_link "Stacked Form"
         submit_form
       }
-      it "this sucks" do
+      it "should have the submitted comment" do
         is_expected.to have_css(".js-comment-author", text: "Spicoli")
         is_expected.to have_css(".js-comment-text", text: "dude!")
         is_expected.to have_no_content("Your comment was not saved!")