Commit Graph

6798 Commits

Author SHA1 Message Date
Leo Hemsted
ad904e587c Merge pull request #2631 from alphagov/utils-bump
bump utils
2019-01-04 16:37:32 +00:00
Leo Hemsted
addb54b84f bump utils
brings in alphagov/notifications-utils#563
2019-01-04 16:21:12 +00:00
Chris Hill-Scott
62d424b01e Merge pull request #2625 from alphagov/trailing-new-line-before-markdown
Bump utils to 30.7.2
2019-01-04 11:48:22 +00:00
Chris Hill-Scott
c1b61a3658 Merge pull request #2617 from alphagov/pytest4
Pytest 4: don't call pytest.mark directly
2019-01-04 11:48:16 +00:00
Chris Hill-Scott
0c1a797a82 Keep param on multiple lines
so it scans the same as preceeding test cases

Co-Authored-By: leohemsted <leohemsted@gmail.com>
2019-01-04 11:34:26 +00:00
Chris Hill-Scott
36656fd6ba Merge pull request #2628 from alphagov/hide-postage-for-those-who-cant-choose
Don’t show postage to users who can’t choose it
2019-01-03 16:26:45 +00:00
Chris Hill-Scott
3439611b11 Merge pull request #2629 from alphagov/stoke.gov.uk
Mark agreement signed by Stoke on Trent council
2019-01-03 16:25:44 +00:00
Chris Hill-Scott
c02a5800c3 And Midlothian 2019-01-03 16:12:58 +00:00
Chris Hill-Scott
5b6f53ffd1 Mark agreement signed by Stoke on Trent council 2019-01-03 16:07:50 +00:00
Chris Hill-Scott
3a2cfda8b2 Don’t show postage to users who can’t choose it
If you can’t choose postage on a per-template basis, you shouldn’t be
see the thing that indicates that postage can be changed.
2019-01-03 16:04:16 +00:00
Katie Smith
593261a62f Merge pull request #2619 from alphagov/fix-redis-error
Stop Redis exception by not passing Redis an empty set to delete
2019-01-03 15:25:34 +00:00
Katie Smith
ed84e0958a Stop Redis exception by not passing Redis an empty set to delete
We use `redis_client.delete` to delete multiple keys at once, but this
raises a `redis.exceptions.ResponseError` if it is called with an empty list
or set. We should only call `redis_client.delete` when there is at least
one item to delete.
2019-01-03 15:11:31 +00:00
Chris Hill-Scott
bbaa51443a Merge pull request #2624 from alphagov/knowsley.gov.uk
Mark agreement signed by Knowsley Council
2019-01-02 16:09:02 +00:00
Chris Hill-Scott
5298c20890 Bump utils to 30.7.2 2019-01-02 15:45:21 +00:00
Pea (Malgorzata Tyczynska)
5d99b2d2f6 Merge pull request #2616 from alphagov/choose_postage
Choose and display postage on template
2019-01-02 15:39:15 +00:00
Chris Hill-Scott
c37bcf3084 Mark agreement signed by Knowsley Council 2019-01-02 15:05:25 +00:00
Chris Hill-Scott
c92fddce3c Merge pull request #2583 from alphagov/pyup-update-pytest-xdist-1.24.1-to-1.25.0
Update pytest-xdist to 1.25.0
2019-01-02 13:20:22 +00:00
Chris Hill-Scott
1befd3ddd2 Merge pull request #2620 from alphagov/pyup-update-beautifulsoup4-4.6.3-to-4.7.0
Update beautifulsoup4 to 4.7.0
2019-01-02 13:20:15 +00:00
Chris Hill-Scott
cfc987d48f Merge pull request #2623 from alphagov/newham.gov.uk
Mark agreement signed by Newham council
2019-01-02 13:20:07 +00:00
Chris Hill-Scott
adca4622e4 Fix copypaste 2019-01-02 13:14:23 +00:00
Chris Hill-Scott
b55e0ee392 Mark agreement signed by Newham council 2019-01-02 13:13:01 +00:00
Chris Hill-Scott
893163ff84 Reflect normalisation of whitespace in attributes
BeautifulSoup version 4.7.0 changes how it handles whitespace in
attribute values. See more detail here:
https://bugs.launchpad.net/beautifulsoup/+bug/1787453
2019-01-02 11:57:11 +00:00
Chris Hill-Scott
e88c23f233 Freeze requirements 2019-01-02 11:55:47 +00:00
pyup-bot
07a540506c Update beautifulsoup4 from 4.6.3 to 4.7.0 2019-01-02 11:55:10 +00:00
Chris Hill-Scott
0a01889acf Merge pull request #2622 from alphagov/manchester.gov.uk
Mark agreement signed by Manchester City Council
2019-01-02 11:45:31 +00:00
Chris Hill-Scott
729d1ffc3e Mark agreement signed by Manchester City Council 2019-01-02 11:37:34 +00:00
Chris Hill-Scott
da0b7b519f Merge pull request #2621 from alphagov/staffordshire.gov.uk
Mark agreement signed by Staffordshire Council
2019-01-02 11:10:14 +00:00
Chris Hill-Scott
b634f19637 Resolve Staffordshire aliases 2019-01-02 11:03:03 +00:00
Chris Hill-Scott
79fe224188 Mark agreement signed by Staffordshire Councl 2019-01-02 11:02:06 +00:00
Chris Hill-Scott
742aec6831 Merge pull request #2609 from alphagov/remove-whitenoise
Remove WhiteNoise
2019-01-02 10:13:42 +00:00
Chris Hill-Scott
9a01cb9323 Merge pull request #2615 from alphagov/fix-find-sticky
Fix sticky with find as you type
2019-01-02 10:13:22 +00:00
Pete Herlihy
4595a2a0a5 Merge pull request #2618 from alphagov/516-services-now
Updated to 516 services from 154 organisations
2018-12-31 15:47:06 +00:00
Pete Herlihy
4a35dc65c7 Updated to 516 services from 154 organisations 2018-12-31 13:37:51 +00:00
Leo Hemsted
5961f470a4 don't apply marks directly in pytest
specifically - don't use `pytest.mark.xfail` directly in parametrize,
instead use `pytest.param(*args, marks=pytest.mark.xfail)`. the old way
is deprecated in pytest4 - for more information see
https://docs.pytest.org/en/latest/deprecations.html#marks-in-pytest-mark-parametrize

Also, make this an error in pytest.ini so if someone adds a new xfail,
it'll crash
2018-12-31 13:37:20 +00:00
Pea Tyczynska
97058d3c5b Add service setting switch to choose postage per template 2018-12-27 18:05:30 +00:00
Pea Tyczynska
50935e79ca Test mock_update_service_template called with right args 2018-12-21 17:18:18 +00:00
Pea Tyczynska
bc1e0b7167 Test choose postage section display when editing letter template 2018-12-21 17:13:19 +00:00
Pea Tyczynska
cbead5d665 Refactor tests for displaying template postage 2018-12-21 17:13:19 +00:00
Pea Tyczynska
5144db7baa Test postage display on view template page 2018-12-21 17:13:18 +00:00
Pea Tyczynska
85b8b343e2 Service deafault radio checked by default, existing tests pass. 2018-12-21 17:13:18 +00:00
Pea Tyczynska
e1191326f4 Fix tests after enabling editing of postage on letter templates 2018-12-21 17:13:18 +00:00
Chris Hill-Scott
6487273ced Fix sticky with find as you type
It was losing its position because filtering the list of templates with
find as you type was causing the height of the page to change.
2018-12-21 14:37:01 +00:00
Chris Hill-Scott
85aae47443 Merge pull request #2589 from alphagov/static-guidance
Add information about how static assets are served
2018-12-21 14:29:51 +00:00
Chris Hill-Scott
0d13c8b091 Update with latest setup 2018-12-21 12:54:19 +00:00
Chris Hill-Scott
5d8147bbbd Merge pull request #2614 from alphagov/remove-branding-radio
Remove unused CSS
2018-12-21 12:50:16 +00:00
Chris Hill-Scott
bf75fec5ae Remove unused CSS
This is from when we used to show the email logos inside the label of
the radio buttons.

Changing the CSS will also change its hash, will will cache-bust
CloudFront. Which is why I’m doing this now.
2018-12-21 12:42:08 +00:00
Chris Hill-Scott
fa1b6417aa Merge pull request #2613 from alphagov/southglos.gov.uk
Mark agreement signed by South Glos council
2018-12-21 12:34:59 +00:00
Chris Hill-Scott
c0b271bab2 Merge pull request #2612 from alphagov/devon.gov.uk
Mark agreement signed by Devon County Council
2018-12-21 12:34:53 +00:00
Chris Hill-Scott
0b984dd7db Merge pull request #2611 from alphagov/set-s3-cache-headers
Set far-future cache headers on S3 assets
2018-12-21 12:34:48 +00:00
Chris Hill-Scott
bb5854cef5 Mark agreement signed by South Glos council 2018-12-21 12:28:42 +00:00