Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,964 Commits 64 Branches 1,256 Tags
a03f34362cb67da07f0acf8adf67fc5e0e6dc4e8
Commit Graph

12964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Piousbox a03f34362c resolving conflicts 2016-03-21 21:28:07 +00:00
Victor Piousbox b555930e9e invalid login credentials fixes 2016-03-21 21:27:11 +00:00
Victor Piousbox 5426d63a36 local login test 2016-03-21 21:26:04 +00:00
Victor Piousbox ddbb8a1beb invalid login credentials fixes 2016-03-21 21:10:17 +00:00
Matteo Pagliazzi 1d3c67af40 Merge pull request #6937 from piousbox/api-v3-delete-social-auth-test 
Api v3 delete social auth test
 2016-03-21 21:28:59 +01:00
Victor Piousbox fa079bd764 added those awaits for DELETE social user testing 2016-03-21 18:35:00 +00:00
Victor Piousbox 5f5fc754b0 local login test 2016-03-21 05:48:37 +00:00
Victor Piousbox 363e23b5e0 Merge branch 'api-v3-delete-social-auth-test' of github.com:piousbox/habitrpg into api-v3-delete-social-auth-test 2016-03-21 04:53:40 +00:00
Victor Piousbox ebcf913676 strengthen the test of password-reset just a little 2016-03-21 04:49:29 +00:00
Matteo Pagliazzi 0b5506b16b Merge pull request #6908 from piousbox/api-v3-password-reset 
api-v3 password reset
 2016-03-20 22:32:32 +01:00
Victor Piousbox f73141f1f6 strengthen the test of password-reset just a little 2016-03-20 19:00:23 +00:00
Victor Piousbox ebbca3276e revert email.send() 2016-03-20 03:29:12 +00:00
Victor Piousbox 99cb8a07f7 reset password route 2016-03-20 02:54:52 +00:00
Victor Piousbox 6d972ea9af resolving conflicts 2016-03-20 02:53:58 +00:00
Victor Piousbox 3784f68dd8 mock for emailer for resetPassword route 2016-03-20 02:32:55 +00:00
Victor Piousbox d2c1c2cec6 cleanup and moving text strings to a locale object 2016-03-19 17:37:08 +00:00
Victor Piousbox e9a355a60b tests pass 2016-03-19 10:13:44 -07:00
Matteo Pagliazzi e68ebee980 temporarily skip challenge task deletion test 2016-03-19 13:10:40 +01:00
Matteo Pagliazzi 0a906da50c Merge pull request #6918 from TheHollidayInn/api-v3-challenge-task-score-tests 
Added tests for challenge task scoring and moved scoring code to model
 2016-03-19 12:08:37 +01:00
Blade Barringer e124b1a00b Merge pull request #6894 from TheHollidayInn/api-v3-development-controller 
Added development controller, middleware, and initial tests
 2016-03-18 16:06:10 -05:00
Keith Holliday a3d7edd0c1 Renamed namespace to debug and added unit test for middleware 2016-03-18 14:05:14 -05:00
Keith Holliday b46219adc5 Added tests for challenge task scoring and moved scoring code to model 2016-03-18 14:00:14 -05:00
Blade Barringer 99ff440abc Merge pull request #6896 from crookedneighbor/v3_update_user_routes 
[V3] WIP - User update routes
 2016-03-18 08:54:22 -05:00
Blade Barringer 75ed4080dc tests: Clean up styling of auth update tests 2016-03-18 08:42:03 -05:00
Blade Barringer f6f5b1a118 tests: Remove dependency on mongoose User model in auth tests 2016-03-18 07:57:42 -05:00
Blade Barringer 2ef176c6f2 refactor: Move auth route tests to auth folder 2016-03-18 07:55:19 -05:00
Blade Barringer 5c3c8ebb74 refactor: Move auth update routes from user to auth controller 2016-03-18 07:35:29 -05:00
Blade Barringer d1af7adff6 refactor: Update user update routes to be under auth namespace 2016-03-18 07:35:14 -05:00
Blade Barringer 22d25f8be3 fix: Change update user routes to use PUT instead of POST 2016-03-18 07:35:14 -05:00
Matteo Pagliazzi 6d14b9d5c5 move preening tests to correct location 2016-03-18 02:59:17 +01:00
Victor Piousbox 4655e5061a api-v3 password reset 2016-03-17 14:47:22 -07:00
Blade Barringer e056a62af0 refactor: Setup middleware for all development routes 2016-03-17 09:24:29 -05:00
Blade Barringer 6921c1694a feat: Allow routes to not need an async handler 2016-03-17 09:24:29 -05:00
Keith Holliday 6184fb5d24 Added development controller, middleware, and initial tests 2016-03-17 09:24:29 -05:00
Matteo Pagliazzi 7c005e7c68 fix typo in tests and increase sleep time 2016-03-17 15:20:41 +01:00
Matteo Pagliazzi 3db06c6537 Merge branch 'develop' into api-v3 2016-03-15 19:23:23 +01:00
Matteo Pagliazzi 9a337ad15f Merge pull request #6888 from HabitRPG/api-v3-allocate 
[Api v3] Port shared.ops.allocate
 2016-03-15 19:21:00 +01:00
Matteo Pagliazzi 67ef70db0f remove constants tests 2016-03-15 19:10:00 +01:00
Matteo Pagliazzi 5b2584871e increase sleep time when testing "allows user to delete challenge task after challenge task is broken" 2016-03-15 19:07:01 +01:00
Matteo Pagliazzi 219ec01ce9 port shared.ops.allocate 2016-03-15 18:41:23 +01:00
Matteo Pagliazzi fb6c927ce9 Merge pull request #6886 from HabitRPG/api-v3-port-sleep 
[API v3] Port sleep operation from shared code
 2016-03-15 17:42:26 +01:00
Matteo Pagliazzi 73cb50b01a Merge pull request #6872 from TheHollidayInn/api-v3-delete-challenge-tasks-tests 
Added initial delete challenge tasks tests
 2016-03-15 17:26:39 +01:00
Matteo Pagliazzi b2b4340ee3 change response for shared.ops.sleep, save user in POST /user/sleep and add integration tests for it 2016-03-15 17:05:07 +01:00
Matteo Pagliazzi 490c6a9ae1 wip(shared): port sleep op 2016-03-15 16:33:44 +01:00
Keith Holliday 534ec07b6a Added tests to ensure challenge member can not delete active challenge task and can delete broken or unlinked challenge task 2016-03-15 10:03:48 -05:00
Matteo Pagliazzi fdeddc8631 pin stripe to specific version 2016-03-14 18:30:10 +01:00
Blade Barringer ed013ee34d Merge pull request #6878 from crookedneighbor/update_protractor 
Update protractor
 2016-03-13 22:24:59 -05:00
Blade Barringer 278b972c61 lint: Add missing semicolon to test helper 2016-03-13 22:06:09 -05:00
Blade Barringer 6ce0893edc test: unpend registration test 2016-03-13 21:56:42 -05:00
Blade Barringer 3ffb84d890 test: Reset db before running e2e tests 2016-03-13 21:56:12 -05:00