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

295 commits

Author SHA1 Message Date
Tom Hughes
03fb042591 Merge branch 'master' into openid 2010-07-28 21:39:46 +01:00
Tom Hughes
6f73468f18 Convert diary views to use CSS based user specific components 2010-07-21 22:24:35 +01:00
Tom Hughes
406b46e49b Revert "Switch to using oauth-plugin as a gem" 
This reverts commit 41a123334b.
 2010-06-07 16:01:04 +01:00
Tom Hughes
41a123334b Switch to using oauth-plugin as a gem 
Use the oauth-plugin as a gem instead of carrying a local copy.

This also required that commit eff06faf46 be
reverted as it changed the plugin. I don't think the cosmetic improvement
from that patch is worth the hassle of carrying local changes to the plugin.
 2010-05-24 12:58:27 +01:00
Tom Hughes
bffc0377dd Fix user creation tests to handle terms screen 2010-05-11 22:25:06 +01:00
Tom Hughes
64f373dc59 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/new.html.erb
	config/locales/en.yml
	public/stylesheets/common.css
 2010-05-11 21:22:43 +01:00
Tom Hughes
e005926131 Update test to reflect changes in signup page 2010-05-11 19:17:14 +01:00
Tom Hughes
c6609cce24 Fixup tests to work after changes to user controller 2010-05-11 14:12:57 +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
Shaun McDonald
9dabe69032 Adding timecop as a gem dependency when in development env. This allows for time based tests to be accurate/consistent. It will stop the random error on the api_controller_test#test_changes_simple, when you are on a slow machine/have bad timing. 2010-04-03 21:02:20 +00:00
Matt Amos
11d136e508 Patching fix to test from branch. 2010-03-22 22:56:45 +00:00
Tom Hughes
0b913efd05 Use Nominatim to reverse geocode diary location information and display 
a friendly human readable location instead of some coordinates.
 2010-02-27 12:41:56 +00:00
Tom Hughes
d3bcbf0367 Fix test for viewing an unknown user to actually specify a name - what 
it was doing before was testing whether the null user existed.
 2010-02-26 15:07:28 +00:00
Tom Hughes
0ec5e8f858 Move bogus addresses from the good set to the bad set - unicode email 
addresses are not currently allowed by the email standards.
 2010-02-25 21:22:42 +00:00
Tom Hughes
8264fb92ff Fixup AMF tests to match Richard's latest changes. 2010-02-11 17:33:46 +00:00
Tom Hughes
8cd02f4136 Drop the username from the "new diary entry" link to avoid problems 
with caching - we don't need it as we know who the logged in user is
when a diary posting is made.
 2010-02-04 15:48:40 +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
Shaun McDonald
5cbaa2fca7 fix some trace tests, due to a change of the way that your own ones are rendered. 2010-01-10 15:21:53 +00:00
Matt Amos
b3f4637a42 Fixed copy-n-paste bug in querying for closed changesets and added a test for it. 2009-12-26 21:29:43 +00:00
Shaun McDonald
094855be22 Actually the changeset doesn't need an id attribute in the xml. It is simply fetched as a parameter in the url. Thanks for pointing it out Frederik. We really need more tests so that things like this are thought about more before committing potentially significant changes. 2009-12-15 23:53:19 +00:00
Shaun McDonald
43a28065b1 Change the way that the changeset parsing is done, so that it is in line with the nodes/ways/relations and gives much nicer error messages. Adding some tests too to back up those changes. 2009-12-06 02:13:30 +00:00
Tom Hughes
d4b8020757 Fix tests to reflect changes to signup form. 2009-10-21 23:35:59 +00:00
Tom Hughes
eb0f9ff63d Merged 17073:17076 from trunk. 2009-10-13 20:25:11 +00:00
Tom Hughes
ef40b61ff4 Merged 17256:18123 from trunk. 2009-10-13 20:06:24 +00:00
Matt Amos
16b79f9964 Added a :display_name option for the changesets query code. 2009-10-12 10:12:12 +00:00
Tom Hughes
fc9df968fc Fix tests which do logins to handle the cookie test. 2009-10-09 09:13:13 +00:00
Matt Amos
1e3b3c1f10 Refactored user_role and controller. Now much more DRY. 2009-10-01 17:15:34 +00:00
Matt Amos
77851bac7b Added better messages and error handling in a couple of places. Added integration checks to ensure that the blocking is actually working. Tests FTW. 2009-09-30 17:39:42 +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
30d5e783e4 Added a confirmation step to the process of granting and revoking user roles. 2009-09-28 17:35:39 +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
Tom Hughes
49906c99cd Workaround rails 2.3.4 bogus deprecation warnings. 2009-09-04 10:52:58 +00:00
Matt Amos
c6bf21a9d0 merge r17141:17256 from trunk 2009-08-25 16:49:52 +00:00
Matt Amos
b34b898451 Added referer URL in user_token so that redirections (e.g: from oauth token requests) are followed after the user has confirmed the sign-up. Added test for the same. 2009-08-25 15:00:32 +00:00
Štefan Baebler
93c592bbe4 tests for diary rss feeds 2009-08-19 05:07:26 +00:00
Tom Hughes
d227589a63 Merge oauth branch at r17138 to trunk. 2009-08-18 20:01:56 +00:00
Matt Amos
d0e47d30e4 Fixes bug #2152 by preventing over-expansion of bboxes beyond the world range. 2009-08-16 00:19:18 +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
7ac66a371e Fix test to reflect change to changeset templates. 2009-08-07 14:14:27 +00:00
Matt Amos
bb84a78a09 Made XML parsing routines raise an exception if the document is valid XML, but not valid as an OSM document. This is now the same behaviour as when the document isn't valid XML. 2009-08-06 17:28:49 +00:00
Matt Amos
0d5be22cb5 Merging 16820:16891 from trunk. 2009-08-06 16:24:39 +00:00
Matt Amos
e93becd304 Node controller wasn't using the right name for an exception class. 2009-08-05 11:28:49 +00:00
Matt Amos
0a122639c9 Ooops. Should have committed the test too. 2009-08-04 13:15:19 +00:00
Matt Amos
655dc6787e Reorganised OAuth clients and tokens details page. Made clients info editable and some more stuff translatable in the OAuth pages. 2009-08-03 17:08:40 +00:00
Matt Amos
eff06faf46 Moved find_token method into the token class, since that seems a more appropriate place for it. 2009-08-03 14:00:29 +00:00