Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow manual publishing feature flagged #467

Merged
merged 1 commit into from
Mar 11, 2019
Merged

Allow manual publishing feature flagged #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion company/serializers.py
View file
Open in desktop
Expand Up @@ -145,7 +145,6 @@ class Meta:
'export_status': {'required': False},
'has_exported_before': {'required': False},
'modified': {'read_only': True},
'is_published': {'read_only': True},
'slug': {'read_only': True},

}
Expand Down
2 changes: 2 additions & 0 deletions company/signals.py
View file
Open in desktop
Expand Up @@ -19,6 +19,8 @@ def send_first_verification_letter(sender, instance, *args, **kwargs):


def publish_companies_that_meet_criteria(sender, instance, *args, **kwargs):
if settings.FEATURE_MANUAL_PUBLISH_ENABLED:
return
if not instance.is_published:
has_contact = bool(instance.email_address)
has_synopsis = bool(instance.description or instance.summary)
Expand Down
75 changes: 52 additions & 23 deletions company/tests/test_signals.py
View file
Open in desktop
Expand Up @@ -118,32 +118,35 @@ def test_unknown_address_not_send_letters(mock_send_letter, settings):
mock_send_letter.send_letter.assert_not_called()


test_publish_params = [
# has_contact
['', '', '', False, False],
['', '', 'a@e.com', False, False],
# has_synopsis
['d', '', '', False, False],
['d', '', 'a@e.com', False, False],
['d', 's', '', False, False],
['', 's', '', False, False],
['d', 's', 'a@e.com', False, False],
['', 's', 'a@e.com', False, False],
# is_verified
['', '', '', True, False],
['', '', 'a@e.com', True, False],
['d', '', '', True, False],
['d', '', 'a@e.com', True, True],
['d', 's', '', True, False],
['', 's', '', True, False],
['d', 's', 'a@e.com', True, True],
['', 's', 'a@e.com', True, True],
]


@pytest.mark.django_db
@pytest.mark.parametrize(
'desciption,summary,email,is_verified,expected',
[
# has_contact
['', '', '', False, False],
['', '', 'a@e.com', False, False],
# has_synopsis
['d', '', '', False, False],
['d', '', 'a@e.com', False, False],
['d', 's', '', False, False],
['', 's', '', False, False],
['d', 's', 'a@e.com', False, False],
['', 's', 'a@e.com', False, False],
# is_verified
['', '', '', True, False],
['', '', 'a@e.com', True, False],
['d', '', '', True, False],
['d', '', 'a@e.com', True, True],
['d', 's', '', True, False],
['', 's', '', True, False],
['d', 's', 'a@e.com', True, True],
['', 's', 'a@e.com', True, True],
]
'desciption,summary,email,is_verified,expected', test_publish_params
)
def test_publish(desciption, summary, email, is_verified, expected):
def test_publish(desciption, summary, email, is_verified, expected, settings):
settings.FEATURE_MANUAL_PUBLISH_ENABLED = False
fields = {
'description': desciption,
'summary': summary,
Expand All @@ -162,6 +165,32 @@ def test_publish(desciption, summary, email, is_verified, expected):
assert company.is_published is expected


@pytest.mark.django_db
@pytest.mark.parametrize(
'desciption,summary,email,is_verified,expected', test_publish_params
)
def test_publish_feature_flagged(
desciption, summary, email, is_verified, expected, settings
):
settings.FEATURE_MANUAL_PUBLISH_ENABLED = True
fields = {
'description': desciption,
'summary': summary,
'email_address': email
}
mock_verifed = mock.PropertyMock(return_value=is_verified)
with mock.patch('company.models.Company.is_verified', mock_verifed):
company = factories.CompanyFactory(**fields)
# create
assert company.is_published is False
# update
for field, value in fields.items():
setattr(company, field, value)
company.save()
company.refresh_from_db()
assert company.is_published is False


@pytest.mark.django_db
@pytest.mark.parametrize(
'desciption,summary,email,is_verified', [
Expand Down
3 changes: 3 additions & 0 deletions conf/settings.py
View file
Open in desktop
Expand Up @@ -586,6 +586,9 @@
FEATURE_VERIFICATION_LETTERS_ENABLED = env.bool(
'FEATURE_VERIFICATION_LETTERS_ENABLED', False
)
FEATURE_MANUAL_PUBLISH_ENABLED = env.bool(
'FEATURE_MANUAL_PUBLISH_ENABLED', False
)

# directory-signature-auth
SIGNATURE_SECRET = env.str('SIGNATURE_SECRET')
Expand Down