From c28e9451d47db8bdb028f03b9767f7dfde5ac39c Mon Sep 17 00:00:00 2001
From: Pea Tyczynska <CrystalPea@users.noreply.github.com>
Date: Thu, 8 Jul 2021 14:10:58 +0100
Subject: [PATCH] Bump moto version to try solve dependencies version conflict

Also update mock import statements in some test files as they
stopped working with this dependency update.
---
 requirements_for_test.txt                          | 2 +-
 tests/app/celery/test_scheduled_tasks.py           | 2 +-
 tests/app/dao/test_fact_notification_status_dao.py | 2 +-
 tests/app/user/test_rest.py                        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/requirements_for_test.txt b/requirements_for_test.txt
index c9862ea0a..36464b7b7 100644
--- a/requirements_for_test.txt
+++ b/requirements_for_test.txt
@@ -2,7 +2,7 @@
 flake8==3.8.4
 flake8-bugbear==20.11.1
 isort==5.7.0
-moto==1.3.16
+moto==2.0.11
 pytest==6.1.2
 pytest-env==0.6.2
 pytest-mock==3.3.1
diff --git a/tests/app/celery/test_scheduled_tasks.py b/tests/app/celery/test_scheduled_tasks.py
index 1d55d9e62..d72e6d544 100644
--- a/tests/app/celery/test_scheduled_tasks.py
+++ b/tests/app/celery/test_scheduled_tasks.py
@@ -1,10 +1,10 @@
 from collections import namedtuple
 from datetime import datetime, timedelta
+from unittest import mock
 from unittest.mock import call
 
 import pytest
 from freezegun import freeze_time
-from mock import mock
 
 from app.celery import scheduled_tasks
 from app.celery.scheduled_tasks import (
diff --git a/tests/app/dao/test_fact_notification_status_dao.py b/tests/app/dao/test_fact_notification_status_dao.py
index f807541a0..6fb2ae5e8 100644
--- a/tests/app/dao/test_fact_notification_status_dao.py
+++ b/tests/app/dao/test_fact_notification_status_dao.py
@@ -1,7 +1,7 @@
 from datetime import date, datetime, time, timedelta
+from unittest import mock
 from uuid import UUID
 
-import mock
 import pytest
 from freezegun import freeze_time
 
diff --git a/tests/app/user/test_rest.py b/tests/app/user/test_rest.py
index 290a55782..96f6401a8 100644
--- a/tests/app/user/test_rest.py
+++ b/tests/app/user/test_rest.py
@@ -1,8 +1,8 @@
 import json
 import uuid
 from datetime import datetime
+from unittest import mock
 
-import mock
 import pytest
 from flask import current_app, url_for
 from freezegun import freeze_time