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

177 commits

Author SHA1 Message Date
Matt Amos
1e3b3c1f10 Refactored user_role and controller. Now much more DRY. 2009-10-01 17:15:34 +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
Štefan Baebler
93c592bbe4 tests for diary rss feeds 2009-08-19 05:07:26 +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
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
e93becd304 Node controller wasn't using the right name for an exception class. 2009-08-05 11:28:49 +00:00
Matt Amos
1e1d7cef73 Fix compatibility with older versions of the ruby std lib (i.e: the one on cruise.osm.org) 2009-07-27 16:59:14 +00:00
Matt Amos
4826032d18 Added methods to strip those non-XML control characters from tags in AMF controller and give an error if there's invalid UTF-8. 2009-07-27 16:54:00 +00:00
Tom Hughes
942ca1ff23 Merge 16355:16480 from trunk. 2009-07-13 23:28:02 +00:00
Richard Fairhurst
8eb77ef5e1 "list mode" should really be "live mode" :) 2009-07-08 22:29:45 +00:00
Richard Fairhurst
369202787b Potlatch 1.1 (server code) 2009-07-08 20:52:02 +00:00
Tom Hughes
c807e9ba66 Fixup tests for changes in view templates. 2009-06-25 16:45:56 +00:00
Tom Hughes
02628bed1e Merge 16012:16110 from trunk. 2009-06-25 16:32:05 +00:00
Matt Amos
b4e634fd35 'Fixing' annoying test case which intermittently fails. 2009-06-22 15:47:46 +00:00
Thomas Wood
ff03138a97 merge 15807:16012 from rails_port 2009-06-19 22:53:16 +00:00
Shaun McDonald
37df03a043 Cleanup the Relation.from_xml to come in line with the Way and Node versions. Includes tests. Bug fix for the previous tests. 2009-06-10 17:17:03 +00:00
Tom Hughes
edaddbedae Merge 15722:15806 from head and adjust new views to rails 2 style names. 2009-06-09 21:50:37 +00:00
Shaun McDonald
32b422aefb Make some links more rails like, thus easier to read. Test that partials are included as expected. 2009-06-07 21:45:33 +00:00
Shaun McDonald
887eba8c8d More tests to check that user creation works, and the url in the e-mail is the same. Seems that we can only test that a particular page is loading fine in all locales in the integration tests, and not the functional tests. 2009-06-07 21:07:07 +00:00
Tom Hughes
9df991e343 Marge all the changeset list methods together into one. 2009-06-07 16:59:58 +00:00
Tom Hughes
afb13ad93e Refactor potlatch error handling. 2009-06-03 16:51:33 +00:00
Tom Hughes
f0f111aced Make a few more things translatable. 2009-06-03 08:06:03 +00:00
Ævar Arnfjörð Bjarmason
e70e2dbe9f Change /index.php/ in wiki.openstreetmap.org links to /wiki/. This looks nicer 2009-06-02 12:23:37 +00:00
Shaun McDonald
7a083ec18a fix to the diary entry test 2009-05-31 22:41:57 +00:00
Shaun McDonald
b031feeb4b fix to the diary entry test 2009-05-31 22:36:37 +00:00
Tom Hughes
3d906fe8c6 Merge 15165:15373 from trunk. 2009-05-31 11:32:32 +00:00
Tom Hughes
dda2ccafe7 Fix a couple of diary tests. 2009-05-30 16:51:56 +00:00
Shaun McDonald
b377927a64 Diary entries pretty much i18n'd. Additional test that checks there are no missing translation strings, need more like it. 2009-05-27 17:19:59 +00:00
Shaun McDonald
6ba51da46e translating the listing of diary entries. Adding some initial tests for checking that you don't get any errors in any locale, when listing the diary entries. Don't yet check for missing translations through an assert_select, .., :count => 0. 2009-05-27 15:06:25 +00:00
Shaun McDonald
7cda38bb25 Diary entry test for the new language field. Currently fails as expected. 2009-05-26 15:36:10 +00:00
Tom Hughes
4a4d89138c Rationalise API error classes by getting of the render_opts method which 
was never used except to extract the data it contained. Instead each class
now has a status method that returns the HTTP status code to use and a
to_s method to return a textual description of the error.
 2009-05-21 19:28:39 +00:00
Tom Hughes
33157534e1 Fixup AMF controller tests. 2009-05-21 17:30:32 +00:00
Matt Amos
3d0ca940d2 Using an around_handler for catching and rendering errors in most of the API controller methods. This simplifies the code and makes errors and error messages a bit more consistent. Also added a utility method for checking the HTTP method. 2009-05-20 17:39:59 +00:00
Shaun McDonald
d23d2c9d05 Extra little test, setting the language on the diary fixtures. 2009-05-15 15:41:45 +00:00
Matt Amos
d7badc8402 Fixed precondition failed message which was trying to dereference nil. 2009-05-14 11:19:28 +00:00
Matt Amos
1ceb4ab9ba Fixed bug #1816 - the timeout updating logic should have been in a before_save handler, not in save_with_tags. 2009-05-12 13:54:37 +00:00
Shaun McDonald
c7f134943c Use a regular expression for the test, since it can give one of two responses based on the order in the db. 2009-05-11 15:50:03 +00:00
Matt Amos
43988beec3 A better optimisation, as suggested by TomH. 2009-05-11 15:16:36 +00:00
Matt Amos
b7f306a437 Fixed problem where tag lengths were generating a 422 error with no message. They now generate a 400 error with a meaningful message. 2009-05-10 00:33:55 +00:00
Shaun McDonald
e84dd63b16 more changeset tests. No need for @ vars in the tests 2009-05-08 13:12:53 +00:00
Thomas Wood
86caeb3360 Fix the test I just broke... 2009-05-07 22:58:32 +00:00
Shaun McDonald
98a76339b8 Some more tests 2009-05-07 17:57:59 +00:00
Shaun McDonald
6327e3e690 fix typo which meant that it was testing the node twice, rather than the node then the node history 2009-05-07 14:10:17 +00:00
Thomas Wood
c273b4b1fa Tests for PreconditionFailed error messages. 
Change to relation.rb to bring element selection in-line with that of way, so to return nil to be caught later, rather than raise an error.
Change to way.rb to clarify which way on diff upload.
 2009-05-06 21:08:50 +00:00
Shaun McDonald
e509850554 fixing the tests I broke earlier due to the fixture changes 2009-05-06 17:56:10 +00:00