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

1075 commits

Author SHA1 Message Date
Andy Allan
aa185bf4f8 Replace fixtures with factory for relation_tags 2016-10-31 12:30:57 +01:00
Andy Allan
97d63db369 Replace fixtures with factory for way_tags 2016-10-31 11:49:51 +01:00
Andy Allan
3026af170a Replace fixtures with factory for node_tags 2016-10-30 18:28:01 +01:00
Tom Hughes
fc0aebc1a8 Merge remote-tracking branch 'openstreetmap/pull/1352' 2016-10-30 16:59:20 +00:00
Andy Allan
aba28ec9e0 Replace fixtures with a factory for old_relation_tags 2016-10-30 16:32:11 +01:00
Andy Allan
e308da8daf Convert fixtures to factory for old_way_tags 2016-10-30 16:15:23 +01:00
Andy Allan
acb7f44069 Replace fixtures with a factory for old_node_tags 
Also includes a slight simplification of the old_node_tags tests.
 2016-10-30 15:36:33 +01: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
4d73706ff3 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.
 2016-10-30 11:06:35 +01:00
Andy Allan
5e86393f72 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.
 2016-10-30 10:29:16 +01:00
Andy Allan
90175c3bdb Stub out requests to gravatar.com during tests. 2016-10-30 10:28:58 +01:00
Andy Allan
d3d6e9902c Stub out requests to hostip.info during tests 
These are detecting the correct locale for showing terms during signup
 2016-10-30 10:28:46 +01:00
Andy Allan
6bc488a983 Add webmock to intercept real http connections during tests 
Intercepting real http connections also allows running the test
suite without an internet connection.
 2016-10-30 10:28:26 +01:00
Andy Allan
a32333ba12 Use stub_any_instance in order to stub find results. 
This is a much cleaner approach than before.
 2016-10-30 10:22:10 +01:00
Andy Allan
ea502ac9df Rubocop fix. 2016-10-29 17:32:50 +02: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
Andy Allan
15689af6bf Replace trace-related fixtures with factories. 
The mocking and stubbing in the controller tests is
unfortunate, but the models interact directly with the filesystem
using the trace id so that's hard to control any other way.
 2016-10-29 16:23:04 +02:00
Tom Hughes
f7b4793c50 Require user_roles fixtures 2016-10-27 12:15:28 +01: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
Tom Hughes
3371ca37f1 Merge remote-tracking branch 'openstreetmap/pull/1337' 2016-10-26 15:41:30 +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
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
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
4627b79885 Merge remote-tracking branch 'openstreetmap/pull/1331' 2016-10-19 11:52:17 +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
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
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
e055eaf690 tests passing 2016-10-06 21:33:47 -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