diff --git a/tests/api/endpoints/admin/test_institution_users.py b/tests/api/endpoints/admin/test_institution_users.py index 463f96a5b8a..ec7603ba08e 100644 --- a/tests/api/endpoints/admin/test_institution_users.py +++ b/tests/api/endpoints/admin/test_institution_users.py @@ -8,11 +8,6 @@ from seahub.institutions.models import Institution from seahub.profile.models import Profile -try: - from seahub.settings import LOCAL_PRO_DEV_ENV -except ImportError: - LOCAL_PRO_DEV_ENV = False - logger = logging.getLogger(__name__) @@ -31,12 +26,9 @@ def _delete_institution(self, name=''): except Exception as e: logger.error(e) - @patch('seahub.api2.endpoints.admin.institution_users.IsProVersion') + @patch('seahub.api2.permissions.IsProVersion.has_permission') def test_can_get(self, mock_is_pro_version): - if not LOCAL_PRO_DEV_ENV: - return - mock_is_pro_version.return_value = True self.login_as(self.admin) @@ -50,12 +42,9 @@ def test_can_get(self, mock_is_pro_version): inst.delete() - @patch('seahub.api2.endpoints.admin.institution_users.IsProVersion') + @patch('seahub.api2.permissions.IsProVersion.has_permission') def test_no_permission(self, mock_is_pro_version): - if not LOCAL_PRO_DEV_ENV: - return - mock_is_pro_version.return_value = True self.logout() @@ -66,12 +55,9 @@ def test_no_permission(self, mock_is_pro_version): self.assertEqual(403, resp.status_code) - @patch('seahub.api2.endpoints.admin.institution_users.IsProVersion') + @patch('seahub.api2.permissions.IsProVersion.has_permission') def test_can_create(self, mock_is_pro_version): - if not LOCAL_PRO_DEV_ENV: - return - mock_is_pro_version.return_value = True self.login_as(self.admin) @@ -111,12 +97,9 @@ def _add_user_in_institution(self, email, inst_name): profile.institution = inst_name profile.save() - @patch('seahub.api2.endpoints.admin.institution_users.IsProVersion') + @patch('seahub.api2.permissions.IsProVersion.has_permission') def test_can_update(self, mock_is_pro_version): - if not LOCAL_PRO_DEV_ENV: - return - mock_is_pro_version.return_value = True self.login_as(self.admin) @@ -133,12 +116,9 @@ def test_can_update(self, mock_is_pro_version): inst.delete() - @patch('seahub.api2.endpoints.admin.institution_users.IsProVersion') + @patch('seahub.api2.permissions.IsProVersion.has_permission') def test_can_delete(self, mock_is_pro_version): - if not LOCAL_PRO_DEV_ENV: - return - mock_is_pro_version.return_value = True self.login_as(self.admin) diff --git a/tests/api/endpoints/admin/test_institutions.py b/tests/api/endpoints/admin/test_institutions.py index dbae18a311c..42396447501 100644 --- a/tests/api/endpoints/admin/test_institutions.py +++ b/tests/api/endpoints/admin/test_institutions.py @@ -8,11 +8,6 @@ from tests.common.utils import randstring from seahub.institutions.models import Institution -try: - from seahub.settings import LOCAL_PRO_DEV_ENV -except ImportError: - LOCAL_PRO_DEV_ENV = False - logger = logging.getLogger(__name__) @@ -31,12 +26,9 @@ def _delete_institution(self, name=''): except Exception as e: logger.error(e) - @patch('seahub.api2.endpoints.admin.institutions.IsProVersion') + @patch('seahub.api2.permissions.IsProVersion.has_permission') def test_can_get(self, mock_is_pro_version): - if not LOCAL_PRO_DEV_ENV: - return - mock_is_pro_version.return_value = True self.login_as(self.admin) @@ -51,12 +43,9 @@ def test_can_get(self, mock_is_pro_version): inst.delete() - @patch('seahub.api2.endpoints.admin.institutions.IsProVersion') + @patch('seahub.api2.permissions.IsProVersion.has_permission') def test_no_permission(self, mock_is_pro_version): - if not LOCAL_PRO_DEV_ENV: - return - mock_is_pro_version.return_value = True self.logout() @@ -68,12 +57,9 @@ def test_no_permission(self, mock_is_pro_version): self.assertEqual(403, resp.status_code) inst.delete() - @patch('seahub.api2.endpoints.admin.institutions.IsProVersion') + @patch('seahub.api2.permissions.IsProVersion.has_permission') def test_can_create(self, mock_is_pro_version): - if not LOCAL_PRO_DEV_ENV: - return - mock_is_pro_version.return_value = True self.login_as(self.admin) @@ -107,12 +93,9 @@ def _delete_institution(self, name=''): except Exception as e: logger.error(e) - @patch('seahub.api2.endpoints.admin.institutions.IsProVersion') + @patch('seahub.api2.permissions.IsProVersion.has_permission') def test_can_get(self, mock_is_pro_version): - if not LOCAL_PRO_DEV_ENV: - return - mock_is_pro_version.return_value = True self.login_as(self.admin) @@ -128,12 +111,9 @@ def test_can_get(self, mock_is_pro_version): inst.delete() - @patch('seahub.api2.endpoints.admin.institutions.IsProVersion') + @patch('seahub.api2.permissions.IsProVersion.has_permission') def test_can_update(self, mock_is_pro_version): - if not LOCAL_PRO_DEV_ENV: - return - mock_is_pro_version.return_value = True self.login_as(self.admin) @@ -150,12 +130,9 @@ def test_can_update(self, mock_is_pro_version): inst.delete() - @patch('seahub.api2.endpoints.admin.institutions.IsProVersion') + @patch('seahub.api2.permissions.IsProVersion.has_permission') def test_can_delete(self, mock_is_pro_version): - if not LOCAL_PRO_DEV_ENV: - return - mock_is_pro_version.return_value = True self.login_as(self.admin)