Commit Graph

1052 Commits

Author SHA1 Message Date
Matteo Pagliazzi a34f41f0f7 misc fixes, GET user (with tests), more comments for preenHistory 2015-12-13 20:08:14 +01:00
Matteo Pagliazzi e6d9c978f7 change score task route 2015-12-11 11:41:46 +01:00
Matteo Pagliazzi 6a0f9564e0 begins testing score task route 2015-12-09 10:40:40 +01:00
Matteo Pagliazzi 0f3b307f40 port tests for score and randomDrop 2015-12-09 10:21:15 +01:00
Matteo Pagliazzi 237be08a61 GET-tasks_id tests 2015-12-07 21:15:02 +01:00
Matteo Pagliazzi 3c4491606b finish PUT-tasks_id tests and fix some edge bugs 2015-12-07 21:00:15 +01:00
Matteo Pagliazzi 0272a36bac finish implementing tests for POST-tasks.test.js 2015-12-07 14:22:54 +01:00
Matteo Pagliazzi 66a675c5b0 simplify some tests, replace tags when updating tags (like for checklist) 2015-12-06 17:29:14 +01:00
Matteo Pagliazzi 582aeafb4b Merge branch 'develop' into api-v3 2015-12-06 17:17:20 +01:00
Matteo Pagliazzi 955b0f042b fix tests 2015-12-06 17:07:29 +01:00
Matteo Pagliazzi cb08c383b9 misc fixes, add tests for some tasks routes 2015-12-06 16:51:18 +01:00
Blade Barringer 8a872bd8c0 tests: Add pending tests for scoring tasks 2015-12-04 11:12:25 -06:00
Blade Barringer 834ae123e8 tests: Add pending test for GET /tasks 2015-12-04 10:56:54 -06:00
Blade Barringer 431fc571fa tests: Add pending tests for getting a specific task in v3 2015-12-04 10:55:15 -06:00
Blade Barringer 5aca166837 tests: Add delete task integration test for v3 2015-12-04 10:50:41 -06:00
Blade Barringer 1a2cda0835 tests: Add additional pending tests 2015-12-04 10:39:20 -06:00
Blade Barringer 49cc6db05b tests(tasks): Rename test to conform to route style 2015-12-04 10:25:27 -06:00
Blade Barringer b0bcfff12d tests(tasks): Add pending tests for create task test 2015-12-04 10:24:40 -06:00
Blade Barringer c2ba90afcc tests(fix): Add return to expect promise in create task test 2015-12-04 09:13:50 -06:00
Sabe Jones aa00eae0d5 Merge pull request #6324 from ojeytonwilliams/unequip-notification-fix
Unequip notification fix
2015-12-03 14:01:45 -06:00
Matteo Pagliazzi a6648fc638 add tags routes, misc fixes 2015-12-03 19:19:53 +01:00
Matteo Pagliazzi c0a99eec8b fix user model, sanitize some fields on task creation, add some tests and comments 2015-12-03 18:15:22 +01:00
Matteo Pagliazzi 506609cc29 starts writing tests for tasks, fix errors in auth middleware and tasks methods 2015-12-03 17:48:32 +01:00
Alys e907e2e4ee adjust test for IAP GooglePlay to specify 21 gems 2015-12-03 07:23:31 +10:00
Oliver Eyton-Williams dcd7cae312 Reverted changes related to multiple messages and changed handleTwoHanded to send single, clearer, messages. 2015-12-02 16:51:01 +01:00
Matteo Pagliazzi 427c805ea5 fix user tests and misc changes 2015-12-02 11:22:53 +01:00
Oliver Eyton-Williams ee7bfece06 Added tests for equipping and unequipping. 2015-12-01 17:58:12 +01:00
Sabe Jones 1643e3dbc6 test(modals): Rehatch scenario 2015-11-30 16:19:12 -05:00
Matteo Pagliazzi 3002db3d75 add ability to update tasks, can pass additional fields to Model.sanitize at runtime 2015-11-29 19:05:24 +01:00
Matteo Pagliazzi 5fa514b6fa Merge branch 'develop' into api-v3 2015-11-27 17:05:29 +01:00
Sabe Jones ad347090c3 Merge remote-tracking branch 'origin/pr/5968' into develop
Conflicts:
	website/views/options/social/challenge-box.jade
2015-11-26 13:33:33 -05:00
Sabe Jones 3c672ea814 Merge pull request #6281 from TheHollidayInn/inventory-prevent-hatch-model-from-showing-on-hatched-pet
Prevented modal from showing when user tries to hatch a pet they own
2015-11-26 11:56:38 -06:00
Sabe Jones 5d02b70be1 Merge pull request #6264 from ojeytonwilliams/two-handed-weapon-fix
Two-handed weapons no longer automatically equip unless desired. fixes #6231
2015-11-26 10:53:50 -06:00
Matteo Pagliazzi d67836ee1f allow for additional transform functions for toJSON and sanitize 2015-11-25 15:42:29 +01:00
Matteo Pagliazzi 94fc1c9bef baseModel: delete properties instead of setting them to undefined, transform toJSON only not toObject 2015-11-25 15:19:21 +01:00
Oliver Eyton-Williams 9bda5657d2 Fixed syntax for linter. 2015-11-25 12:40:40 +01:00
Oliver Eyton-Williams 707cd08a8b Merged: updating two-handed tests to use arrow functions. 2015-11-25 12:12:22 +01:00
Sabe Jones 28205663e4 fix(modals): Show mount modal more often
Fixes #6288. Previously, we used a count of all properties within the user's items.pets.mounts to determine whether or not they'd gained a new mount. That would not work as expected if they had mounts with a null or false status, such as after using the Key to the Kennels. This commit also adds some tests to the inventory controller in Angular for pet raising.
2015-11-24 16:54:59 -05:00
Matteo Pagliazzi 3f1faf113e add baseModel plugin with some tests 2015-11-24 18:51:48 +01:00
Alys 431eaec71a add a missing full stop to a message and to the associated test 2015-11-24 14:11:01 +10:00
Matteo Pagliazzi 1bf91030c6 format express-validator errors 2015-11-23 21:34:21 +01:00
Matteo Pagliazzi 4a941deece remove success field from json responses 2015-11-23 21:04:21 +01:00
Keith Holliday b6e79f3ba8 Prevented modal from showing when user tries to hatch a pet they own 2015-11-23 10:20:39 -06:00
Blade Barringer 7d49a8cbf8 Merge branch 'develop' into HabitRPG-sabrecat/modularize-statHelpers 2015-11-23 08:07:58 -06:00
Matteo Pagliazzi 645095e58f fix errorHandler tests, add tests for res.respond 2015-11-23 13:28:25 +01:00
Matteo Pagliazzi 349122c9a1 add res.respond, fix linting 2015-11-23 13:01:47 +01:00
Matteo Pagliazzi a26f713e18 misc fixes, add ability to attach local auth to social user 2015-11-23 12:47:15 +01:00
Alys a380c1aa30 refactor api.daysSince to a cron.js function not exposed on api 2015-11-22 10:48:15 +10:00
Alys 2f8b6d68e8 refactor api.startOfDay to a cron.js function not exposed on api 2015-11-22 07:13:44 +10:00
Blade Barringer 78cdc1753f tests(api): Add test for registering with an invalid email 2015-11-21 13:52:09 -06:00