Ben Thorner
|
00cc67f813
|
Inline duplicate service fixture with test
Similarly to the previous commit, this fixture is only used once,
so can benefit from being inline with its test.
|
2021-02-17 09:34:33 +00:00 |
|
Ben Thorner
|
52a5da4d17
|
Handle exception is org name already exists
Previously this would return a 500 error, as the 400 exception was
not handled from the API [1]. Note that:
- We tend to rely on exception messages to identify the error that
occurred [2][3], with services being a notable deviation [4]. I've
used the exception message approach, as this is more granular and
broadly consistent with the rest of the app.
- There is already code to cover this scenario when a user changes
the name of an existing organisation or service, but the mechanism
is different [5][6]. It makes sense to just get any error from the
call to try and create the organisation.
- The API mock is based on one for services [7], but I've chosen to
have it inline with the test, since we're unlikely to reuse it, and
it's clearer to have the test setup as part of the test.
[1]: 8f99da525d/app/organisation/rest.py (L34-L47)
[2]: 70b606a2d4/app/main/views/manage_users.py (L166)
[3]: 70b606a2d4/app/main/views/templates.py (L499)
[4]: 70b606a2d4/app/main/views/add_service.py (L30)
[5]: 70b606a2d4/app/main/views/service_settings.py (L102-L104)
[6]: 70b606a2d4/app/main/views/organisations.py (L264-L266)
[7]: 0abc143147/tests/conftest.py (L590-L606)
|
2021-02-17 09:34:30 +00:00 |
|
Pea Tyczynska
|
0199709adb
|
Merge pull request #3788 from alphagov/org-billing-details
View and edit notes and billing details for organisation
|
2021-02-16 15:31:43 +00:00 |
|
Pea Tyczynska
|
47f20ae438
|
Change content following content review
|
2021-02-16 15:20:15 +00:00 |
|
Pea Tyczynska
|
7c34a9bd46
|
Update pyaml
|
2021-02-16 14:48:43 +00:00 |
|
Pea Tyczynska
|
5a342b2a39
|
Test that only platform admins can update org notes
|
2021-02-16 14:46:14 +00:00 |
|
Pea Tyczynska
|
d7596f81fb
|
Add screen reader suffixes on all org settings
So screen reader users have consistent experience.
|
2021-02-16 14:46:14 +00:00 |
|
Pea Tyczynska
|
741beeb903
|
Add test case for when organisation notes do not change
|
2021-02-16 14:46:14 +00:00 |
|
Pea Tyczynska
|
b2e4f76f94
|
Fix import order
|
2021-02-16 14:46:13 +00:00 |
|
Pea Tyczynska
|
eb9e6e2c71
|
Update organisation billing details
|
2021-02-16 14:46:13 +00:00 |
|
Pea Tyczynska
|
36c72bb4cc
|
View edit organisation billing details page
|
2021-02-16 14:46:13 +00:00 |
|
Pea Tyczynska
|
f4dc2a173e
|
Link to edit billing details page for organisation
|
2021-02-16 14:46:13 +00:00 |
|
Pea Tyczynska
|
8ea748f6e4
|
Update organisation notes
|
2021-02-16 14:46:12 +00:00 |
|
Pea Tyczynska
|
e090d97997
|
View edit organisation notes page
Also fix page title for edit service notes page.
|
2021-02-16 14:46:12 +00:00 |
|
Pea Tyczynska
|
56b777872e
|
Organisation billing details visible on organisation settings page
|
2021-02-16 14:46:12 +00:00 |
|
Pea Tyczynska
|
f0d94a009e
|
Organisation notes visible on organisation settings page
|
2021-02-16 14:46:11 +00:00 |
|
Ben Thorner
|
71198bbb07
|
Merge pull request #3803 from alphagov/revert-3802-pyup-scheduled-update-2021-02-15
Revert "Scheduled weekly dependency update for week 07"
|
2021-02-16 14:36:08 +00:00 |
|
Ben Thorner
|
e23daa205c
|
Revert "Scheduled weekly dependency update for week 07"
|
2021-02-16 14:25:43 +00:00 |
|
Ben Thorner
|
6e04313c18
|
Merge pull request #3802 from alphagov/pyup-scheduled-update-2021-02-15
Scheduled weekly dependency update for week 07
|
2021-02-16 13:46:54 +00:00 |
|
pyup-bot
|
e28f7da5bf
|
Update xlrd from 1.2.0 to 2.0.1
|
2021-02-15 13:55:20 +00:00 |
|
pyup-bot
|
44b66ccfe6
|
Update urllib3 from 1.26.2 to 1.26.3
|
2021-02-15 13:55:20 +00:00 |
|
pyup-bot
|
30662b123e
|
Update s3transfer from 0.3.3 to 0.3.4
|
2021-02-15 13:55:20 +00:00 |
|
pyup-bot
|
9f97cc5c45
|
Update rsa from 4.5 to 4.7
|
2021-02-15 13:55:19 +00:00 |
|
pyup-bot
|
f46b616b2e
|
Update pyyaml from 5.3.1 to 5.4.1
|
2021-02-15 13:55:19 +00:00 |
|
pyup-bot
|
b0f772a2cf
|
Update pyjwt from 2.0.0 to 2.0.1
|
2021-02-15 13:55:19 +00:00 |
|
pyup-bot
|
a0d7cfa904
|
Update phonenumbers from 8.12.15 to 8.12.18
|
2021-02-15 13:55:18 +00:00 |
|
pyup-bot
|
123ff1d1a4
|
Update packaging from 20.8 to 20.9
|
2021-02-15 13:55:17 +00:00 |
|
pyup-bot
|
087cebb363
|
Update openpyxl from 3.0.5 to 3.0.6
|
2021-02-15 13:55:17 +00:00 |
|
pyup-bot
|
c29f67b3f2
|
Update idna from 2.10 to 3.1
|
2021-02-15 13:55:16 +00:00 |
|
pyup-bot
|
3e6eccc8fe
|
Update greenlet from 0.4.17 to 1.0.0
|
2021-02-15 13:55:16 +00:00 |
|
pyup-bot
|
f9198cfc09
|
Update docutils from 0.15.2 to 0.16
|
2021-02-15 13:55:16 +00:00 |
|
pyup-bot
|
9bb21c7819
|
Update dnspython from 1.16.0 to 2.1.0
|
2021-02-15 13:55:15 +00:00 |
|
pyup-bot
|
678fcc3f7b
|
Update colorama from 0.4.3 to 0.4.4
|
2021-02-15 13:55:15 +00:00 |
|
pyup-bot
|
a397d5045c
|
Update cachetools from 4.2.0 to 4.2.1
|
2021-02-15 13:55:15 +00:00 |
|
pyup-bot
|
631171c9f3
|
Update botocore from 1.19.51 to 1.20.7
|
2021-02-15 13:55:14 +00:00 |
|
pyup-bot
|
f52a9a83eb
|
Update boto3 from 1.16.51 to 1.17.7
|
2021-02-15 13:55:14 +00:00 |
|
pyup-bot
|
3304d25ebf
|
Update awscli from 1.18.211 to 1.19.7
|
2021-02-15 13:55:14 +00:00 |
|
pyup-bot
|
dcde359deb
|
Update requests-mock from 1.7.0 to 1.8.0
|
2021-02-15 13:55:13 +00:00 |
|
pyup-bot
|
56e67ce3a0
|
Update flake8-print from 3.1.4 to 4.0.0
|
2021-02-15 13:55:13 +00:00 |
|
pyup-bot
|
f04de93e74
|
Update flake8-bugbear from 19.8.0 to 20.11.1
|
2021-02-15 13:55:12 +00:00 |
|
pyup-bot
|
098397457f
|
Update flake8 from 3.7.9 to 3.8.4
|
2021-02-15 13:55:12 +00:00 |
|
pyup-bot
|
b7dd7bf6f7
|
Update freezegun from 0.3.12 to 1.1.0
|
2021-02-15 13:55:12 +00:00 |
|
pyup-bot
|
1d3b4e9cb8
|
Update beautifulsoup4 from 4.8.1 to 4.9.3
|
2021-02-15 13:55:11 +00:00 |
|
pyup-bot
|
8aae790a72
|
Update pytest-xdist from 1.31.0 to 2.2.1
|
2021-02-15 13:55:11 +00:00 |
|
pyup-bot
|
292e0ad358
|
Update pytest-mock from 1.11.2 to 3.5.1
|
2021-02-15 13:55:11 +00:00 |
|
pyup-bot
|
298259a591
|
Update pytest from 5.3.2 to 6.2.2
|
2021-02-15 13:55:10 +00:00 |
|
pyup-bot
|
c7112c0e69
|
Update isort from 4.3.21 to 5.7.0
|
2021-02-15 13:55:10 +00:00 |
|
pyup-bot
|
baabff6284
|
Update notifications-python-client from 5.7.1 to 6.0.2
|
2021-02-15 13:55:09 +00:00 |
|
pyup-bot
|
d70e5bb104
|
Update notifications-python-client from 5.7.1 to 6.0.2
|
2021-02-15 13:55:09 +00:00 |
|
pyup-bot
|
ab4466e66f
|
Update eventlet from 0.30.0 to 0.30.1
|
2021-02-15 13:55:09 +00:00 |
|