From 3ea95622846442b98b7fcb63182ea1376beda89f Mon Sep 17 00:00:00 2001
From: Patrick Smith <patrick+dds@promptworks.com>
Date: Wed, 20 Feb 2019 18:17:16 -0500
Subject: [PATCH] Remove skipped tests

---
 atst/routes/__init__.py                      |  4 ----
 atst/utils/__init__.py                       | 18 ------------------
 tests/routes/portfolios/test_applications.py |  6 ++----
 tests/routes/portfolios/test_members.py      |  2 --
 tests/routes/test_home.py                    | 13 -------------
 5 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/atst/routes/__init__.py b/atst/routes/__init__.py
index e24ed7be..4183d8ac 100644
--- a/atst/routes/__init__.py
+++ b/atst/routes/__init__.py
@@ -57,10 +57,6 @@ def helpdocs(doc=None):
 @bp.route("/home")
 def home():
     user = g.current_user
-
-    if user.atat_role_name == "ccpo":
-        return redirect(url_for("requests.requests_index"))
-
     num_portfolios = len([role for role in user.portfolio_roles if role.is_active])
 
     if num_portfolios == 0:
diff --git a/atst/utils/__init__.py b/atst/utils/__init__.py
index 5852ebf4..e54b1a16 100644
--- a/atst/utils/__init__.py
+++ b/atst/utils/__init__.py
@@ -5,24 +5,6 @@ def first_or_none(predicate, lst):
     return next((x for x in lst if predicate(x)), None)
 
 
-def deep_merge(source, destination: dict):
-    """
-    Merge source dict into destination dict recursively.
-    """
-
-    def _deep_merge(a, b):
-        for key, value in a.items():
-            if isinstance(value, dict):
-                node = b.setdefault(key, {})
-                _deep_merge(value, node)
-            else:
-                b[key] = value
-
-        return b
-
-    return _deep_merge(source, dict(destination))
-
-
 def getattr_path(obj, path, default=None):
     _obj = obj
     for item in path.split("."):
diff --git a/tests/routes/portfolios/test_applications.py b/tests/routes/portfolios/test_applications.py
index 5fe52ddf..3d048e84 100644
--- a/tests/routes/portfolios/test_applications.py
+++ b/tests/routes/portfolios/test_applications.py
@@ -90,18 +90,16 @@ def test_user_without_permission_has_no_activity_log_link(client, user_session):
     )
 
 
-@pytest.mark.skip(reason="Temporarily no add application link")
 def test_user_with_permission_has_add_application_link(client, user_session):
     portfolio = PortfolioFactory.create()
     user_session(portfolio.owner)
     response = client.get("/portfolios/{}/applications".format(portfolio.id))
     assert (
-        'href="/portfolios/{}/applications/new"'.format(portfolio.id).encode()
+        "href='/portfolios/{}/applications/new'".format(portfolio.id).encode()
         in response.data
     )
 
 
-@pytest.mark.skip(reason="Temporarily no add application link")
 def test_user_without_permission_has_no_add_application_link(client, user_session):
     user = UserFactory.create()
     portfolio = PortfolioFactory.create()
@@ -109,7 +107,7 @@ def test_user_without_permission_has_no_add_application_link(client, user_sessio
     user_session(user)
     response = client.get("/portfolios/{}/applications".format(portfolio.id))
     assert (
-        'href="/portfolios/{}/applications/new"'.format(portfolio.id).encode()
+        "href='/portfolios/{}/applications/new'".format(portfolio.id).encode()
         not in response.data
     )
 
diff --git a/tests/routes/portfolios/test_members.py b/tests/routes/portfolios/test_members.py
index 58078f35..0deb6a06 100644
--- a/tests/routes/portfolios/test_members.py
+++ b/tests/routes/portfolios/test_members.py
@@ -37,7 +37,6 @@ def create_portfolio_and_invite_user(
     return portfolio
 
 
-@pytest.mark.skip(reason="Temporarily no add member link")
 def test_user_with_permission_has_add_member_link(client, user_session):
     portfolio = PortfolioFactory.create()
     user_session(portfolio.owner)
@@ -48,7 +47,6 @@ def test_user_with_permission_has_add_member_link(client, user_session):
     )
 
 
-@pytest.mark.skip(reason="Temporarily no add member link")
 def test_user_without_permission_has_no_add_member_link(client, user_session):
     user = UserFactory.create()
     portfolio = PortfolioFactory.create()
diff --git a/tests/routes/test_home.py b/tests/routes/test_home.py
index 3e749efb..a2eeba20 100644
--- a/tests/routes/test_home.py
+++ b/tests/routes/test_home.py
@@ -60,16 +60,3 @@ def test_non_owner_user_with_mulitple_portfolios_redirected_to_portfolios(
     alphabetically_first_portfolio = sorted(portfolios, key=lambda p: p.name)[0]
     assert "/portfolios" in response.location
     assert str(alphabetically_first_portfolio.id) in response.location
-
-
-@pytest.mark.skip(reason="this may no longer be accurate")
-def test_ccpo_user_redirected_to_requests(client, user_session):
-    user = UserFactory.from_atat_role("ccpo")
-    for _ in range(3):
-        portfolio = PortfolioFactory.create()
-        Portfolios._create_portfolio_role(user, portfolio, "developer")
-
-    user_session(user)
-    response = client.get("/home", follow_redirects=False)
-
-    assert "/requests" in response.location