Merge branch 'staging' into remove-delete-functionality

tests/routes/applications/test_settings.py

@@ -52,8 +52,6 @@ def test_updating_application_environments_success(client, user_session):
         _external=True,
         fragment="application-environments",
         _anchor="application-environments",
-        active_toggler=environment.id,
-        active_toggler_section="edit",
     )
     assert environment.name == "new name a"
 
@@ -78,6 +76,24 @@ def test_update_environment_failure(client, user_session):
     assert environment.name == "original name"
 
 
+def test_enforces_unique_env_name(client, user_session, session):
+    application = ApplicationFactory.create()
+    user = application.portfolio.owner
+    name = "New Environment"
+    environment = EnvironmentFactory.create(application=application, name=name)
+    form_data = {"name": name}
+    user_session(user)
+
+    session.begin_nested()
+    response = client.post(
+        url_for("applications.new_environment", application_id=application.id),
+        data=form_data,
+    )
+    session.rollback()
+
+    assert response.status_code == 400
+
+
 def test_application_settings(client, user_session):
     portfolio = PortfolioFactory.create()
     application = Applications.create(
@@ -258,6 +274,23 @@ def test_user_without_permission_cannot_update_application(client, user_session)
     assert application.description == "Cool stuff happening here!"
 
 
+def test_update_application_enforces_unique_name(client, user_session, session):
+    portfolio = PortfolioFactory.create()
+    name = "Test Application"
+    application = ApplicationFactory.create(portfolio=portfolio, name=name)
+    dupe_application = ApplicationFactory.create(portfolio=portfolio)
+    user_session(portfolio.owner)
+
+    session.begin_nested()
+    response = client.post(
+        url_for("applications.update", application_id=dupe_application.id),
+        data={"name": name, "description": dupe_application.description},
+    )
+    session.rollback()
+
+    assert response.status_code == 400
+
+
 def test_user_can_only_access_apps_in_their_portfolio(client, user_session):
     portfolio = PortfolioFactory.create()
     other_portfolio = PortfolioFactory.create(