|
@@ -95,11 +95,13 @@ class OrganizationTest(TestCase, HybridCloudTestMixin):
|
|
|
org.flags.codecov_access = True
|
|
|
org.flags.require_2fa = True
|
|
|
org.flags.disable_member_project_creation = True
|
|
|
+ org.flags.prevent_superuser_access = True
|
|
|
assert flag_has_changed(org, "allow_joinleave") is False
|
|
|
assert flag_has_changed(org, "early_adopter")
|
|
|
assert flag_has_changed(org, "codecov_access")
|
|
|
assert flag_has_changed(org, "require_2fa")
|
|
|
assert flag_has_changed(org, "disable_member_project_creation")
|
|
|
+ assert flag_has_changed(org, "prevent_superuser_access")
|
|
|
|
|
|
def test_has_changed(self):
|
|
|
org = self.create_organization()
|
|
@@ -228,9 +230,11 @@ class Require2fa(TestCase, HybridCloudTestMixin):
|
|
|
self.assert_org_member_mapping(org_member=compliant_member)
|
|
|
self.assert_org_member_mapping(org_member=non_compliant_member)
|
|
|
|
|
|
- with self.options(
|
|
|
- {"system.url-prefix": "http://example.com"}
|
|
|
- ), self.tasks(), outbox_runner():
|
|
|
+ with (
|
|
|
+ self.options({"system.url-prefix": "http://example.com"}),
|
|
|
+ self.tasks(),
|
|
|
+ outbox_runner(),
|
|
|
+ ):
|
|
|
self.org.handle_2fa_required(self.request)
|
|
|
|
|
|
self.is_organization_member(compliant_user.id, compliant_member.id)
|
|
@@ -280,9 +284,11 @@ class Require2fa(TestCase, HybridCloudTestMixin):
|
|
|
self.assert_org_member_mapping(org_member=member)
|
|
|
non_compliant.append((user, member))
|
|
|
|
|
|
- with self.options(
|
|
|
- {"system.url-prefix": "http://example.com"}
|
|
|
- ), self.tasks(), outbox_runner():
|
|
|
+ with (
|
|
|
+ self.options({"system.url-prefix": "http://example.com"}),
|
|
|
+ self.tasks(),
|
|
|
+ outbox_runner(),
|
|
|
+ ):
|
|
|
self.org.handle_2fa_required(self.request)
|
|
|
|
|
|
for user, member in non_compliant:
|
|
@@ -340,9 +346,11 @@ class Require2fa(TestCase, HybridCloudTestMixin):
|
|
|
|
|
|
self.assert_org_member_mapping(org_member=member)
|
|
|
|
|
|
- with self.options(
|
|
|
- {"system.url-prefix": "http://example.com"}
|
|
|
- ), self.tasks(), outbox_runner():
|
|
|
+ with (
|
|
|
+ self.options({"system.url-prefix": "http://example.com"}),
|
|
|
+ self.tasks(),
|
|
|
+ outbox_runner(),
|
|
|
+ ):
|
|
|
with assume_test_silo_mode(SiloMode.CONTROL):
|
|
|
api_key = ApiKey.objects.create(
|
|
|
organization_id=self.org.id,
|
|
@@ -373,9 +381,11 @@ class Require2fa(TestCase, HybridCloudTestMixin):
|
|
|
user, member = self._create_user_and_member()
|
|
|
self.assert_org_member_mapping(org_member=member)
|
|
|
|
|
|
- with self.options(
|
|
|
- {"system.url-prefix": "http://example.com"}
|
|
|
- ), self.tasks(), outbox_runner():
|
|
|
+ with (
|
|
|
+ self.options({"system.url-prefix": "http://example.com"}),
|
|
|
+ self.tasks(),
|
|
|
+ outbox_runner(),
|
|
|
+ ):
|
|
|
request = copy.deepcopy(self.request)
|
|
|
request.META["REMOTE_ADDR"] = None
|
|
|
self.org.handle_2fa_required(request)
|