From 2fee2e2f0c68a880c8c78e8d40edca1ecf29bf19 Mon Sep 17 00:00:00 2001
From: Matthew Shanley <matthewshanley@littlesecretsrecords.com>
Date: Wed, 11 Sep 2019 14:46:09 -0400
Subject: [PATCH] Revert "Revert "remove shuttle map flag (#186)" (#190)"

This reverts commit b3f3268b0a66236eb2fb0c8b443ea56340490ebe.
---
 assets/src/components/app.tsx                 | 13 ++++------
 assets/src/components/tabBar.tsx              | 25 ++++++++-----------
 .../appStateWrapper.test.tsx.snap             | 21 ++++++++++++++++
 assets/tests/components/tabBar.test.tsx       | 16 ++++++++++++
 config/config.exs                             |  1 -
 5 files changed, 53 insertions(+), 23 deletions(-)
 create mode 100644 assets/tests/components/tabBar.test.tsx

diff --git a/assets/src/components/app.tsx b/assets/src/components/app.tsx
index 09fbe508a..0c2f47dba 100644
--- a/assets/src/components/app.tsx
+++ b/assets/src/components/app.tsx
@@ -1,7 +1,6 @@
 import React, { ReactElement, useContext } from "react"
 import { BrowserRouter, Route as BrowserRoute } from "react-router-dom"
 import { StateDispatchContext } from "../contexts/stateDispatchContext"
-import featureIsEnabled from "../laboratoryFeatures"
 import AboutPage from "./aboutPage"
 import LadderPage from "./ladderPage"
 import SettingsPage from "./settingsPage"
@@ -16,13 +15,11 @@ const App = (): ReactElement<HTMLDivElement> => {
       <div className="m-app">
         <TabBar pickerContainerIsVisible={pickerContainerIsVisible} />
         <BrowserRoute exact={true} path="/" component={LadderPage} />
-        {featureIsEnabled("shuttle_map") && (
-          <BrowserRoute
-            exact={true}
-            path="/shuttle-map"
-            component={ShuttleMapPage}
-          />
-        )}
+        <BrowserRoute
+          exact={true}
+          path="/shuttle-map"
+          component={ShuttleMapPage}
+        />
         <BrowserRoute exact={true} path="/settings" component={SettingsPage} />
         <BrowserRoute path="/about" component={AboutPage} />
       </div>
diff --git a/assets/src/components/tabBar.tsx b/assets/src/components/tabBar.tsx
index 58839f0da..d686f9f7a 100644
--- a/assets/src/components/tabBar.tsx
+++ b/assets/src/components/tabBar.tsx
@@ -1,6 +1,5 @@
 import React, { ReactElement } from "react"
 import { NavLink } from "react-router-dom"
-import featureIsEnabled from "../laboratoryFeatures"
 
 interface Props {
   pickerContainerIsVisible: boolean
@@ -25,19 +24,17 @@ const TabBar = ({
           {ladderIcon}
         </NavLink>
       </li>
-      {featureIsEnabled("shuttle_map") && (
-        <li>
-          <NavLink
-            activeClassName="m-tab-bar__link--active"
-            className="m-tab-bar__link"
-            exact={true}
-            title="Shuttle Map"
-            to="/shuttle-map"
-          >
-            {mapIcon}
-          </NavLink>
-        </li>
-      )}
+      <li>
+        <NavLink
+          activeClassName="m-tab-bar__link--active"
+          className="m-tab-bar__link"
+          exact={true}
+          title="Shuttle Map"
+          to="/shuttle-map"
+        >
+          {mapIcon}
+        </NavLink>
+      </li>
 
       <li>
         <NavLink
diff --git a/assets/tests/components/__snapshots__/appStateWrapper.test.tsx.snap b/assets/tests/components/__snapshots__/appStateWrapper.test.tsx.snap
index 5b8c37832..b19643456 100644
--- a/assets/tests/components/__snapshots__/appStateWrapper.test.tsx.snap
+++ b/assets/tests/components/__snapshots__/appStateWrapper.test.tsx.snap
@@ -47,6 +47,27 @@ exports[`renders 1`] = `
           </svg>
         </a>
       </li>
+      <li>
+        <a
+          aria-current={null}
+          className="m-tab-bar__link"
+          href="/shuttle-map"
+          onClick={[Function]}
+          title="Shuttle Map"
+        >
+          <svg
+            height="22"
+            viewBox="0 0 24 22"
+            width="24"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              className="m-tab-bar__icon"
+              d="M23,0 C23.5522847,0 24,0.44771525 24,1 L24,21 C24,21.5522847 23.5522847,22 23,22 L1,22 C0.44771525,22 0,21.5522847 0,21 L0,1 C0,0.44771525 0.44771525,0 1,0 L23,0 Z M1,1.029 L1,21 L2.235,21 L8.54273969,3.6527516 L1,1.029 Z M9.37373969,13.0727516 L6.491,21 L23,21 L23,18.71 L9.37373969,13.0727516 Z M23,2.589 L18.6237397,13.6527516 L23,15.463 L23,2.589 Z M22.756,1 L13.764,1 L12.6627397,4.0277516 L12.6642603,4.0277516 L12.3357397,4.9722484 L12.3207397,4.9667516 L10.3997397,10.2507516 L17.8737397,13.3427516 L22.756,1 Z M9.507,1 L3.962,1 L8.88473969,2.7127516 L9.507,1 Z"
+            />
+          </svg>
+        </a>
+      </li>
       <li>
         <a
           aria-current={null}
diff --git a/assets/tests/components/tabBar.test.tsx b/assets/tests/components/tabBar.test.tsx
new file mode 100644
index 000000000..c365f4661
--- /dev/null
+++ b/assets/tests/components/tabBar.test.tsx
@@ -0,0 +1,16 @@
+import { mount } from "enzyme"
+import React from "react"
+import { BrowserRouter } from "react-router-dom"
+import TabBar from "../../src/components/tabBar"
+
+describe("tabBar", () => {
+  it("sets class to hidden when picker is hidden", () => {
+    const wrapper = mount(
+      <BrowserRouter>
+        <TabBar pickerContainerIsVisible={false} />
+      </BrowserRouter>
+    )
+    expect(wrapper.find(".m-tab-bar").hasClass("hidden")).toBe(true)
+    expect(wrapper.find(".m-tab-bar").hasClass("visible")).toBe(false)
+  })
+})
diff --git a/config/config.exs b/config/config.exs
index 67e62ba52..65134c4af 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -37,7 +37,6 @@ config :laboratory,
   features: [
     {:headway_ladder_colors, "Headway Route Ladder Colors",
      "Turns on colored headway spacing lines on key route route ladders showing when service is bunched or gapped."},
-    {:shuttle_map, "Shuttle Map", ""},
     {:ghost_buses, "Ghost Buses", "Displays ghost buses on route ladders"}
   ],
   cookie: [