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

122 commits

Author SHA1 Message Date
Tom Hughes
b3e540a6b6 Improve tests for trace RSS feeds 2013-05-10 22:48:26 +01:00
Tom Hughes
ba5107ebb5 Remove the author_name field from notes 2012-12-03 14:50:54 +00:00
Tom Hughes
0d3a9ed9cb Merge branch 'master' into openstreetbugs 
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/user/view.html.erb
	config/locales/en.yml
	config/openlayers.cfg
	db/structure.sql
	vendor/assets/openlayers/OpenLayers.js
 2012-08-22 20:52:08 +01:00
Tom Hughes
bbc14fbcaa Update fixture so active_block appears live... 2012-05-01 21:27:51 +01:00
Matt Amos
7c42552f16 Fixed fixture after adding link from redaction to user 2012-04-05 13:51:57 +01:00
Matt Amos
8bfb5cae8a Added relation redaction logic, same as node and way logic, plus tests 2012-04-05 13:49:46 +01:00
Matt Amos
990f3eba40 Altered old_way stuff to be Railsy like old_node is now 2012-04-05 13:49:43 +01:00
Kai Krueger
72e59b49fa Copy the redaction code from nodes to ways 2012-04-05 13:49:39 +01:00
Matt Amos
67dd9e4c9d Adding first cut of Redactions support 
Redactions support hiding historical versions of elements and
collecting meta-data about that action together.
 2012-04-05 13:46:36 +01:00
Tom Hughes
eaad3611b8 Add functional tests for messages 
Also fixes various issues in the code discovered while writing
the tests, and adds some named routes for messages.
 2012-03-22 23:14:29 +00:00
Tom Hughes
2b037e2892 Test that viewing a block marks it as seen 2012-03-22 19:23:43 +00:00
Tom Hughes
38a610fd31 Add functional tests for the user_roles controller 2012-03-20 17:21:13 +00:00
Tom Hughes
e1d873cde9 Add functional tests for user blocks 
Also fixes various issues in the code discovered while writing
the tests, and adds some named routes for user blocks.
 2012-03-19 11:26:02 +00:00
Tom Hughes
e660e60966 Merge branch 'master' into openstreetbugs 
Conflicts:
	Gemfile
	Gemfile.lock
	lib/migrate.rb
 2012-03-08 18:23:27 +00:00
Tom Hughes
e3152ea1c7 Add some more unit tests for users 2012-03-07 16:44:58 +00:00
Tom Hughes
2a62ebec53 Add some extra unit tests for diary entries 2012-03-07 15:59:07 +00:00
Tom Hughes
52e5fa6ad7 Merge branch 'master' into openstreetbugs 
Conflicts:
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
	config/initializers/mime_types.rb
	config/routes.rb
	lib/map_boundary.rb
	lib/migrate.rb
	lib/osm.rb
	vendor/assets/openlayers/OpenLayers.js
 2012-01-05 20:15:53 +00:00
Tom Hughes
5c557cfe7c Add some tests for updating users 2011-12-13 10:28:17 +00:00
Tom Hughes
c00dd8c712 Add some OAuth tests 2011-11-19 17:38:06 +00:00
Tom Hughes
fc25c3d412 Rename all ID columns that aren't unique 
Having a table with a column called ID that is only part of the
primary key really doesn't work as rails likes to treat ID as a
special name so it becomes impossible to assign to it or read it.
 2011-11-14 09:42:52 +00:00
Tom Hughes
99a4ddd1da Set the preferred language for all test users 
Users with no preferred language will have one set by any request
which has an Accept-Language so in order to stop one test accidentally
affecting another by changing the language we need to make sure all
the users have a preferred language set to start with.
 2011-11-14 09:42:47 +00:00
Tom Hughes
22d15c090a Add fixtures for user blocks and tokens 2011-11-14 09:42:45 +00:00
Tom Hughes
f59747585d Mark all users which have seen the terms as having accepted them 2011-09-24 15:23:24 +01:00
Tom Hughes
7c98b41cc8 Merge branch 'master' into openstreetbugs 2011-06-22 22:36:43 +01:00
Tom Hughes
08d6a0c910 Update tests for change in name from "map_bug" to "note" etc 2011-05-22 12:40:56 +01:00
Tom Hughes
4e38994d1b Cleanup merge breakage 2011-05-21 14:05:55 +01:00
Tom Hughes
832b96b75a Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/terms.html.erb
	test/fixtures/users.yml
 2011-05-21 12:14:56 +01:00
Tom Hughes
882700c5c8 Rename some columns and indexes in the bug tables 2011-05-18 00:36:00 +01:00
Kai Krueger
001ff5764b Merge branch 'master' into openstreetbugs2 2011-04-19 22:00:30 -06:00
Matt Amos
8b12abd5bb Phase 2 CTs implementation and tests, with config parameter 2011-04-03 13:46:16 +01:00
Tom Hughes
a1cb0f04d4 Merge branch 'master' into openstreetbugs 
Conflicts:
	app/views/site/index.html.erb
 2010-10-17 11:02:11 +01:00
Tom Hughes
e09b187cae Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
 2010-10-17 10:59:29 +01:00
Tom Hughes
71f1554212 Make trace API a proper CRUD API like other object types 2010-10-11 23:09:27 +01:00
Tom Hughes
c6609cce24 Fixup tests to work after changes to user controller 2010-05-11 14:12:57 +01:00
Tom Hughes
160429e62d Merge branch 'master' into openstreetbugs 
Conflicts:
	lib/osm.rb
 2010-05-07 22:29:09 +01:00
Tom Hughes
f85681c5ce Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
 2010-05-07 22:28:07 +01:00
Tom Hughes
20cc601f85 Fix tests for changes to user model 2010-05-06 22:11:55 +01:00
Kai Krueger
92af0eccd5 Add test for OpenID login and signup 
The tests need the ROTS (Ruby OpenID Test Server) running.
ROTS can be found at http://github.com/roman/rots
If ROTS is not running, there will be 4 failed test cases, but otherwise
things should work
 2010-05-02 11:04:51 +01:00
Kai Krueger
abf3358ce5 Fixed some minor bugs and add tests to spot them 2010-03-27 11:45:36 +00:00
Kai Krueger
4aec8dc3a5 minor improvement to the map_bugs tests 2010-03-21 12:04:15 +00:00
Kai Krueger
6d668f6f3a Add some rudimentary initial tests for the map bugs api 2010-03-17 23:43:32 +00:00
Shaun McDonald
3a16746650 Fix changeset fixtures as noted on the dev mailing list. http://lists.openstreetmap.org/pipermail/dev/2010-January/018283.html 2010-01-18 01:07:52 +00:00
Matt Amos
ca06b3c7b1 New migration to add better auditing to user_roles and better column names there and on user_blocks. Added a helper for displaying block status messages. 2009-09-29 16:44:03 +00:00
Matt Amos
09c5740b5b Merging 17824:17845 from trunk to blocking branch. 2009-09-29 10:23:31 +00:00
Thomas Wood
76b6d7d876 Tests for [17838] 
Why is our testing fixtures such a mess? It took me half an hour to find a useable node. And I'm still not sure if it's ok, since I want to get to bed. kthxbye
 2009-09-29 03:58:33 +00:00
Matt Amos
daa2496024 First version of blocking feature. Allows both time-based (for map protection) and notice-based (for education) blocks on users. Also introduces user roles and a simple UI for displaying and administering these. 2009-09-28 16:01:00 +00:00
Štefan Baebler
93c592bbe4 tests for diary rss feeds 2009-08-19 05:07:26 +00:00
Tom Hughes
908a6ef409 Merge 16891:17044 from trunk. 2009-08-13 17:18:08 +00:00
Tom Hughes
565171486f Add extra visibility options for GPS traces, and enhance the API call 
that returns trace data to return more information if the owner of the
trace has allowed it. Based on a patch from Matt Amos.
 2009-08-13 17:06:11 +00:00
Matt Amos
05e2120273 Merged 16488:16743 from trunk. 2009-07-31 10:42:06 +00:00