Update atst to atat

This commit is contained in:
leigh-mil
2020-02-28 16:01:45 -05:00
parent 6eb48239cf
commit c2814416fb
215 changed files with 735 additions and 746 deletions

View File

@@ -2,9 +2,9 @@ from flask import url_for, get_flashed_messages
from tests.factories import *
from atst.domain.applications import Applications
from atst.domain.portfolios import Portfolios
from atst.models.portfolio_role import Status as PortfolioRoleStatus
from atat.domain.applications import Applications
from atat.domain.portfolios import Portfolios
from atat.models.portfolio_role import Status as PortfolioRoleStatus
from tests.utils import captured_templates

View File

@@ -7,8 +7,8 @@ from tests.factories import (
ApplicationRoleFactory,
)
from unittest.mock import Mock
from atst.forms.data import ENV_ROLE_NO_ACCESS as NO_ACCESS
from atst.models.application_invitation import ApplicationInvitation
from atat.forms.data import ENV_ROLE_NO_ACCESS as NO_ACCESS
from atat.models.application_invitation import ApplicationInvitation
def test_get_name_and_description_form(client, user_session):
@@ -134,7 +134,7 @@ def test_get_members(client, session, user_session):
def test_post_new_member(monkeypatch, client, user_session, session):
job_mock = Mock()
monkeypatch.setattr("atst.jobs.send_mail.delay", job_mock)
monkeypatch.setattr("atat.jobs.send_mail.delay", job_mock)
user = UserFactory.create()
application = ApplicationFactory.create(
environments=[{"name": "Naboo"}, {"name": "Endor"}]

View File

@@ -9,26 +9,26 @@ from tests.mock_azure import mock_azure
from tests.utils import captured_templates
from werkzeug.datastructures import ImmutableMultiDict
from atst.database import db
from atst.domain.application_roles import ApplicationRoles
from atst.domain.applications import Applications
from atst.domain.common import Paginator
from atst.domain.csp.cloud.azure_cloud_provider import AzureCloudProvider
from atst.domain.csp.cloud.exceptions import GeneralCSPException
from atst.domain.csp.cloud.models import (
from atat.database import db
from atat.domain.application_roles import ApplicationRoles
from atat.domain.applications import Applications
from atat.domain.common import Paginator
from atat.domain.csp.cloud.azure_cloud_provider import AzureCloudProvider
from atat.domain.csp.cloud.exceptions import GeneralCSPException
from atat.domain.csp.cloud.models import (
SubscriptionCreationCSPResult,
SubscriptionCreationCSPPayload,
)
from atst.domain.environment_roles import EnvironmentRoles
from atst.domain.invitations import ApplicationInvitations
from atst.domain.permission_sets import PermissionSets
from atst.forms.application import EditEnvironmentForm
from atst.forms.application_member import UpdateMemberForm
from atst.forms.data import ENV_ROLE_NO_ACCESS as NO_ACCESS
from atst.models.application_role import Status as ApplicationRoleStatus
from atst.models.environment_role import CSPRole, EnvironmentRole
from atst.models.permissions import Permissions
from atst.routes.applications.settings import (
from atat.domain.environment_roles import EnvironmentRoles
from atat.domain.invitations import ApplicationInvitations
from atat.domain.permission_sets import PermissionSets
from atat.forms.application import EditEnvironmentForm
from atat.forms.application_member import UpdateMemberForm
from atat.forms.data import ENV_ROLE_NO_ACCESS as NO_ACCESS
from atat.models.application_role import Status as ApplicationRoleStatus
from atat.models.environment_role import CSPRole, EnvironmentRole
from atat.models.permissions import Permissions
from atat.routes.applications.settings import (
build_subscription_payload,
filter_env_roles_data,
filter_env_roles_form_data,
@@ -390,7 +390,7 @@ def test_delete_environment(client, user_session):
def test_create_member(monkeypatch, client, user_session, session):
job_mock = Mock()
monkeypatch.setattr("atst.jobs.send_mail.delay", job_mock)
monkeypatch.setattr("atat.jobs.send_mail.delay", job_mock)
user = UserFactory.create()
application = ApplicationFactory.create(
environments=[{"name": "Naboo"}, {"name": "Endor"}]
@@ -667,8 +667,8 @@ def test_filter_env_roles_data():
@pytest.fixture
def set_g(monkeypatch):
_g = Mock()
monkeypatch.setattr("atst.app.g", _g)
monkeypatch.setattr("atst.routes.applications.settings.g", _g)
monkeypatch.setattr("atat.app.g", _g)
monkeypatch.setattr("atat.routes.applications.settings.g", _g)
def _set_g(attr, val):
setattr(_g, attr, val)
@@ -684,7 +684,7 @@ def test_handle_create_member(monkeypatch, set_g, session):
(env, env_1) = application.environments
job_mock = Mock()
monkeypatch.setattr("atst.jobs.send_mail.delay", job_mock)
monkeypatch.setattr("atat.jobs.send_mail.delay", job_mock)
set_g("current_user", application.portfolio.owner)
set_g("portfolio", application.portfolio)
set_g("application", application)
@@ -756,7 +756,7 @@ def test_handle_update_member_with_error(set_g, monkeypatch, mock_logger):
raise GeneralCSPException(exception)
monkeypatch.setattr(
"atst.domain.environments.Environments.update_env_role", _raise_csp_exception
"atat.domain.environments.Environments.update_env_role", _raise_csp_exception
)
user = UserFactory.create()
@@ -829,7 +829,7 @@ def test_create_subscription_failure(client, user_session, monkeypatch):
raise GeneralCSPException("An error occurred.")
monkeypatch.setattr(
"atst.domain.csp.cloud.MockCloudProvider.create_subscription",
"atat.domain.csp.cloud.MockCloudProvider.create_subscription",
_raise_csp_exception,
)

View File

@@ -2,12 +2,12 @@ import pytest
from flask import url_for
from unittest.mock import MagicMock
from atst.domain.permission_sets import PermissionSets
from atst.domain.portfolio_roles import PortfolioRoles
from atst.domain.portfolios import Portfolios
from atst.models.permissions import Permissions
from atst.models.portfolio_role import Status as PortfolioRoleStatus
from atst.utils.localization import translate
from atat.domain.permission_sets import PermissionSets
from atat.domain.portfolio_roles import PortfolioRoles
from atat.domain.portfolios import Portfolios
from atat.models.permissions import Permissions
from atat.models.portfolio_role import Status as PortfolioRoleStatus
from atat.utils.localization import translate
from tests.factories import PortfolioFactory, PortfolioRoleFactory, UserFactory

View File

@@ -9,9 +9,9 @@ from tests.factories import (
TaskOrderFactory,
UserFactory,
)
from atst.utils.localization import translate
from atst.domain.portfolios import Portfolios, PortfolioDeletionApplicationsExistError
from atst.domain.portfolios.query import PortfoliosQuery
from atat.utils.localization import translate
from atat.domain.portfolios import Portfolios, PortfolioDeletionApplicationsExistError
from atat.domain.portfolios.query import PortfoliosQuery
def test_new_portfolio(client, user_session):

View File

@@ -3,9 +3,9 @@ from unittest.mock import Mock
from flask import url_for
from atst.domain.portfolios import Portfolios
from atst.models import InvitationStatus, PortfolioRoleStatus
from atst.domain.permission_sets import PermissionSets
from atat.domain.portfolios import Portfolios
from atat.models import InvitationStatus, PortfolioRoleStatus
from atat.domain.permission_sets import PermissionSets
from tests.factories import *
@@ -45,7 +45,7 @@ def test_new_member_accepts_valid_invite(monkeypatch, client, user_session):
invite = PortfolioInvitationFactory.create(role=role, dod_id=user_info["dod_id"])
monkeypatch.setattr(
"atst.domain.auth.should_redirect_to_user_profile", lambda *args: False
"atat.domain.auth.should_redirect_to_user_profile", lambda *args: False
)
user_session(UserFactory.create(dod_id=user_info["dod_id"]))
response = client.get(
@@ -188,7 +188,7 @@ def test_user_can_only_resend_invites_in_their_portfolio(
monkeypatch, client, user_session
):
job_mock = Mock()
monkeypatch.setattr("atst.jobs.send_mail.delay", job_mock)
monkeypatch.setattr("atat.jobs.send_mail.delay", job_mock)
portfolio = PortfolioFactory.create()
other_portfolio = PortfolioFactory.create()
user = UserFactory.create()
@@ -216,7 +216,7 @@ def test_user_can_only_resend_invites_in_their_portfolio(
def test_resend_invitation_sends_email(monkeypatch, client, user_session):
job_mock = Mock()
monkeypatch.setattr("atst.jobs.send_mail.delay", job_mock)
monkeypatch.setattr("atat.jobs.send_mail.delay", job_mock)
user = UserFactory.create()
portfolio = PortfolioFactory.create()
portfolio_role = PortfolioRoleFactory.create(
@@ -264,7 +264,7 @@ def test_user_with_permission_has_add_member_link(client, user_session):
def test_invite_member(monkeypatch, client, user_session, session):
job_mock = Mock()
monkeypatch.setattr("atst.jobs.send_mail.delay", job_mock)
monkeypatch.setattr("atat.jobs.send_mail.delay", job_mock)
user_data = UserFactory.dictionary()
portfolio = PortfolioFactory.create()
user_session(portfolio.owner)

View File

@@ -1,12 +1,12 @@
from flask import url_for
import pytest
from atst.domain.permission_sets import PermissionSets
from atst.domain.task_orders import TaskOrders
from atst.models import *
from atst.models.portfolio_role import Status as PortfolioStatus
from atst.models.task_order import Status as TaskOrderStatus
from atst.utils.localization import translate
from atat.domain.permission_sets import PermissionSets
from atat.domain.task_orders import TaskOrders
from atat.models import *
from atat.models.portfolio_role import Status as PortfolioStatus
from atat.models.task_order import Status as TaskOrderStatus
from atat.utils.localization import translate
from tests.factories import *
from tests.utils import captured_templates

View File

@@ -3,9 +3,9 @@ from flask import url_for, get_flashed_messages
import pendulum
from uuid import uuid4
from atst.domain.task_orders import TaskOrders
from atst.models.task_order import Status as TaskOrderStatus
from atst.models import TaskOrder
from atat.domain.task_orders import TaskOrders
from atat.models.task_order import Status as TaskOrderStatus
from atat.models import TaskOrder
from tests.factories import CLINFactory, PortfolioFactory, TaskOrderFactory, UserFactory
from tests.utils import captured_templates

View File

@@ -1,7 +1,7 @@
from flask import url_for
from atst.domain.users import Users
from atst.utils.localization import translate
from atat.domain.users import Users
from atat.utils.localization import translate
from tests.factories import UserFactory

View File

@@ -1,7 +1,7 @@
import pytest
from flask import url_for
from atst.app import make_config, make_app
from atat.app import make_config, make_app
from tests.factories import UserFactory

View File

@@ -3,14 +3,14 @@ import pytest
from flask import url_for
from tests.factories import UserFactory
from atst.utils.localization import translate
from atat.utils.localization import translate
def test_home_route(client, user_session):
user = UserFactory.create()
user_session(user)
response = client.get(url_for("atst.home"))
response = client.get(url_for("atat.home"))
assert response.status_code == 200
assert translate("home.add_portfolio_button_text").encode("utf8") in response.data

View File

@@ -1,5 +1,5 @@
from tests.factories import UserFactory, PortfolioFactory
from atst.routes import match_url_pattern
from atat.routes import match_url_pattern
def test_root_redirects_if_user_is_logged_in(client, user_session):

View File

@@ -1,6 +1,6 @@
from flask import url_for
from atst.domain.users import Users
from atat.domain.users import Users
from tests.factories import UserFactory