Commit graph

1506 commits

Author SHA1 Message Date
Tom Hughes
99e537859a Fix HTML escaping issues with user role icons 2020-11-13 15:13:37 +00:00
Tom Hughes
bfffe7ed96 Prefer string interpolation to concatenation 2020-11-13 11:32:28 +00:00
Tom Hughes
582402ba8f Prefer keyword arguments when method has optional boolean arguments 2020-11-13 10:22:55 +00:00
Andy Allan
1f242978af Prefer keyword arguments when method has optional boolean arguments 2020-11-12 11:24:44 +00:00
Andy Allan
01b72f7adf Fix missing html layout for user_mailer emails
This was caused by renaming the mailer without renaming the layout. Added a test to cover this in future.

Fixes #2903
2020-11-11 11:19:20 +00:00
Tom Hughes
93e49daee2 Merge remote-tracking branch 'upstream/pull/2918' into master 2020-10-28 11:29:57 +00:00
Andy Allan
da2277505f Ensure that test utility methods are marked as private
This allows us to enable the check for test method names.
2020-10-28 11:49:01 +01:00
Andy Allan
86a5e198f7 Refactor test to use general basic_authorization_header method
There's no need for this test to have its own version of the method.
2020-10-28 11:33:51 +01:00
Andy Allan
c04d05686f Resolve some extra-long lines 2020-10-28 11:07:34 +01:00
Tom Hughes
e72092161b Update test results for presence of zh-HK translations 2020-10-19 19:26:17 +01:00
Tom Hughes
2dc50b4431 Fix new rubocop warnings 2020-10-09 08:26:38 +01:00
Tom Hughes
ddac660f3b Merge remote-tracking branch 'upstream/pull/2839' 2020-09-30 11:54:30 +01:00
mmd-osm
37a7996d94 API User details: format tweaks
- _show_ to return single user only
- remove nesting for languages
2020-09-18 21:50:38 +02:00
mmd-osm
dff8effc13 Json user details: unit tests 2020-09-16 22:13:19 +02:00
mmd-osm
9f280be82b Fix unit test, assume application/xml instead of text/xml 2020-09-16 21:01:54 +02:00
Tom Hughes
21adea321b Convert password reset forms to use bootstrap 2020-09-04 00:36:43 +01:00
Tom Hughes
c11142d5c0 Convert logout form to use bootstrap 2020-09-03 23:52:59 +01:00
Tom Hughes
abca51e4d8 Fix some Style/StringConcatenation warnings 2020-08-09 19:48:16 +01:00
Tom Hughes
75e135869e Fix Style/ExplicitBlockArgument warnings 2020-08-09 19:06:04 +01:00
Tom Hughes
ea59d95f4a Fix some new rubocop warnings 2020-08-06 22:27:30 +01:00
Tom Hughes
79447e7549 Replace querystring parser with qs yarn module 2020-08-06 20:51:55 +01:00
Tom Hughes
447c05fcb8 Move jquery.cookie to be a yarn managed asset 2020-08-06 19:28:51 +01:00
Tom Hughes
4dcedf666c Move leaflet to be a yarn managed asset 2020-08-06 19:28:51 +01:00
Tom Hughes
0e2a66e8de Fix new rubocop warnings 2020-08-06 18:42:16 +01:00
Tom Hughes
c24c2e481c Merge remote-tracking branch 'upstream/pull/2667' 2020-08-05 21:50:08 +01:00
Tom Hughes
2d3972249c Fix some rubocop todos 2020-08-02 19:38:58 +01:00
Andy Allan
47d11763fb Add some changsets that shouldn't be selected 2020-07-22 17:51:43 +02:00
Andy Allan
e7dc2f2e55 Refactor changeset index testing to assert against objects, not db queries
This avoids the situation where tests pass despite an empty db.

Refs #2614
2020-07-22 17:39:48 +02:00
Andy Allan
b23d6a5445 Refator way_full test to avoid relying on non-existant fixtures
Refs #2614
2020-07-22 16:33:33 +02:00
Andy Allan
3bc2b32111 Rephrase 'replying' text to clarify what will actually happen
Fixes #2166
2020-07-15 15:13:29 +02:00
Andy Allan
41d6f19a6b Rename the notes#mine action to index 2020-07-08 18:43:30 +02:00
Andy Allan
8d2271699b Use bootstrap_form as the formbuilder for GPX upload form
This also uses the recommended bs-custom-file-input javascript plugin
for the file input control.
2020-07-01 17:23:02 +02:00
Tom Hughes
a221aabe3c Check that pluralizable translations have an "other" key 2020-06-11 19:21:41 +01:00
Andy Allan
600812f6ad Rework user#set_status and #delete to avoid GET requests
This renames the delete action to destroy, and starts using resourceful
routing for user actions.
2020-06-10 11:49:18 +02:00
Tom Hughes
d6f518f627 More improvements to locale selection for the data browser
Use the browser language preferences for non-logged in users.
2020-06-07 19:10:48 +01:00
Tom Hughes
293fe68eff Merge remote-tracking branch 'upstream/pull/2642' 2020-06-04 17:40:13 +01:00
Tom Hughes
768a792a61 Improve selection of name to display in data browser
If the user is logged in then consider all their preferred
languages rather than just the UI language, and use the full
locale matching algorithm instead of just checking parents.

Fixes #2636
2020-06-04 17:33:11 +01:00
Tom Hughes
bf22c69286 Improve locale selection algorithm
Don't include locales which only have rails translations in
the candidates, and ensure that user specified options take
priority over less specific variants of earlier choices.
2020-06-04 17:33:11 +01:00
Andy Allan
8ebfdbc1ff Move make_friend and remove_friend to friendships controller 2020-06-03 18:23:07 +02:00
Andy Allan
59c90aa023 Move friendship related tests to separate file 2020-06-03 17:51:11 +02:00
Andy Allan
7485b49a3a Remove unused test helper 2020-05-13 18:15:07 +02:00
Andy Allan
3a16c465f7 Refactor user controller tests
Because we don't have direct access to the session and cookies, some
of the tests need more setup e.g. by moving through the signup process
to get the session tokens into the right place for the confirmation
steps to work.
2020-05-13 18:08:22 +02:00
Andy Allan
36a1f38109 Refactor api traces_controller tests 2020-05-13 18:08:07 +02:00
Tom Hughes
7ffa2e96be Refactor users_controller_test and user_preferences_controller_test 2020-05-07 19:34:48 +01:00
Tom Hughes
2d37f1a03c Refactor notes_controller_test 2020-05-06 18:39:48 +01:00
Tom Hughes
45e560bef6 Add test for browsing a note closed by a deleted user 2020-05-06 18:06:45 +01:00
Andy Allan
f84980f183 More controller test refactoring 2020-05-06 16:51:04 +02:00
Tom Hughes
9a87412d2a Refactor permissions_controller_test 2020-05-05 19:40:52 +01:00
Tom Hughes
c576edecd4 Refactor versions_controller_test 2020-05-05 19:36:38 +01:00
Tom Hughes
93f1489048 Refactor tracepoints_controller_test 2020-05-05 19:28:42 +01:00