From 363faffe0311e75b350d2eefdba599550d043b59 Mon Sep 17 00:00:00 2001
From: smph <david.sumner@civicactions.com>
Date: Tue, 19 Oct 2021 14:44:23 -0500
Subject: [PATCH 1/5] Added Cypress Install to Dockerfile

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index b031f59..32ca0a7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -57,6 +57,9 @@ ENV PATH /root/composer/vendor/bin:$PATH
 RUN curl -o ~/.git-completion.bash https://raw.githubusercontent.com/git/git/master/contrib/completion/git-completion.bash &&\
   curl -o ~/.git-prompt.sh https://raw.githubusercontent.com/git/git/master/contrib/completion/git-prompt.sh
 
+# Install Cypress
+RUN npm install cypress
+
 # Add local settings
 COPY php-cli.ini /usr/local/php/etc/fpm/conf.d/z_php.ini
 COPY bash.rc /root/.bashrc

From e0256921b641cb88757da2900d8cba236475964d Mon Sep 17 00:00:00 2001
From: smph <david.sumner@civicactions.com>
Date: Fri, 29 Oct 2021 10:21:10 -0500
Subject: [PATCH 2/5] Adding Cypress to CLI container

---
 Dockerfile   | 3 ++-
 package.json | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 package.json

diff --git a/Dockerfile b/Dockerfile
index 32ca0a7..bdf71d7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,7 +58,8 @@ RUN curl -o ~/.git-completion.bash https://raw.githubusercontent.com/git/git/mas
   curl -o ~/.git-prompt.sh https://raw.githubusercontent.com/git/git/master/contrib/completion/git-prompt.sh
 
 # Install Cypress
-RUN npm install cypress
+RUN npm --prefix ./ install cypress
+ENV PATH $PATH:/var/www/node_modules/cypress/bin
 
 # Add local settings
 COPY php-cli.ini /usr/local/php/etc/fpm/conf.d/z_php.ini
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..1f5a39e
--- /dev/null
+++ b/package.json
@@ -0,0 +1,7 @@
+"devDependencies": {
+    "@testing-library/cypress": "^6.0.0",
+    "@testing-library/dom": "^7.16.1",
+    "cypress": "^8.7.0",
+    "eslint-plugin-cypress": "^2.11.1"
+  }
+

From 8508fea636f73c32b5b63139eed7dcfe94d5ae16 Mon Sep 17 00:00:00 2001
From: smph <david.sumner@civicactions.com>
Date: Fri, 29 Oct 2021 14:13:01 -0500
Subject: [PATCH 3/5] Update testing lib version for Cypress

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1f5a39e..124eacd 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 "devDependencies": {
-    "@testing-library/cypress": "^6.0.0",
+    "@testing-library/cypress": "^8.0.1",
     "@testing-library/dom": "^7.16.1",
     "cypress": "^8.7.0",
     "eslint-plugin-cypress": "^2.11.1"

From 550a4356b3ccf49820d4fdc67797ff515c48bde3 Mon Sep 17 00:00:00 2001
From: Janette Day <janette.day@civicactions.com>
Date: Mon, 8 Nov 2021 13:39:51 -0600
Subject: [PATCH 4/5] Update package.json

---
 Dockerfile   |  4 ++--
 package.json | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bdf71d7..6b469d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -57,8 +57,8 @@ ENV PATH /root/composer/vendor/bin:$PATH
 RUN curl -o ~/.git-completion.bash https://raw.githubusercontent.com/git/git/master/contrib/completion/git-completion.bash &&\
   curl -o ~/.git-prompt.sh https://raw.githubusercontent.com/git/git/master/contrib/completion/git-prompt.sh
 
-# Install Cypress
-RUN npm --prefix ./ install cypress
+# Install Cypress and testing-library dependencies.
+RUN npm --prefix ./ install
 ENV PATH $PATH:/var/www/node_modules/cypress/bin
 
 # Add local settings
diff --git a/package.json b/package.json
index 124eacd..b1ed000 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,10 @@
-"devDependencies": {
+{
+  "dependencies": {
+    "@testing-library/jest-dom": "^4.2.4",
+    "@testing-library/react": "^9.3.2",
+    "@testing-library/user-event": "^7.1.2",
     "@testing-library/cypress": "^8.0.1",
     "@testing-library/dom": "^7.16.1",
-    "cypress": "^8.7.0",
-    "eslint-plugin-cypress": "^2.11.1"
+    "cypress": "^8.7.0"
   }
-
+}

From 185ce1a1b75d7ae6a79a2238442348443e7e7426 Mon Sep 17 00:00:00 2001
From: Janette Day <janette.day@civicactions.com>
Date: Thu, 16 Dec 2021 13:35:50 -0600
Subject: [PATCH 5/5] Keep cypress from jumping to 9.1

---
 package.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index b1ed000..bc7682f 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,9 @@
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.3.2",
     "@testing-library/user-event": "^7.1.2",
-    "@testing-library/cypress": "^8.0.1",
+    "@testing-library/cypress": "^6.0.0",
     "@testing-library/dom": "^7.16.1",
-    "cypress": "^8.7.0"
+    "cypress": "~8.7.0",
+    "eslint-plugin-cypress": "^2.11.1"
   }
 }