Commit Graph

4641 Commits

Author SHA1 Message Date
Chris Hill-Scott
f4be8fd80b Add East Riding of Yorkshire Council to migration 2018-02-15 11:08:17 +00:00
Chris Hill-Scott
f55f555e4d Add letter logo for Welsh Revenue Authority
Depends on:
- [ ] https://github.com/alphagov/notifications-template-preview/pull/94
2018-02-15 11:08:16 +00:00
Rebecca Law
019a6ef1e4 Merge pull request #1657 from alphagov/fix-template-versions
Fix template version for admin app
2018-02-15 10:14:58 +00:00
Rebecca Law
4820365b13 Rename migration file so that the force db migration part of the deploy does not trigger 2018-02-15 09:47:28 +00:00
Rebecca Law
a56f3b206f Merge branch 'master' into fix-template-versions 2018-02-15 09:45:56 +00:00
Chris Hill-Scott
de11751919 Merge pull request #1661 from alphagov/pytest-env
Automatically set environment vars before tests
2018-02-15 09:34:49 +00:00
Chris Hill-Scott
781bae2523 Merge pull request #1663 from alphagov/fail-fast
Stop pytest on 10th failing test
2018-02-15 09:34:42 +00:00
Rebecca Law
d8b062a960 Merge pull request #1664 from alphagov/switch-to-pdf-flow
Switch to using the pdf letter flow.
2018-02-14 15:36:12 +00:00
Rebecca Law
12352a4153 Merge pull request #1635 from alphagov/remove-failed-as-a-status
Remove failed as a possible status
2018-02-14 14:35:01 +00:00
Chris Hill-Scott
faa76755c3 Allow up to 10 tests to fail before stopping
This is a sensible compromise between 1 test and ALL THE TESTS.

Uses the `maxfail` option as documented here:
https://docs.pytest.org/en/latest/usage.html#stopping-after-the-first-or-n-failures
2018-02-14 13:27:06 +00:00
Chris Hill-Scott
845aad1183 Remove environment_test.sh
These config variables are now set in `pytest.ini` instead.
2018-02-14 12:19:13 +00:00
Chris Hill-Scott
d36b742e14 Automatically set environment vars before tests
Sometimes you just wanna run some tests directly using the `pytest`
command. But you’re in a new shell, and have forgotten to do
`source environment_test.sh`. The screen fills with red, and your day
just got a little bit worse.

This commit will stop this from ever happening again, by making the
setting environment variables part of running Pytest. It does this with
a plugin called pytest-env[1].

pytest.ini is the standard way of configuring pytest. Creating this file
where it didn’t exist before changes the behaviour of pytest, in that
it will now look for tests in the same directory as the file, rather
than defaulting to the `tests/` directory. So we also have to explicitly
configure pytest[2] to tell it that it should only look in this
directory. Otherwise it gets lost in the weeds of `node_modules`.

This also changes the way that `SQLALCHEMY_DATABASE_URI` is overriden to
the convention used by this plugin.

1. https://github.com/MobileDynasty/pytest-env
2. https://docs.pytest.org/en/latest/customize.html#confval-testpaths

fixup! Remove environment_test.sh
2018-02-14 12:19:12 +00:00
Chris Hill-Scott
e87ed0f68a Stop pytest on first failing test
If a PR is going to fail because tests aren’t passing then you:
- should know about it as quick as possible
- shouldn’t waste precious Jenkins CPU running subsequent tests

This commit adds the `-x` flag to pytest, which stops the test run as
soon as one failing test is discovered.
2018-02-14 11:54:40 +00:00
Leo Hemsted
15c2a9461e Merge pull request #1658 from alphagov/pyup-update-boto3-1.5.27-to-1.5.28
Update boto3 to 1.5.28
2018-02-14 11:48:35 +00:00
Leo Hemsted
10ebf4ae02 Merge pull request #1659 from alphagov/pyup-update-awscli-1.14.37-to-1.14.38
Update awscli to 1.14.38
2018-02-14 11:48:21 +00:00
Leo Hemsted
4d7a0acaf2 Merge pull request #1662 from alphagov/leohemsted-patch-1
Update requirements.txt
2018-02-14 11:48:10 +00:00
Leo Hemsted
f070b4eab1 Update requirements.txt
email validation
2018-02-14 11:31:17 +00:00
Rebecca Law
94162bc1bf Updated the schema to return reply_to - which is the id and reply_to_text which is the contact_block 2018-02-14 11:20:09 +00:00
Katie Smith
2049e75210 Merge pull request #1656 from alphagov/let-service-change-punctuation-in-name
Allow services to add punctuation to or change the case of their name
2018-02-14 10:22:41 +00:00
Katie Smith
e1cc8175d7 Allow services to add puntuation to or change the case of their name
Changed the '/service/unique' endpoint to optionally accept the
service_id parameter. It now doesn't matter if a user tries to change
the capitalization or add punctuation to their own service name. But
there should still be an error if a user tries to change the punctuation
or capitalization of another service.

service_id needs to be allowed to be None until notifications-admin is
updated to always pass in the service_id.
2018-02-14 10:11:46 +00:00
pyup-bot
a6cf634ab6 Update awscli from 1.14.37 to 1.14.38 2018-02-13 23:25:22 +00:00
pyup-bot
ea13919190 Update boto3 from 1.5.27 to 1.5.28 2018-02-13 23:25:18 +00:00
Rebecca Law
e736c90d00 Switch to using the pdf letter flow.
When sending letters always use the pdf letter flow regardless of service permissions.
2018-02-13 18:38:32 +00:00
Rebecca Law
c833a76070 The admin app is looking for reply_to_text not reply_to. This will fix the admin app and not affect the public api calls for template versions, they don't use the marshmallow schema 2018-02-13 17:12:00 +00:00
kentsanggds
16c78a8924 Merge pull request #1649 from alphagov/ken-link-service-org
Link service to organisation
2018-02-13 16:46:49 +00:00
Ken Tsang
f09bcf5ed9 Refactored organisation dao test 2018-02-13 16:38:35 +00:00
Ken Tsang
4576bdd64f Reraise integrity errors on org name unique contraints as 400
- currently being raised as 500s, but should really be 400s as the request data has the duplicate name
2018-02-13 14:47:03 +00:00
Ken Tsang
d80c7d4f65 Return services serialized for dashboard for orgs
- rather than returning the entire service, return only whats needed when listing the service on the org dashboard
2018-02-13 14:06:43 +00:00
Ken Tsang
085110417f Refactor organisation_dao 2018-02-13 14:06:43 +00:00
Ken Tsang
44f9143d08 Organisation services API endpoints 2018-02-13 14:06:43 +00:00
Ken Tsang
60f96ab598 Organisation service DAO 2018-02-13 14:06:43 +00:00
Ken Tsang
6e0e3e9f08 Migration script to add organisation_to_service association table 2018-02-13 14:06:43 +00:00
Ken Tsang
a035dcf7b0 Add organisation_to_service association table
- moved Organisation so that Service model has access to it
2018-02-13 14:06:43 +00:00
Richard Chapman
362dcb9636 Merge pull request #1654 from alphagov/pyup-update-awscli-1.14.32-to-1.14.37
Update awscli to 1.14.37
2018-02-13 12:19:27 +00:00
Richard Chapman
0aa2a36f6b Merge pull request #1653 from alphagov/pyup-update-boto3-1.5.22-to-1.5.27
Update boto3 to 1.5.27
2018-02-13 12:19:11 +00:00
Richard Chapman
ca38c47ac0 Merge pull request #1652 from alphagov/rc_fixed_failing_test
Added a freezetime to the test test_create_letters_pdf_calls_s3upload
2018-02-13 12:18:59 +00:00
Richard Chapman
ad8928370c Merge pull request #1638 from alphagov/pyup-update-psycopg2-2.7.3.2-to-2.7.4
Update psycopg2 to 2.7.4
2018-02-13 12:18:39 +00:00
pyup-bot
a56849aee5 Update awscli from 1.14.32 to 1.14.37 2018-02-13 01:10:33 +00:00
pyup-bot
da12acab36 Update boto3 from 1.5.22 to 1.5.27 2018-02-13 01:10:24 +00:00
Richard Chapman
da669e46f0 Import of time was not needed - removed 2018-02-12 17:08:10 +00:00
Richard Chapman
d2f4f544c1 Added a freezetime to the test test_create_letters_pdf_calls_s3upload
as it failed on prodction and I managed to get it to fail locally

{'file_location': '2018-02-12/NOTIFY.FOO.D.2.C.N.20180212164427.PDF'}
!= {'file_location': '2018-02-12/NOTIFY.FOO.D.2.C.N.20180212164428.PDF'}

A freeze time till ensure that the finame which is based on the time
will not fail.
2018-02-12 16:55:15 +00:00
Leo Hemsted
376ebc5025 Merge pull request #1650 from alphagov/fix
fix bug where we s3upload crashed if you didn't supply tags
2018-02-12 16:12:05 +00:00
Leo Hemsted
24fab13d8a fix bug where we s3upload crashed if you didn't supply tags 2018-02-12 15:50:05 +00:00
Leo Hemsted
1ef6718918 Merge pull request #1646 from alphagov/add-tags-to-pdf-letters
upload letter pdfs with retention tag
2018-02-12 15:03:53 +00:00
Rebecca Law
fa8cd780b0 Make the errors in the process_sms_client_reponse more obvious by changing variable name.
Added a missing test if mmg sends a CID (or reference) that is not a UUID.

NB: All client specific tests are in test_callbacks.
2018-02-12 12:06:43 +00:00
Katie Smith
5eee0cf78b Merge pull request #1639 from alphagov/create-new-organisation-model
Create new organisation model
2018-02-12 12:02:58 +00:00
Leo Hemsted
093e8083e0 upload letter pdfs with retention tag
so we can delete them automatically with s3's lifecycle policy
2018-02-09 17:13:37 +00:00
Chris Hill-Scott
daaa390990 Merge pull request #1645 from alphagov/email-auth-domain
Allow admin to specify domain for email auth links
2018-02-09 16:31:41 +00:00
Leo Hemsted
cc9bea17d1 Merge pull request #1619 from alphagov/pyup-update-notifications-python-client-4.7.1-to-4.7.2
Update notifications-python-client to 4.7.2
2018-02-09 14:58:59 +00:00
Leo Hemsted
90da7f53b4 Merge pull request #1636 from alphagov/get-rid-of-error-logging
downgrade lots of routine logging from error/exception to info
2018-02-09 14:58:46 +00:00