From b5571000fe6142bd9d7055e5e9c6d78bf809e6f4 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Tue, 26 Mar 2019 10:33:20 -0400 Subject: [PATCH] Update tests - remove references to Workspace, use url_for, and check to make sure time_updated does not change on the application --- tests/routes/portfolios/test_applications.py | 9 +++++++-- tests/routes/portfolios/test_invitations.py | 8 ++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tests/routes/portfolios/test_applications.py b/tests/routes/portfolios/test_applications.py index e8db5d2f..cc6a0f73 100644 --- a/tests/routes/portfolios/test_applications.py +++ b/tests/routes/portfolios/test_applications.py @@ -173,11 +173,16 @@ def test_user_can_only_access_apps_in_their_portfolio(client, user_session): # user can't view application edit form response = client.get( - "/portfolios/{}/applications/{}/edit".format(portfolio.id, other_application.id) + url_for( + "portfolios.edit_application", + portfolio_id=portfolio.id, + application_id=other_application.id, + ) ) assert response.status_code == 404 # user can't post update application form + time_updated = other_application.time_updated response = client.post( url_for( "portfolios.update_application", @@ -185,9 +190,9 @@ def test_user_can_only_access_apps_in_their_portfolio(client, user_session): application_id=other_application.id, ), data={"name": "New Name", "description": "A new description."}, - follow_redirects=True, ) assert response.status_code == 404 + assert time_updated == other_application.time_updated # user can't view application members response = client.get( diff --git a/tests/routes/portfolios/test_invitations.py b/tests/routes/portfolios/test_invitations.py index cee8363f..4baa895c 100644 --- a/tests/routes/portfolios/test_invitations.py +++ b/tests/routes/portfolios/test_invitations.py @@ -173,12 +173,12 @@ def test_user_can_only_revoke_invites_in_their_portfolio(client, user_session): portfolio = PortfolioFactory.create() other_portfolio = PortfolioFactory.create() user = UserFactory.create() - ws_role = PortfolioRoleFactory.create( + portfolio_role = PortfolioRoleFactory.create( user=user, portfolio=other_portfolio, status=PortfolioRoleStatus.PENDING ) invite = InvitationFactory.create( user_id=user.id, - portfolio_role=ws_role, + portfolio_role=portfolio_role, status=InvitationStatus.REJECTED_EXPIRED, expiration_time=datetime.datetime.now() - datetime.timedelta(seconds=1), ) @@ -199,12 +199,12 @@ def test_user_can_only_resend_invites_in_their_portfolio(client, user_session, q portfolio = PortfolioFactory.create() other_portfolio = PortfolioFactory.create() user = UserFactory.create() - ws_role = PortfolioRoleFactory.create( + portfolio_role = PortfolioRoleFactory.create( user=user, portfolio=other_portfolio, status=PortfolioRoleStatus.PENDING ) invite = InvitationFactory.create( user_id=user.id, - portfolio_role=ws_role, + portfolio_role=portfolio_role, status=InvitationStatus.REJECTED_EXPIRED, expiration_time=datetime.datetime.now() - datetime.timedelta(seconds=1), )