summary refs log tree commit diff
path: root/tests/rest/client (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fix unit testsKegan Dougal2015-02-271-0/+3
|
* Update testsErik Johnston2015-02-191-0/+1
|
* Merge branch 'develop' into application-servicesKegan Dougal2015-02-116-141/+34
|\
| * Factor out some of the common homeserver setup code into aMark Haines2015-02-116-141/+34
| | | | | | | | setup_test_homeserver function in utils.
* | Modify auth.get_user_by_req for authing appservices directly.Kegan Dougal2015-02-092-1/+6
|/ | | | | | Add logic to map the appservice token to the autogenned appservice user ID. Add unit tests for all forms of get_user_by_req (user/appservice, valid/bad/missing tokens)
* Merge in auth changes from developMark Haines2015-01-291-0/+1
|
* Merge changes from developMark Haines2015-01-294-2/+12
|\
| * Merge pull request #36 from matrix-org/device_id_from_access_tokenMark Haines2015-01-284-2/+12
| |\ | | | | | | Extract the device id and token id from the access token when autheniticating users
| | * Extract the id token of the token when authing users, include the token and ↵Mark Haines2015-01-283-0/+10
| | | | | | | | | | | | device_id in the internal meta data for the event along with the transaction id when sending events
| | * Return the device_id from get_auth_by_reqMark Haines2015-01-282-2/+2
| | |
* | | More unit-testing of REST errorsPaul "LeoNerd" Evans2015-01-271-1/+35
| | |
* | | Move storage of user filters into real datastore layer; now have to mock it ↵Paul "LeoNerd" Evans2015-01-272-3/+27
| | | | | | | | | | | | out in the REST-level tests
* | | Use new V2AlphaRestTestCasePaul "LeoNerd" Evans2015-01-271-38/+2
| | |
* | | Merge branch 'develop' into client_v2_filterPaul "LeoNerd" Evans2015-01-271-0/+45
|\| |
| * | Initial cut of a shared base class for REST unit testsPaul "LeoNerd" Evans2015-01-271-0/+45
| |/
* | Minor changes to v2_alpha filter REST test to allow the setUp method to be ↵Paul "LeoNerd" Evans2015-01-271-5/+7
| | | | | | | | shareable
* | Initial trivial REST test of v2_alpha filter APIPaul "LeoNerd" Evans2015-01-261-0/+74
|/
* Create (empty) v2_alpha REST tests directoryPaul "LeoNerd" Evans2015-01-261-0/+15
|
* Replace hs.parse_userid with UserID.from_stringMark Haines2015-01-234-24/+24
|
* Merge rest servlets into the client json resource objectMark Haines2015-01-232-4/+9
|
* Move client rest tests back under restMark Haines2015-01-228-0/+2142