Skip to content

Commit

Permalink
Merge pull request #744 from Crown-Commercial-Service/OST-509-Update-…
Browse files Browse the repository at this point in the history
…Banner-Datetimes-For-G13

OST-509-Update-Banner-Datetimes-For-G13
  • Loading branch information
tberey authored Mar 1, 2022
2 parents 9da31ed + faafa59 commit a9bd62f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion dmutils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
from .flask_init import init_app


__version__ = '60.7.0'
__version__ = '60.7.1'
6 changes: 3 additions & 3 deletions dmutils/dmp_so_status.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from datetime import datetime

DOS6_OPEN = datetime(2022, 1, 14, 12, 0, 0)
DOS6_CLOSE = datetime(2022, 2, 24, 15, 0, 0)
G13_OPEN = datetime(2022, 3, 9, 10, 0, 0)
G13_CLOSE = datetime(2022, 5, 18, 15, 0, 0)


def are_new_frameworks_live(params) -> bool:
return DOS6_OPEN <= datetime.now() <= DOS6_CLOSE or params.get('show_dmp_so_banner') == 'true'
return G13_OPEN <= datetime.now() <= G13_CLOSE or params.get('show_dmp_so_banner') == 'true'
14 changes: 7 additions & 7 deletions tests/test_dmp_so_status.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@
from dmutils.dmp_so_status import are_new_frameworks_live


@freeze_time('2022-01-04')
@freeze_time('2022-03-08')
def test_should_be_false_if_before_go_live_date():
assert are_new_frameworks_live({}) is False


@freeze_time('2022-01-14 12:00:01')
@freeze_time('2022-03-09 12:00:01')
def test_should_be_true_if_on_go_live_date():
assert are_new_frameworks_live({}) is True


@freeze_time('2022-01-15')
@freeze_time('2022-03-10')
def test_should_be_true_if_after_go_live_date():
assert are_new_frameworks_live({}) is True


@freeze_time('2022-01-04')
@freeze_time('2022-03-08')
def test_should_be_true_if_before_date_and_go_live_param():
assert are_new_frameworks_live({'show_dmp_so_banner': 'true'}) is True


@freeze_time('2022-01-04')
@freeze_time('2022-03-08')
def test_should_be_false_if_before_date_and_not_go_live_param():
assert are_new_frameworks_live({'show_dmp_1.0_banner': 'true'}) is False


@freeze_time('2022-02-24 15:00:01')
def test_should_be_false_after_dos6_closes():
@freeze_time('2022-05-18 15:00:01')
def test_should_be_false_after_g13_closes():
assert are_new_frameworks_live({'show_dmp_1.0_banner': 'true'}) is False

0 comments on commit a9bd62f

Please sign in to comment.