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

@@ -1,7 +1,7 @@
from atst.database import db
from atat.database import db
from tests.factories import UserFactory
from atst.models.mixins.auditable import AuditableMixin
from atst.domain.users import Users
from atat.models.mixins.auditable import AuditableMixin
from atat.domain.users import Users
def test_logging_audit_event_on_create(mock_logger):

View File

@@ -1,8 +1,8 @@
import pytest
from atst.domain.application_roles import ApplicationRoles
from atst.models import ApplicationRoleStatus
from atst.models import AuditEvent
from atat.domain.application_roles import ApplicationRoles
from atat.models import ApplicationRoleStatus
from atat.models import AuditEvent
from tests.factories import (
ApplicationFactory,

View File

@@ -1,9 +1,9 @@
import pytest
import pendulum
from atst.domain.permission_sets import PermissionSets
from atst.domain.environment_roles import EnvironmentRoles
from atst.models.audit_event import AuditEvent
from atat.domain.permission_sets import PermissionSets
from atat.domain.environment_roles import EnvironmentRoles
from atat.models.audit_event import AuditEvent
from tests.factories import *

View File

@@ -1,5 +1,5 @@
from atst.models import CLIN
from atst.models.clin import JEDICLINType
from atat.models import CLIN
from atat.models.clin import JEDICLINType
from tests.factories import *

View File

@@ -1,9 +1,9 @@
import pytest
from atst.models import AuditEvent
from atst.models.environment_role import CSPRole
from atst.domain.applications import Applications
from atst.domain.environment_roles import EnvironmentRoles
from atat.models import AuditEvent
from atat.models.environment_role import CSPRole
from atat.domain.applications import Applications
from atat.domain.environment_roles import EnvironmentRoles
from tests.factories import *

View File

@@ -1,6 +1,6 @@
import pendulum
from atst.models import InvitationStatus, PortfolioRoleStatus
from atat.models import InvitationStatus, PortfolioRoleStatus
from tests.factories import (
PortfolioInvitationFactory,

View File

@@ -1,15 +1,15 @@
import pytest
import pendulum
from atst.domain.environments import Environments
from atst.domain.portfolios import Portfolios
from atst.domain.portfolio_roles import PortfolioRoles
from atst.domain.applications import Applications
from atst.domain.permission_sets import PermissionSets
from atst.models import AuditEvent, InvitationStatus, PortfolioRoleStatus, CSPRole
from atat.domain.environments import Environments
from atat.domain.portfolios import Portfolios
from atat.domain.portfolio_roles import PortfolioRoles
from atat.domain.applications import Applications
from atat.domain.permission_sets import PermissionSets
from atat.models import AuditEvent, InvitationStatus, PortfolioRoleStatus, CSPRole
from tests.factories import *
from atst.domain.portfolio_roles import PortfolioRoles
from atat.domain.portfolio_roles import PortfolioRoles
@pytest.mark.audit_log

View File

@@ -4,9 +4,9 @@ import pendulum
from unittest.mock import patch, PropertyMock
import pendulum
from atst.models import *
from atst.models.clin import JEDICLINType
from atst.models.task_order import TaskOrder, Status
from atat.models import *
from atat.models.clin import JEDICLINType
from atat.models.task_order import TaskOrder, Status
from tests.factories import CLINFactory, TaskOrderFactory
from tests.mocks import PDF_FILENAME
@@ -72,8 +72,8 @@ def test_clin_sorting():
class TestTaskOrderStatus:
@patch("atst.models.TaskOrder.is_completed", new_callable=PropertyMock)
@patch("atst.models.TaskOrder.is_signed", new_callable=PropertyMock)
@patch("atat.models.TaskOrder.is_completed", new_callable=PropertyMock)
@patch("atat.models.TaskOrder.is_signed", new_callable=PropertyMock)
def test_draft_status(self, is_signed, is_completed):
# Given that I have a TO that is neither completed nor signed
to = TaskOrderFactory.create()
@@ -82,10 +82,10 @@ class TestTaskOrderStatus:
assert to.status == Status.DRAFT
@patch("atst.models.TaskOrder.end_date", new_callable=PropertyMock)
@patch("atst.models.TaskOrder.start_date", new_callable=PropertyMock)
@patch("atst.models.TaskOrder.is_completed", new_callable=PropertyMock)
@patch("atst.models.TaskOrder.is_signed", new_callable=PropertyMock)
@patch("atat.models.TaskOrder.end_date", new_callable=PropertyMock)
@patch("atat.models.TaskOrder.start_date", new_callable=PropertyMock)
@patch("atat.models.TaskOrder.is_completed", new_callable=PropertyMock)
@patch("atat.models.TaskOrder.is_signed", new_callable=PropertyMock)
def test_active_status(self, is_signed, is_completed, start_date, end_date):
today = pendulum.today(tz="UTC").date()
@@ -110,10 +110,10 @@ class TestTaskOrderStatus:
assert to_2.status == Status.ACTIVE
@patch("atst.models.TaskOrder.end_date", new_callable=PropertyMock)
@patch("atst.models.TaskOrder.start_date", new_callable=PropertyMock)
@patch("atst.models.TaskOrder.is_completed", new_callable=PropertyMock)
@patch("atst.models.TaskOrder.is_signed", new_callable=PropertyMock)
@patch("atat.models.TaskOrder.end_date", new_callable=PropertyMock)
@patch("atat.models.TaskOrder.start_date", new_callable=PropertyMock)
@patch("atat.models.TaskOrder.is_completed", new_callable=PropertyMock)
@patch("atat.models.TaskOrder.is_signed", new_callable=PropertyMock)
def test_upcoming_status(self, is_signed, is_completed, start_date, end_date):
# Given that I have a signed TO and today is before its start_date
to = TaskOrderFactory.create()
@@ -125,10 +125,10 @@ class TestTaskOrderStatus:
# Its status should be upcoming
assert to.status == Status.UPCOMING
@patch("atst.models.TaskOrder.start_date", new_callable=PropertyMock)
@patch("atst.models.TaskOrder.end_date", new_callable=PropertyMock)
@patch("atst.models.TaskOrder.is_completed", new_callable=PropertyMock)
@patch("atst.models.TaskOrder.is_signed", new_callable=PropertyMock)
@patch("atat.models.TaskOrder.start_date", new_callable=PropertyMock)
@patch("atat.models.TaskOrder.end_date", new_callable=PropertyMock)
@patch("atat.models.TaskOrder.is_completed", new_callable=PropertyMock)
@patch("atat.models.TaskOrder.is_signed", new_callable=PropertyMock)
def test_expired_status(self, is_signed, is_completed, end_date, start_date):
# Given that I have a signed TO and today is after its expiration date
to = TaskOrderFactory.create()
@@ -140,8 +140,8 @@ class TestTaskOrderStatus:
# Its status should be expired
assert to.status == Status.EXPIRED
@patch("atst.models.TaskOrder.is_completed", new_callable=PropertyMock)
@patch("atst.models.TaskOrder.is_signed", new_callable=PropertyMock)
@patch("atat.models.TaskOrder.is_completed", new_callable=PropertyMock)
@patch("atat.models.TaskOrder.is_signed", new_callable=PropertyMock)
def test_unsigned_status(self, is_signed, is_completed):
# Given that I have a TO that is completed but not signed
to = TaskOrder(signed_at=pendulum.now().subtract(days=1))

View File

@@ -2,9 +2,9 @@ import pytest
from sqlalchemy.exc import InternalError
import pendulum
from atst.database import db
from atst.domain.users import Users
from atst.models.user import User
from atat.database import db
from atat.domain.users import Users
from atat.models.user import User
from tests.factories import UserFactory, ApplicationFactory, ApplicationRoleFactory

View File

@@ -1,7 +1,7 @@
from threading import Thread
from atst.domain.exceptions import ClaimFailedException
from atst.models.utils import claim_for_update, claim_many_for_update
from atat.domain.exceptions import ClaimFailedException
from atat.models.utils import claim_for_update, claim_many_for_update
from tests.factories import EnvironmentFactory