Commit graph

467 commits

Author SHA1 Message Date
Andy Allan
99df5f6179 Rename association to reported_user, for clarity 2017-07-12 11:44:05 +01:00
Andy Allan
6f375ef493 Get tests passing. Use factories instead of fixtures. 2017-07-12 11:38:50 +01:00
Andy Allan
dbd88d893f Merge branch 'master' into moderation 2017-07-12 10:16:11 +01:00
Tom Hughes
28bfaa9fb6 Replace timecop with the rails builtin travel_to method 2017-07-10 21:19:22 +01:00
Andy Allan
cbf71f04c2 Hide contributor terms details, unless the user hasn't agreed
It's no longer important to show when users agreed to the contributor terms.
For users that haven't agreed, we still show their status on their profile.

Logic was also re-written to avoid lots of `if not` things, and tests added.
2017-07-05 12:39:52 +01:00
Tom Hughes
fe1e28b4f4 Fix more parameter sanitisation issues and add tests 2017-06-29 20:52:57 +01:00
Tom Hughes
3893fd72a9 Fix some tests for changes in rails 5 2017-06-27 08:26:44 +01:00
Tom Hughes
03408b6294 Update get/post etc to remove use of deprecated syntax 2017-06-27 08:26:44 +01:00
Andy Allan
396f2e28dd Rework coordinates to avoid scientific formatting of small numbers. Fixes #1509 2017-06-23 14:03:57 +01:00
Tom Hughes
2357118c46 Avoid using format as a URL parameter name
This prevents rails confusing it with the builtin format
parameter derived from the URL extension.
2017-06-03 12:08:35 +01:00
Tom Hughes
ff97501ed0 Remove all use of the :text option to render
It doesn't actually do what it says, as it sets the content type
to text/html not text/plain so is just confusing and as a result
has been deprecated in newer rails versions.
2017-06-02 19:12:05 +01:00
Tom Hughes
5b33f3f8e3 Fix rubocop warnings 2017-06-02 00:08:30 +01:00
Andy Allan
060230fb94 Ensure closed changesets appear in the feed, and update some misleading comments. 2017-06-01 15:43:51 +01:00
Andy Allan
86822ea225 Remove remaining references to fixtures. 2017-06-01 11:00:50 +01:00
Andy Allan
5d0ea28796 Remove the api_fixtures helper
This is no longer required, as the tests no longer use fixtures.
2017-06-01 10:59:48 +01:00
Andy Allan
162949817d Rubocop fixes. 2017-06-01 10:58:34 +01:00
Andy Allan
3438c15c8f create nodes from factories for the api changes test. 2017-06-01 10:52:05 +01:00
Andy Allan
00546639df Update amf_controller tests to use a factory-generated user for credentials. 2017-05-31 18:51:08 +01:00
Andy Allan
5246ebefa9 Update the user list pagination test to avoid counting users from fixtures. 2017-05-31 18:43:28 +01:00
Andy Allan
cea6f9c4cf Refactor the user list test to use factory-built users and explicit assertions. 2017-05-31 18:40:20 +01:00
Andy Allan
0a1834af63 Use factories to generate the relations 2017-05-31 18:21:24 +01:00
Andy Allan
4ee270df6f Refactor the assert_changeset helper to take an array of changesets, instead of ids. 2017-05-31 18:08:20 +01:00
Andy Allan
241c724adb Only use changesets from factories for the test_query changeset controller tests. 2017-05-31 18:02:56 +01:00
Andy Allan
692c0c39b6 Create objects via factories, rather than implicity relying on fixtures. 2017-05-31 17:53:07 +01:00
Andy Allan
2bcdf9abaa Rework the changeset feed tests.
These now include explicit tests for the changesets expected, as
well as refactoring so that they don't rely on fixtures.
2017-05-31 17:39:58 +01:00
Andy Allan
e682b1a466 Create nodes explicitly rather than relying on fixtures. 2017-05-31 17:10:39 +01:00
Andy Allan
77ff232660 Add ways into the database explicitly, rather than relying on preloaded fixtures. 2017-05-31 17:03:48 +01:00
Andy Allan
f22098f3b7 Create a redaction object before testing the index page lists it. 2017-05-31 16:57:30 +01:00
Andy Allan
cdbecf339e refactor remaining amf controller tests to use factories. 2017-05-31 16:17:47 +01:00
Andy Allan
56d990ff68 Refactor some controller tests to use factories. 2017-05-31 16:08:34 +01:00
Andy Allan
f735b07309 Refactor some controller tests to use factories. 2017-05-31 14:51:53 +01:00
Andy Allan
938786e1ee Refactor various controller tests to use factories. 2017-05-31 14:35:35 +01:00
Andy Allan
fffc572767 Convert more changeset controller tests to use factories. 2017-05-31 12:29:42 +01:00
Andy Allan
cedbd885b7 Refactor more changeset controller tests to use factories. 2017-05-31 11:33:32 +01:00
Andy Allan
90918ade92 Convert more changeset controller tests to use factories. 2017-05-31 10:59:29 +01:00
Andy Allan
0facb801f8 Refactor a few tests to use changeset factories. 2017-05-31 10:45:14 +01:00
Andy Allan
6b6d2447e3 Refactor more changeset_controller tests to use factories. 2017-05-24 17:31:56 +01:00
Andy Allan
8441bcf173 Refactor some changesets controller tests to use factories. 2017-05-24 17:03:07 +01:00
Andy Allan
71ba6ccdd1 Refactor the changeset query tests to use factories.
Unfortunately some references to fixtures have to remain until they
are finally removed.
2017-05-24 16:28:58 +01:00
Andy Allan
eb1a69b880 Convert more relation controller tests to use factories. 2017-05-24 15:52:31 +01:00
Andy Allan
990ab8d39f Convert remaining node_controller tests to use factories. 2017-05-24 15:39:11 +01:00
Andy Allan
f0bacf837d Update more relation_controller tests to use factories. 2017-05-17 11:59:22 +01:00
Andy Allan
63a2f1f1b4 Refactor some relation_controller tests to use factories. 2017-05-17 11:29:11 +01:00
Andy Allan
c7d612df2d Refactor the relation_for_nwr tests to use factories
This is a bit verbose, since the original tests assumed various other
entities were silently not selected. This also improves the tests
since it considers the case of how to handle a relation with the
target member appearing more than once.
2017-05-17 11:11:04 +01:00
Andy Allan
c6d1bd63da More amf_controller tests converted to use factories. 2017-05-10 18:17:30 +01:00
Andy Allan
13fa0e0435 Refactor more amf_controller tests to use factories. 2017-05-10 18:17:30 +01:00
Andy Allan
f6323031cc Refactor putway method tests to use factories
This involved decoding a lot of magic numbers, to figure out which
were node_ids and which were other things (versions, coordinates etc)
2017-05-10 18:17:30 +01:00
Andy Allan
881015036c Refactor some more amf_controller tests to use factories.
The timestamp truncation thing was a pain to figure out.
2017-05-10 18:17:30 +01:00
Andy Allan
3f3ffdfea1 Refactor old_relation_controller tests to use factories. 2017-05-10 14:11:53 +01:00
Andy Allan
3fa3658efa Update old_ways_controller tests to use factories. 2017-05-10 13:38:10 +01:00