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

7380 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
3371ca37f1 Merge remote-tracking branch 'openstreetmap/pull/1337' 2016-10-26 15:41:30 +01:00
Tom Hughes
20aa4ba31b Merge remote-tracking branch 'openstreetmap/pull/1336' 2016-10-26 15:35:18 +01:00
Tom Hughes
69fa4e9940 Merge remote-tracking branch 'openstreetmap/pull/1335' 2016-10-26 15:34:49 +01:00
Andy Allan
f464e2a6e9 Suppress XML parsing errors. 
This technique was already used in app/models/changeset.rb

This suppresses the error messages when parsing invalid XML, but
the exceptions are still raised, as tested in test_from_xml_double_lat
in test/models/node_test.rb
 2016-10-26 10:35:03 +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
Andy Allan
162f04d789 Convert ACL fixture to a factory, and add some tests 
The fixture was unused, so I took the opportunity to put in a couple
of basic model tests.
 2016-10-26 09:15:56 +01:00
Tom Hughes
7725cd59b4 Keep layer labels on top of the tiles in the layer switcher 
Fixes #1334
 2016-10-21 15:23:37 +01:00
Tom Hughes
3548894696 Update bundle 2016-10-21 09:19:12 +01:00
Tom Hughes
e17b89e89f Fix rubocop warnings 2016-10-20 22:35:51 +01:00
Tom Hughes
9d106676b8 Replace quova with support for local Maxmind GeoIP lookups 2016-10-20 21:40:03 +01:00
Tom Hughes
99ccffe4a9 Merge remote-tracking branch 'openstreetmap/pull/1332' 2016-10-19 12:22:42 +01:00
Tom Hughes
6a9b0f05b2 Load user and language fixtures for diary model tests 2016-10-19 12:17:20 +01:00
Tom Hughes
c83f15821d Update schema 2016-10-19 11:58:08 +01:00
Tom Hughes
4627b79885 Merge remote-tracking branch 'openstreetmap/pull/1331' 2016-10-19 11:52:17 +01:00
Tom Hughes
d058f3ef28 Merge remote-tracking branch 'openstreetmap/pull/1330' 2016-10-19 11:52:14 +01:00
Andy Allan
43066124bf Remove unused countries fixture. 2016-10-19 11:47:22 +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
Karim Osman
23c79ba2a3 Replace WordPress logo with correct version 
See https://wordpress.org/about/logos/ for official source.

Closes #1329
 2016-10-18 19:02:51 +01:00
Niklas Laxström
5ae1951747 Localisation updates from https://translatewiki.net. 2016-10-17 20:54:17 +02:00
Marco Antonio Frias Butrón
1f9857e76c Patch classes on the locate control 
This patches the map on the user page in the same way as the main map.

Closes #1328
 2016-10-17 11:00:01 +01:00
Marco Antonio Frias Butrón
1ba7eccae6 Add cursor style on close icon 
Without this the close icon for the routing panel doesn't change the
pointer as it isn't a link and isn't in a close-wrap container.

Closes #1327
 2016-10-17 10:55:47 +01:00
Niklas Laxström
a9520500f6 Localisation updates from https://translatewiki.net. 2016-10-13 08:34:09 +02:00
Tom Hughes
291f43c7e2 Fix rubocop warning 2016-10-12 19:28:10 +01:00
Tom Hughes
e96f1e736a Merge remote-tracking branch 'openstreetmap/pull/1309' 2016-10-12 19:11:07 +01:00
Tom Hughes
02eeefbe0f Merge remote-tracking branch 'openstreetmap/pull/1322' 2016-10-12 19:07:55 +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
Tom Hughes
ab0f79bbab Remove reference to standard layer in "no key" message 
Fixes #1319
 2016-10-12 15:06:03 +01:00
Andy Allan
41e05f0929 Remove unnecessary controller references from the redirect hashes. 
Rails redirect_to uses the current controller by default, so there
is no need to re-iterate this in the code when the redirect targets
the current controller.

The short-form is already used elsewhere, this just tidies up those
which were still using the long-form.
 2016-10-12 14:32:49 +01:00
Mikel Maron
3a14abde1b Update structure.sql 2016-10-11 21:22:00 -04:00
Mikel Maron
99afab6d61 adding back trailing newlines 2016-10-11 20:45:44 -04:00
Mikel Maron
6a57901071 adding back trailing newlines 2016-10-11 20:44:58 -04:00
Mikel Maron
3726d561ea last minor fixes 2016-10-11 20:42:10 -04:00
Mikel Maron
5cd00ddfd1 rubocop clean up 2016-10-11 15:44:37 -04:00
Mikel Maron
43ef60b6d5 break out author subscriptions to its own migration 2016-10-10 21:18:03 -04:00
Tom Hughes
c2e12ed77d Add a note_with_comments factory 2016-10-10 15:08:11 +01:00
Tom Hughes
61eac42a82 Makr author/author_ip tests more consistent 2016-10-10 13:54:58 +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
bb22e23dfb css in right place; fix structure.sql 2016-10-06 21:47:29 -04:00
Mikel Maron
e055eaf690 tests passing 2016-10-06 21:33:47 -04:00
Mikel Maron
3c01d2e80d more idiomatic models for diary entry subscriptions 2016-10-06 20:31:10 -04:00
Andy Allan
41c9bc2326 Remove the note and note_comments fixtures 
You may need to run "DELETE FROM notes" and "DELETE FROM note_comments"
on your local test database.
 2016-10-06 09:17:58 +01: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