cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7407 commits 4 branches 1 tag 499 MiB
Commit graph

118 commits

Author SHA1 Message Date
Tom Hughes
fc0aebc1a8 Merge remote-tracking branch 'openstreetmap/pull/1352' 2016-10-30 16:59:20 +00:00
Andy Allan
596494a590 Replace changeset_tags fixtures with a factory. 2016-10-30 12:45:02 +01:00
Andy Allan
4eeea7e705 Remove the changesets_subscribers fixture. 
Since there is no ChangesetsSubscribers model, we can't use a factory.
Instead we create the associations explicitly when needed.
 2016-10-30 12:23:23 +01:00
Andy Allan
4a9aa0a12e Avoid double-escaping diary entry titles 
The XML builder takes care of the escaping, and adding h() lead to
double-escaped titles in the RSS feed.
 2016-10-29 17:17:56 +02:00
Tom Hughes
2df3605142 Merge remote-tracking branch 'openstreetmap/pull/1339' 2016-10-26 15:54:42 +01:00
Tom Hughes
8920a56133 Merge remote-tracking branch 'openstreetmap/pull/1338' 2016-10-26 15:48:56 +01:00
Andy Allan
c365e2b28a Convert the languages fixtures to a factory 
For some tests, the existance of an 'en' language is assumed by
the database structure (not null default 'en'::character varying) so
this can be created in a setup block.
 2016-10-26 13:14:52 +01:00
Andy Allan
a280f72bee Replace messages fixtures with a factory. 2016-10-26 11:41:18 +01:00
Andy Allan
72ae20ea3c Replace user_preferences fixture with a factory. 2016-10-26 10:07:49 +01:00
Andy Allan
2e9baaa50a Replace hardcoded user id with a reference to the relevant user fixture 
This makes it easier to figure out what the 1 refers to.
 2016-10-26 09:57:31 +01:00
Tom Hughes
e17b89e89f Fix rubocop warnings 2016-10-20 22:35:51 +01:00
Tom Hughes
4627b79885 Merge remote-tracking branch 'openstreetmap/pull/1331' 2016-10-19 11:52:17 +01:00
Andy Allan
feb3b03227 Use model relations when creating objects from factories 
Rather than passing around record ids explicitly, we can use the
model relations and pass around the models. This makes reading the
tests slightly simpler to read.
 2016-10-19 11:32:08 +01:00
Andy Allan
23c3168c55 Replace user_blocks fixture with a factory. 
Traits are used here to make the tests easier to read, and the
different traits can be combined where necessary.
 2016-10-19 10:57:40 +01:00
Tom Hughes
e96f1e736a Merge remote-tracking branch 'openstreetmap/pull/1309' 2016-10-12 19:11:07 +01:00
Mikel Maron
be40536440 merge upstream/master and resolve conflicts from https://github.com/openstreetmap/openstreetmap-website/pull/1318 2016-10-12 10:52:05 -04:00
Andy Allan
a91e50d308 Replace changeset_comments fixtures with a factory. 
There's little point in testing ChangesetComment.count so I've removed that
test.
 2016-10-12 15:44:27 +01:00
Mikel Maron
3726d561ea last minor fixes 2016-10-11 20:42:10 -04:00
Tom Hughes
c2e12ed77d Add a note_with_comments factory 2016-10-10 15:08:11 +01:00
Tom Hughes
3123822bba Merge remote-tracking branch 'openstreetmap/pull/1312' 2016-10-10 13:48:09 +01:00
Mikel Maron
6b7ebf6dc4 clean up comments 2016-10-07 09:04:44 -04:00
Mikel Maron
8272a53ab9 fix rubocop warnings 2016-10-07 06:36:14 -04:00
Mikel Maron
a32076abd6 fix rubocop warnings 2016-10-07 06:32:05 -04:00
Mikel Maron
e055eaf690 tests passing 2016-10-06 21:33:47 -04:00
Andy Allan
c302174b0c Update notes_controller_test to use note and note_comment factories 
I've ported across the naming for each note from the old fixture names.
This helps in the mega-tests where multiple notes are tested at the
same time.

The number or results have changed in some tests, since there's little
point in creating e.g. 5 note comments when 2 is enough to test the
functionality.
 2016-10-06 09:15:47 +01:00
Andy Allan
886dc00ad4 Update site_controller_test to use note and note_comment factories. 2016-10-06 09:04:06 +01:00
Andy Allan
5037e016cd Update browse_controller_test to use note and note_comment factories. 2016-10-06 09:03:31 +01:00
Andy Allan
bfe760a4b0 Replace friends fixture with a factory 2016-10-05 13:18:45 +01:00
Mikel Maron
44b08cc35d not api endpoints, moved to button, fixed notifier message, fixed tests 2016-10-03 22:20:04 -04:00
Mikel Maron
443080d7b0 WIP diary comment subscriptions 2016-10-03 15:04:22 -04:00
Sarah Hoffmann
5efbc8a8b7 look for extra place tags in Nominatim search results 
Administrative boundaries at municipality level are generally
better described by the place node (as town, village etc.).
Nominatim exports the place type in extratags if it was able
to merge place nodes with admin boundaries. Use this preferably
to create the descriptive term.
 2016-09-26 13:00:10 +02:00
Tom Hughes
5f4dcd34ff Fix some rubocop warnings 2016-09-15 22:41:07 +01:00
Andy Allan
516979b045 Add additional list items to ensure they are not selected 
The other list tests already have assetions showing the different
lengths of lists.
 2016-09-15 11:06:37 +01:00
Andy Allan
f1713320c2 Remove diary_entry and diary_comment fixtures, and refactor tests. 
Note that you might need to empty the tables in your local test
database, since the removed fixtures may still linger there.
 2016-09-14 12:41:58 +01:00
Andy Allan
ea610c8c3c Refactor tests to use factories instead of fixtures 2016-09-08 11:44:24 +01:00
Simon Poole
0837205d02 Merge message when Gravatar status has changed with email confirmation 
Merge message when Gravatar status has changed with email confirmation and make messages more verbose and friendly.
 2016-08-19 08:59:40 +02:00
Simon Poole
90b7101cc3 Add tests for change of gravatar use depending on email 2016-08-16 22:09:11 +02:00
Simon Poole
05cd781b25 Remove default enabling of gravatar, check on initial confirmation of e-mail address and on any changes afterward if 
a gravatar exists and enable then if the user hasn't uploaded a picture.
 2016-08-16 21:42:02 +02:00
Tom Hughes
c70a1fe933 Add support for GitHub authentication 2016-07-14 09:40:45 +01:00
Tom Hughes
dd8ebf9b09 Fix rubocop warnings 2016-07-13 09:50:23 +01:00
Tom Hughes
72e71b9972 Fix rubocop warnings 2016-06-09 22:18:28 +01:00
Tom Hughes
246d8a4452 Test titles in changeset feed 2016-03-14 21:18:26 +00:00
Tom Hughes
f94340b9e8 Fix tests that made assumptions about tag ordering 2016-03-09 13:47:05 +00:00
Tom Hughes
f0fa701563 Treeat user as logged in after a password reset 
Fixes #1160
 2016-02-26 16:30:32 +00:00
Aditya Prakash
341f6cd9fe Do not hyperlink profiles of deleted users 2016-02-15 20:47:53 +05:30
Tom Hughes
5d3ecffa28 Fix new rubocop warnings 2016-02-05 13:35:26 +00:00
Tom Hughes
8fe1899596 Fix rubocop warnings 2016-01-19 09:51:24 +00:00
Bryan Housel
98e2884f77 Remove test for iD and Internet Explorer 2015-12-10 18:48:22 -08:00
Tom Hughes
081ac24295 Fix rubocop warnings 2015-11-19 21:41:33 +00:00
Tom Hughes
c9fdd5d3cb Don't send note comment notifications to deleted users 2015-10-30 19:20:36 +00:00