From 9dc22d8295f0e8e9f2e3fc2fad1473693e6fc233 Mon Sep 17 00:00:00 2001
From: Tyler Matteo <tylermatteo434@gmail.com>
Date: Mon, 9 Dec 2024 15:41:37 -0500
Subject: [PATCH 1/5] Add timeout and test environment app.import call

---
 client/ember-cli-build.js | 11 +++++++++--
 client/testem.js          |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/client/ember-cli-build.js b/client/ember-cli-build.js
index 712b5d05d..0d5e60ce2 100644
--- a/client/ember-cli-build.js
+++ b/client/ember-cli-build.js
@@ -46,11 +46,18 @@ module.exports = function(defaults) {
       },
     },
   });
-
+  if (app.env === 'development') {
+    // Only import when in development mode
+    app.import('node_modules/foundation-sites/dist/js/foundation.min.js', {type: "vendor"});
+  }
+  if (app.env === 'test') {
+    // Only import in test mode and place in test-support.js
+    app.import('node_modules/foundation-sites/dist/js/foundation.js', {type: "test"});
+  }
   // Use `app.import` to add additional libraries to the generated
   // output files.
   //
-  app.import('node_modules/foundation-sites/dist/js/foundation.min.js', { type: 'vendor' });
+  // app.import('node_modules/foundation-sites/dist/js/foundation.min.js');
   // If you need to use different assets in different
   // environments, specify an object as the first parameter. That
   // object's keys should be the environment name and the values
diff --git a/client/testem.js b/client/testem.js
index 8c0098c9d..efc2ddd1c 100644
--- a/client/testem.js
+++ b/client/testem.js
@@ -9,6 +9,7 @@ module.exports = {
   launch_in_dev: [
     'Chrome',
   ],
+  browser_start_timeout: 120,
   browser_args: {
     Chrome: {
       mode: 'ci',

From a800892b23b0232098fa353ab7d341285eb741c5 Mon Sep 17 00:00:00 2001
From: Tyler Matteo <tylermatteo434@gmail.com>
Date: Mon, 9 Dec 2024 16:45:03 -0500
Subject: [PATCH 2/5] Comment out info modal

---
 client/app/templates/application.hbs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/app/templates/application.hbs b/client/app/templates/application.hbs
index 58d8cf520..2b32191b7 100644
--- a/client/app/templates/application.hbs
+++ b/client/app/templates/application.hbs
@@ -57,13 +57,13 @@
 </div>
 
 
-<div id="info-modal-container">
-</div>
+{{!-- <div id="info-modal-container">
+</div> --}}
 <div id="reveal-modal-container">
 </div>
-{{#ember-wormhole to="info-modal-container"}}
+{{!-- {{#ember-wormhole to="info-modal-container"}}
   {{info-modal}}
-{{/ember-wormhole}}
+{{/ember-wormhole}} --}}
 
 
 {{#if (string-includes currentRouteName "my-projects")}}

From 12753ea9d67bb3d05ee86e8429644b3a7b981f5f Mon Sep 17 00:00:00 2001
From: Tyler Matteo <tylermatteo434@gmail.com>
Date: Tue, 10 Dec 2024 10:09:22 -0500
Subject: [PATCH 3/5] Update app.import logic and uncomment info modal

---
 client/app/templates/application.hbs |  8 ++++----
 client/ember-cli-build.js            | 13 ++++---------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/client/app/templates/application.hbs b/client/app/templates/application.hbs
index 2b32191b7..58d8cf520 100644
--- a/client/app/templates/application.hbs
+++ b/client/app/templates/application.hbs
@@ -57,13 +57,13 @@
 </div>
 
 
-{{!-- <div id="info-modal-container">
-</div> --}}
+<div id="info-modal-container">
+</div>
 <div id="reveal-modal-container">
 </div>
-{{!-- {{#ember-wormhole to="info-modal-container"}}
+{{#ember-wormhole to="info-modal-container"}}
   {{info-modal}}
-{{/ember-wormhole}} --}}
+{{/ember-wormhole}}
 
 
 {{#if (string-includes currentRouteName "my-projects")}}
diff --git a/client/ember-cli-build.js b/client/ember-cli-build.js
index 0d5e60ce2..48b76501f 100644
--- a/client/ember-cli-build.js
+++ b/client/ember-cli-build.js
@@ -46,18 +46,13 @@ module.exports = function(defaults) {
       },
     },
   });
-  if (app.env === 'development') {
-    // Only import when in development mode
-    app.import('node_modules/foundation-sites/dist/js/foundation.min.js', {type: "vendor"});
-  }
+  // Use `app.import` to add additional libraries to the generated
+  // output files.
   if (app.env === 'test') {
-    // Only import in test mode and place in test-support.js
     app.import('node_modules/foundation-sites/dist/js/foundation.js', {type: "test"});
+  } else {
+    app.import('node_modules/foundation-sites/dist/js/foundation.min.js', {type: "vendor"});
   }
-  // Use `app.import` to add additional libraries to the generated
-  // output files.
-  //
-  // app.import('node_modules/foundation-sites/dist/js/foundation.min.js');
   // If you need to use different assets in different
   // environments, specify an object as the first parameter. That
   // object's keys should be the environment name and the values

From 3ef58ab90731158374f30f132b112896500562d8 Mon Sep 17 00:00:00 2001
From: David Hochbaum <dhochbaum@planning.nyc.gov>
Date: Tue, 10 Dec 2024 11:43:12 -0500
Subject: [PATCH 4/5] Hide the modal by default in tests index.html

---
 client/tests/index.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/tests/index.html b/client/tests/index.html
index e94d6dd62..0f4756e26 100644
--- a/client/tests/index.html
+++ b/client/tests/index.html
@@ -7,6 +7,8 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <script>
+      window.localStorage.hideMessage = true;
+      
       window['_fs_host'] = 'fullstory.com';
       window['_fs_script'] = 'edge.fullstory.com/s/fs.js';
       window['_fs_org'] = 'o-19S9J2-na1';

From 96363eadb2f1c22b18a6fc9543ac9f818b6e16e1 Mon Sep 17 00:00:00 2001
From: David Hochbaum <dhochbaum@planning.nyc.gov>
Date: Tue, 10 Dec 2024 12:08:28 -0500
Subject: [PATCH 5/5] Added comments documenting modal hiding in tests

---
 client/app/components/info-modal.js | 1 +
 client/tests/index.html             | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/app/components/info-modal.js b/client/app/components/info-modal.js
index 94a6c67f6..39719fa44 100644
--- a/client/app/components/info-modal.js
+++ b/client/app/components/info-modal.js
@@ -2,6 +2,7 @@ import Component from '@ember/component';
 import { action } from '@ember/object';
 
 export default class InfoModalComponent extends Component {
+  // We have manually overridden this to hide the modal by default when running tests in tests/index.html
   open = !window.localStorage.hideMessage;
 
   dontShowModalAgain = false;
diff --git a/client/tests/index.html b/client/tests/index.html
index 0f4756e26..20f91a63f 100644
--- a/client/tests/index.html
+++ b/client/tests/index.html
@@ -7,8 +7,9 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <script>
+      // The below hides the default modal from showing when running tests
       window.localStorage.hideMessage = true;
-      
+
       window['_fs_host'] = 'fullstory.com';
       window['_fs_script'] = 'edge.fullstory.com/s/fs.js';
       window['_fs_org'] = 'o-19S9J2-na1';