]>
git.openstreetmap.org Git - rails.git/log
Bryan Housel [Tue, 15 Nov 2016 15:16:34 +0000 (10:16 -0500)]
Update to iD v2.0.0
Holger Jeromin [Mon, 14 Nov 2016 07:57:16 +0000 (08:57 +0100)]
Removed duplicate entry for turn straight
Holger Jeromin [Fri, 11 Nov 2016 18:30:06 +0000 (19:30 +0100)]
Fixed typo trun vs turn
Tom Hughes [Thu, 10 Nov 2016 12:14:19 +0000 (12:14 +0000)]
Use image_optim_rails instead of image_optim
The rails hooks have been extracted into a separate gem so
this hasn't actually been working since the last image_optim
update happened.
Niklas Laxström [Thu, 10 Nov 2016 08:27:56 +0000 (09:27 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 9 Nov 2016 22:07:42 +0000 (22:07 +0000)]
Stub nominatim for reverse lookups in note tests
Tom Hughes [Wed, 9 Nov 2016 21:54:26 +0000 (21:54 +0000)]
Stub nominatim for reverse lookups in diary tests
Tom Hughes [Wed, 9 Nov 2016 20:36:09 +0000 (20:36 +0000)]
Rename stub_signup_requests to stub_hostip_requests
Tom Hughes [Wed, 9 Nov 2016 20:33:55 +0000 (20:33 +0000)]
Convert more 'setup do' to 'def setup' for consistency
Tom Hughes [Wed, 9 Nov 2016 20:32:54 +0000 (20:32 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1350'
Tom Hughes [Wed, 9 Nov 2016 16:16:28 +0000 (16:16 +0000)]
Update google logo
Fixes #1364
Tom Hughes [Wed, 9 Nov 2016 16:09:32 +0000 (16:09 +0000)]
Disable zoom buttons when zoom limit is reached
Fixes #1365
Andy Allan [Wed, 9 Nov 2016 16:04:35 +0000 (16:04 +0000)]
Use 'def setup' instead of 'setup do', for consistency
Andy Allan [Wed, 9 Nov 2016 16:00:47 +0000 (16:00 +0000)]
Extract the hostip.info stubbing into a common method.
There doesn't appear to be any before(:suite) equivalent for Minitest
so this is the least-surprising way to do this.
Tom Hughes [Mon, 7 Nov 2016 11:31:58 +0000 (11:31 +0000)]
Expire old oauth nonces
Siebrand Mazeland [Fri, 4 Nov 2016 20:40:52 +0000 (21:40 +0100)]
Localisation updates from https://translatewiki.net.
Siebrand Mazeland [Fri, 4 Nov 2016 11:49:25 +0000 (12:49 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 2 Nov 2016 15:35:45 +0000 (15:35 +0000)]
Reject oauth nonces over a day old
Niklas Laxström [Thu, 3 Nov 2016 07:06:35 +0000 (08:06 +0100)]
Localisation updates from https://translatewiki.net.
Niklas Laxström [Tue, 1 Nov 2016 07:32:42 +0000 (08:32 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 31 Oct 2016 21:24:10 +0000 (21:24 +0000)]
Fix rubocop warnings
Tom Hughes [Mon, 31 Oct 2016 21:18:28 +0000 (21:18 +0000)]
Update bundle
Tom Hughes [Sun, 30 Oct 2016 16:59:20 +0000 (16:59 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1352'
Tom Hughes [Sun, 30 Oct 2016 16:57:35 +0000 (16:57 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1351'
Andy Allan [Sun, 30 Oct 2016 11:45:02 +0000 (12:45 +0100)]
Replace changeset_tags fixtures with a factory.
Andy Allan [Sun, 30 Oct 2016 11:23:23 +0000 (12:23 +0100)]
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.
Andy Allan [Sun, 30 Oct 2016 10:06:35 +0000 (11:06 +0100)]
Refactor the gravatar email changes to use webmock stubbing
The main reason for doing this is to make the tests easier to read,
rather than having to look up both the gravatar fixture, and then
correlate that with the users fixture. Putting the expected response
code in the tests is much more explicit.
Andy Allan [Sat, 29 Oct 2016 17:40:48 +0000 (19:40 +0200)]
Use webmock to power the with_http_stubs helper
This involves a small amount of changing the fixtures since we're
using the regexp and not the full url matching powers of webmock.
Andy Allan [Fri, 28 Oct 2016 12:44:07 +0000 (13:44 +0100)]
Stub out requests to gravatar.com during tests.
Andy Allan [Fri, 28 Oct 2016 12:43:13 +0000 (13:43 +0100)]
Stub out requests to hostip.info during tests
These are detecting the correct locale for showing terms during signup
Andy Allan [Fri, 28 Oct 2016 12:35:48 +0000 (13:35 +0100)]
Add webmock to intercept real http connections during tests
Intercepting real http connections also allows running the test
suite without an internet connection.
Tom Hughes [Sat, 29 Oct 2016 17:08:31 +0000 (18:08 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1349'
Tom Hughes [Sat, 29 Oct 2016 15:26:16 +0000 (16:26 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1348'
Andy Allan [Sat, 29 Oct 2016 14:54:42 +0000 (16:54 +0200)]
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.
Andy Allan [Sat, 29 Oct 2016 15:14:56 +0000 (17:14 +0200)]
Use dc:creator for note RSS feeds
The author tag is reserved for email addresses
Andy Allan [Sat, 29 Oct 2016 15:10:21 +0000 (17:10 +0200)]
Use dc:creator for diary entry RSS
The author tag is reserved for email addresses, and we already use
dc:creator in other feeds.
Andy Allan [Sat, 29 Oct 2016 15:08:16 +0000 (17:08 +0200)]
Use a full url for the image in the diary rss feed.
Picked up by a validator, see
https://validator.w3.org/feed/docs/error/InvalidFullLink.html
Andy Allan [Sat, 29 Oct 2016 15:05:30 +0000 (17:05 +0200)]
Make the image title match the feed title in diary rss
This is recommended at https://validator.w3.org/feed/docs/warning/ImageTitleDoesntMatch.html
Tom Hughes [Thu, 27 Oct 2016 11:15:28 +0000 (12:15 +0100)]
Require user_roles fixtures
Tom Hughes [Thu, 27 Oct 2016 10:57:32 +0000 (11:57 +0100)]
Update mailmap
Tom Hughes [Thu, 27 Oct 2016 10:51:36 +0000 (11:51 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1344'
Mormegil [Thu, 27 Oct 2016 10:34:07 +0000 (12:34 +0200)]
Ensure IE/Edge compatibility for routing drag&drop
Use the DataTransfer interface properly, using the `text` format, as
IE/Edge does not support much more. We can JSON-serialize anything
there, even though right now, only a single string would be enough.
Also, IE does not support .setDragImage, so check for support prior
to calling.
Fixes #1343
Tom Hughes [Wed, 26 Oct 2016 20:34:38 +0000 (21:34 +0100)]
Reset database before running tests
Tom Hughes [Wed, 26 Oct 2016 14:54:42 +0000 (15:54 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1339'
Tom Hughes [Wed, 26 Oct 2016 14:48:56 +0000 (15:48 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1338'
Tom Hughes [Wed, 26 Oct 2016 14:41:30 +0000 (15:41 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1337'
Tom Hughes [Wed, 26 Oct 2016 14:35:18 +0000 (15:35 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1336'
Tom Hughes [Wed, 26 Oct 2016 14:34:49 +0000 (15:34 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1335'
Andy Allan [Wed, 26 Oct 2016 12:14:52 +0000 (13:14 +0100)]
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.
Andy Allan [Wed, 26 Oct 2016 10:41:18 +0000 (11:41 +0100)]
Replace messages fixtures with a factory.
Andy Allan [Wed, 26 Oct 2016 09:35:03 +0000 (10:35 +0100)]
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
Andy Allan [Wed, 26 Oct 2016 09:07:49 +0000 (10:07 +0100)]
Replace user_preferences fixture with a factory.
Andy Allan [Wed, 26 Oct 2016 08:57:31 +0000 (09:57 +0100)]
Replace hardcoded user id with a reference to the relevant user fixture
This makes it easier to figure out what the 1 refers to.
Andy Allan [Wed, 26 Oct 2016 08:15:56 +0000 (09:15 +0100)]
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.
Tom Hughes [Fri, 21 Oct 2016 14:23:37 +0000 (15:23 +0100)]
Keep layer labels on top of the tiles in the layer switcher
Fixes #1334
Tom Hughes [Fri, 21 Oct 2016 08:19:12 +0000 (09:19 +0100)]
Update bundle
Tom Hughes [Thu, 20 Oct 2016 21:00:56 +0000 (22:00 +0100)]
Fix rubocop warnings
Tom Hughes [Thu, 20 Oct 2016 20:32:43 +0000 (21:32 +0100)]
Replace quova with support for local Maxmind GeoIP lookups
Tom Hughes [Wed, 19 Oct 2016 11:22:42 +0000 (12:22 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1332'
Tom Hughes [Wed, 19 Oct 2016 11:17:20 +0000 (12:17 +0100)]
Load user and language fixtures for diary model tests
Tom Hughes [Wed, 19 Oct 2016 10:58:08 +0000 (11:58 +0100)]
Update schema
Tom Hughes [Wed, 19 Oct 2016 10:52:17 +0000 (11:52 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1331'
Tom Hughes [Wed, 19 Oct 2016 10:52:14 +0000 (11:52 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1330'
Andy Allan [Wed, 19 Oct 2016 10:47:22 +0000 (11:47 +0100)]
Remove unused countries fixture.
Andy Allan [Wed, 19 Oct 2016 10:32:08 +0000 (11:32 +0100)]
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.
Andy Allan [Wed, 19 Oct 2016 09:57:40 +0000 (10:57 +0100)]
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.
Karim Osman [Tue, 18 Oct 2016 15:59:56 +0000 (17:59 +0200)]
Replace WordPress logo with correct version
See https://wordpress.org/about/logos/ for official source.
Closes #1329
Niklas Laxström [Mon, 17 Oct 2016 18:54:17 +0000 (20:54 +0200)]
Localisation updates from https://translatewiki.net.
Marco Antonio Frias Butrón [Sun, 16 Oct 2016 20:26:19 +0000 (16:26 -0400)]
Patch classes on the locate control
This patches the map on the user page in the same way as the main map.
Closes #1328
Marco Antonio Frias Butrón [Sun, 16 Oct 2016 20:09:00 +0000 (16:09 -0400)]
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
Niklas Laxström [Thu, 13 Oct 2016 06:34:09 +0000 (08:34 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 12 Oct 2016 18:28:10 +0000 (19:28 +0100)]
Fix rubocop warning
Tom Hughes [Wed, 12 Oct 2016 18:11:07 +0000 (19:11 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1309'
Tom Hughes [Wed, 12 Oct 2016 18:07:55 +0000 (19:07 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1322'
Mikel Maron [Wed, 12 Oct 2016 14:52:05 +0000 (10:52 -0400)]
merge upstream/master and resolve conflicts from https://github.com/openstreetmap/openstreetmap-website/pull/1318
Andy Allan [Wed, 12 Oct 2016 14:43:54 +0000 (15:43 +0100)]
Replace changeset_comments fixtures with a factory.
There's little point in testing ChangesetComment.count so I've removed that
test.
Tom Hughes [Wed, 12 Oct 2016 14:06:03 +0000 (15:06 +0100)]
Remove reference to standard layer in "no key" message
Fixes #1319
Andy Allan [Wed, 12 Oct 2016 13:32:49 +0000 (14:32 +0100)]
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.
Mikel Maron [Wed, 12 Oct 2016 01:22:00 +0000 (21:22 -0400)]
Update structure.sql
Mikel Maron [Wed, 12 Oct 2016 00:45:44 +0000 (20:45 -0400)]
adding back trailing newlines
Mikel Maron [Wed, 12 Oct 2016 00:44:58 +0000 (20:44 -0400)]
adding back trailing newlines
Mikel Maron [Wed, 12 Oct 2016 00:42:10 +0000 (20:42 -0400)]
last minor fixes
Mikel Maron [Tue, 11 Oct 2016 19:44:37 +0000 (15:44 -0400)]
rubocop clean up
Mikel Maron [Tue, 11 Oct 2016 01:18:03 +0000 (21:18 -0400)]
break out author subscriptions to its own migration
Tom Hughes [Mon, 10 Oct 2016 14:08:11 +0000 (15:08 +0100)]
Add a note_with_comments factory
Tom Hughes [Mon, 10 Oct 2016 12:54:58 +0000 (13:54 +0100)]
Makr author/author_ip tests more consistent
Tom Hughes [Mon, 10 Oct 2016 12:48:09 +0000 (13:48 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1312'
Mikel Maron [Fri, 7 Oct 2016 13:04:44 +0000 (09:04 -0400)]
clean up comments
Mikel Maron [Fri, 7 Oct 2016 10:36:14 +0000 (06:36 -0400)]
fix rubocop warnings
Mikel Maron [Fri, 7 Oct 2016 10:32:05 +0000 (06:32 -0400)]
fix rubocop warnings
Mikel Maron [Fri, 7 Oct 2016 01:47:29 +0000 (21:47 -0400)]
css in right place; fix structure.sql
Mikel Maron [Fri, 7 Oct 2016 01:33:47 +0000 (21:33 -0400)]
tests passing
Mikel Maron [Fri, 7 Oct 2016 00:31:10 +0000 (20:31 -0400)]
more idiomatic models for diary entry subscriptions
Andy Allan [Thu, 6 Oct 2016 08:17:58 +0000 (09:17 +0100)]
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.
Andy Allan [Thu, 6 Oct 2016 08:15:47 +0000 (09:15 +0100)]
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.
Andy Allan [Thu, 6 Oct 2016 08:04:06 +0000 (09:04 +0100)]
Update site_controller_test to use note and note_comment factories.
Andy Allan [Thu, 6 Oct 2016 08:03:31 +0000 (09:03 +0100)]
Update browse_controller_test to use note and note_comment factories.
Andy Allan [Thu, 6 Oct 2016 07:59:24 +0000 (08:59 +0100)]
Fix bugs->notes in comment
Andy Allan [Thu, 6 Oct 2016 07:56:45 +0000 (08:56 +0100)]
Update note model tests to use factories.
The NoteTest.test_visible? has changed slightly, so that the second
test of .visible? is using a closed note, which is a more useful test
than the original.
Andy Allan [Thu, 6 Oct 2016 07:52:17 +0000 (08:52 +0100)]
Add factories for notes and note_comments