Commit Graph

6023 Commits

Author SHA1 Message Date
Chris Hill-Scott
18fcd05434 Merge pull request #2251 from alphagov/pyup-update-pyexcel-io-0.5.8-to-0.5.9
Update pyexcel-io to 0.5.9
2018-09-03 09:51:20 +01:00
Chris Hill-Scott
78e4929278 Merge pull request #2275 from alphagov/ignore-pytest-cache
Don’t version control Pytest cache
2018-09-03 09:41:25 +01:00
Chris Hill-Scott
7d951ad1f3 Don’t version control Pytest cache
Pytest moved its cache from `./.cache` (which is in our `.gitignore`) to
`./.pytest_cache` (which isn’t).

It’s annoying having to be careful not to commit it all the time, so
this commit makes it ignored.

See https://github.com/pytest-dev/pytest/issues/3286 for more context.
2018-09-03 09:33:04 +01:00
Chris Hill-Scott
a1e06efefe Merge pull request #2274 from alphagov/remove-service-branding-property
Remove `branding` attribute from service model
2018-08-31 14:13:57 +01:00
Chris Hill-Scott
631c3478ae Remove branding attribute from service model
To correspond with us dropping this column from the database.

Remove the attribute from the model gives us more confidence that it’s
not being used (because it will raise exceptions in any tests that refer
to it).
2018-08-31 14:05:33 +01:00
Tom Byers
3655e63d34 Merge pull request #2262 from alphagov/remove_branding_type_from_set_email_branding_page
Remove branding type from set email branding page
2018-08-31 13:56:44 +01:00
Chris Hill-Scott
d2503e8a26 Merge pull request #2266 from alphagov/remove-reference-to-service-branding
Remove reference to service branding on the settings page
2018-08-31 13:48:29 +01:00
Chris Hill-Scott
d825f09b0b Merge pull request #2273 from alphagov/explain-sms-sender
Explain text message sender
2018-08-31 11:18:22 +01:00
Chris Hill-Scott
7f458ad066 Explain text message sender
We sometimes have to do this over support tickets as part of the go-live
process; now we’re directing people to add a sender (as part of the task
list) we can explain what it is in context.
2018-08-31 10:50:59 +01:00
Chris Hill-Scott
2686f4f0e2 Freeze requirements 2018-08-30 17:08:35 +01:00
Tom Byers
d12fa00066 Update tests to allow new 'GOV.UK' label 2018-08-30 16:03:20 +01:00
Chris Hill-Scott
334a93efa7 Merge pull request #2269 from alphagov/reword-template-instruction
Reword templates line on go live task list
2018-08-30 15:57:54 +01:00
Tom Byers
4f67502806 Add tests for changes to brand request page
Tests the new code that gets the brand type from
the email_branding model. Includes checks for a
service without the email_branding field set.

It also amends the test for a POST from that page,
removing mocking of the email_branding client.
This test runs against the default service which
has its email_branding field set to None so no
call is made to the client. It's testing the
brand_type values selected so doesn't need the
service to have an email_branding already set.
2018-08-30 15:54:28 +01:00
Chris Hill-Scott
2ff81ea59d Reword templates line on go live task list
This version might read a little clearer and look a little neater.
2018-08-30 14:36:40 +01:00
Pete Herlihy
edcfa1887c Merge pull request #2267 from alphagov/pricing-increase
Advising about future letter pricing from 1 October
2018-08-30 12:10:08 +01:00
Pete Herlihy
18985821a9 Advising about future letter pricing from 1 October
This is just the pricing page, we'll sort the pricing table etc separately...

W're removing non-crown pricing as we won't be charged differently any more.  But we will retain the concept of non-crown as we may change differently ourselves in the future.
2018-08-30 11:53:52 +01:00
Tom Byers
c2075b6d71 Make label for None branding_style read as 'GOV.UK' 2018-08-30 11:44:36 +01:00
Tom Byers
ad0ffcc3f3 Fix issue that happens with branding_style of None
Setting the branding_style to 'None' causes the
API to remove the email_branding field from a
service model. The branding request page
controller was depending on that value being
to present get the brand type.

The email preview page (used in an iframe on
various pages) wasn't able to recognise a
branding_style of 'None', causing a blank page to
render.
2018-08-30 11:38:47 +01:00
Chris Hill-Scott
6be90f4d8a Merge pull request #2264 from alphagov/pyup-update-pytest-3.7.3-to-3.7.4
Update pytest to 3.7.4
2018-08-30 09:31:36 +01:00
Chris Hill-Scott
5143de5c06 Merge pull request #2263 from alphagov/pyup-update-coveralls-1.3.0-to-1.4.0
Update coveralls to 1.4.0
2018-08-30 09:30:32 +01:00
Chris Hill-Scott
896072f169 Remove reference to service branding on settings
This attribute is deprecated in favour of an attribute on the
`email_branding` itself.
2018-08-30 09:20:44 +01:00
pyup-bot
2328075924 Update pytest from 3.7.3 to 3.7.4 2018-08-29 22:32:18 +01:00
pyup-bot
3cfe5a07e5 Update coveralls from 1.3.0 to 1.4.0 2018-08-29 16:32:24 +01:00
Tom Byers
1d3b5fda62 Update brand request tests 2018-08-29 16:16:21 +01:00
Tom Byers
272049bb17 Update branding request page
It was getting the brand_type from the service
model. This changes the controller to get it from
the new email_branding model instead.
2018-08-29 16:16:21 +01:00
Tom Byers
55f5cc8e1e Update tests for changes
Removes any checks for branding_type from tests
for set_email_branding page.

Updates tests for email preview page (usually
iframed) so non-default brand_type is got from the
email_branding model instead of a GET param.
2018-08-29 16:16:21 +01:00
Tom Byers
151488fa78 Update email preview page
No longer requires the branding_type GET param.

Retains the 'govuk' default brand.
2018-08-29 16:16:15 +01:00
Chris Hill-Scott
5b5aada3b7 Merge pull request #2261 from alphagov/robots.txt
Serve robots.txt from the admin app
2018-08-29 16:04:26 +01:00
Chris Hill-Scott
09876532ae Serve robots.txt from the admin app
We’re getting rid of the PaaS proxy, which is where this file is
currently served from.

Values copied from 3632313fdf/ansible/roles/nginx/files/robots.txt
2018-08-29 15:54:17 +01:00
Chris Hill-Scott
fab754a535 Merge pull request #2260 from alphagov/remove-govuk-from-brand-type
Remove GOV.UK as option when creating a branding
2018-08-29 15:53:19 +01:00
Chris Hill-Scott
87040c153c Merge pull request #2250 from alphagov/task-list-go-live
Try to get more users to do the things we require before going live
2018-08-29 15:53:10 +01:00
Chris Hill-Scott
d7f42a868c Merge pull request #2244 from alphagov/request-letter-branding
Tell people they can have their logo on letters
2018-08-29 15:52:58 +01:00
Sakis
162fd3773e Merge pull request #2258 from alphagov/remove-header-check-preview
Disable paas-proxy header check on preview
2018-08-29 14:58:54 +01:00
Chris Hill-Scott
278f7e534c Remove GOV.UK as option when creating a branding
It doesn’t make sense to create a brand which doesn’t get shown.

This will make it safe to remove this option from the database.
2018-08-29 12:42:42 +01:00
Chris Hill-Scott
6a20deba87 Merge pull request #2259 from alphagov/331-446
Update service count to 346 and orgs to 112
2018-08-29 11:54:00 +01:00
Chris Hill-Scott
8546d1b62b Merge pull request #2256 from alphagov/pyup-update-pytest-3.7.2-to-3.7.3
Update pytest to 3.7.3
2018-08-29 11:44:45 +01:00
Tom Byers
0df88ea182 Remove branding_type from set_email_branding page
Includes updates to the controller so
branding_type is got from the email_branding model
instead of from user input.

Follows on from:

https://github.com/alphagov/notifications-admin/pull/2249
2018-08-29 11:43:35 +01:00
Pete Herlihy
1569babc57 Update service count to 346 and orgs to 112 2018-08-29 11:41:30 +01:00
Chris Hill-Scott
7563ad16ed Merge pull request #2255 from alphagov/pyup-update-pytest-xdist-1.22.5-to-1.23.0
Update pytest-xdist to 1.23.0
2018-08-29 11:40:02 +01:00
Chris Hill-Scott
06869ee2f3 Make the whole line a link
This looks cleaner than having part of the line as a link, and because
of the active opening word feels like more of a call to action.
2018-08-29 11:36:01 +01:00
Chris Hill-Scott
7c6627254b Update content to work in task list pattern
We probably don't need to use a lead-in for a task list / table.

Also moves the line about making the service live within one day to the
next screen.
2018-08-29 11:29:44 +01:00
Chris Hill-Scott
45eb16b4db Check text message sender before going live
We often check that a service has an appropriate text message sender as
a condition of them going live. We don’t mention this anywhere.

The services for whom GOVUK is definitely not an appropriate sender are
those in local government. As we have more of these teams starting to
use Notify, we should streamline the process by making this check
automated.

This commit adds that check, for teams who:
- have text message templates
- have self-declared as NHS or local government
2018-08-29 11:29:44 +01:00
Chris Hill-Scott
fbd2102832 Use task list pattern for request to go live
We’ve found a significant property of users (about 25%) who request to
go live aren’t completing all the items on the checklist.

In 1 of 6 (17%) of the usability testing sessions we did on this process
we saw someone skip straight past the checklist page because of big
green button syndrome. While 1 in 6 people would normally be a small
number[1] in the context of a usability testing session, it’s enough to
cause a big workload for our team (assuming it is the sole cause of
people not completing the items on the checklist).

The initial reason for using the tick cross pattern for the checklist
was:
- it was coherent with the rest of Notify
- the task list pattern didn’t have a way of showing that something
  still needed doing – it put more visual emphasis on the things
  the user had already done

There’s been some interesting discussion on the GOV.UK Design System
backlog about users failing to complete items in the task list. A few
people have tried different patterns for communicating that items in the
task list still need ‘completing’.

So this commit:
- adds a task list pattern
- uses the task list pattern for the request to go live checklist

The task list is adapted from the one in the design system in that:
- the ‘completed’ label has a black, not blue background (because Notify
  often uses blocks of blue to indicate something that’s clickable)
- it adds an explicit ‘not complete’ label which is visually not
  filled in (sort of how ticked/unticket radio buttons work)

1. With the caveat that looking only at task completion, or quantifying
   qualitative not good practices and the intention here is to show that
   the numbers are close enough to say that they could be symptomatic of
   the same problem. Leisa Reichelt’s Mind the Product talk is good on
   this https://vimeo.com/284015765
2018-08-29 11:29:43 +01:00
Chris Hill-Scott
f6c3a8f817 Merge pull request #2257 from alphagov/lbbd
Alias Barking and Dagenham council’s domain
2018-08-29 10:50:33 +01:00
Athanasios Voutsadakis
c7cce495bd Disable paas-proxy header check on preview
See: https://github.com/alphagov/notifications-api/pull/2052
2018-08-28 13:58:31 +01:00
Chris Hill-Scott
b0694977c2 Alias Barking and Dagenham council’s domain 2018-08-28 09:47:24 +01:00
pyup-bot
d120e6069c Update pytest from 3.7.2 to 3.7.3 2018-08-26 21:47:12 +01:00
pyup-bot
5a440ebd89 Update pytest-xdist from 1.22.5 to 1.23.0 2018-08-25 06:04:09 +01:00
Chris Hill-Scott
408d2173cb Merge pull request #2254 from alphagov/midsussex.gov.uk
Mark agreement signed by Mid Sussex District Council
2018-08-24 17:30:14 +01:00
Chris Hill-Scott
cfc41085a1 Mark agreement signed by Mid Sussex District Council 2018-08-24 17:20:29 +01:00