sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 01:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
14447 commits 3 branches 0 tags 1.6 GiB
Commit graph

1861 commits

Author SHA1 Message Date
Blade Barringer
4a2e3d4410 lint: Add missing semicolons in test 2016-05-14 22:45:35 -05:00
Blade Barringer
3b8ce8451b feat: Create debug update user route 2016-05-14 22:30:18 -05:00
Alys
887d187691 change "an user" to "a user" in comments and text (no code changes) (#7257) 2016-05-15 01:10:08 +02:00
Keith Holliday
2d5bf9b1bc Fixed reload tests 2016-05-14 12:00:41 -05:00
Blade Barringer
c534f31593 Merge pull request #7226 from Alys/api-v3-pubChalsMinPrize-rename 
[API v3] rename and reword pubChalsMinPrize to reflect that it's only for the Tavern
 2016-05-14 10:19:43 -05:00
Blade Barringer
9969aa667a fix: Remove requirement on message paramter in transfer-gems 2016-05-14 07:37:47 -05:00
Alys
44e9d8b09e fix tests for /members/transfer-gems 2016-05-14 07:18:00 -04:00
Alys
2e078f4776 allows players to send gems to each other; other minor related changes - fixes https://github.com/HabitRPG/habitrpg/issues/7227 2016-05-14 05:58:40 -04:00
Alys
fd13c7aa60 rename and reword pubChalsMinPrize to reflect that it's only for Tavern challenges 2016-05-14 16:40:40 +10:00
Keith Holliday
1fd7df7521 Api v3 fixes continued (#7205) 
* Added timzeone offset back

* Added APIToken back to settings page

* Fixed fetch recent messages for party

* Fixed returning group description

* Fixed check if user is member of challenge

* Fixed party members appearing in header

* Updated get myGroups param to include public groups. Fixed isMemberOf group

* Fixed hourglass purchase

* Fixed challenge addding tasks on first creating

* Updated tests to accomidate new changes
 2016-05-13 23:36:25 +02:00
Matteo Pagliazzi
cc20812674 [API v3] Fix calls to user.ops and deleting tags (#7204) 
* v3: fixes calls to user.ops from views and deleting tags

* v3: fix tests that use user._statsComputed
 2016-05-13 19:45:16 +02:00
Matteo Pagliazzi
468a312357 v3 fix GET /groups: return an error only if an invalid type is supplied not when there are 0 results (#7203) 2016-05-13 19:08:38 +02:00
Matteo Pagliazzi
199732539f chore(): rename website/src -> website/server and website/public -> website/client (#7199) 2016-05-13 15:35:12 +02:00
Keith Holliday
ca6dca5fd0 Fixed test broken by part sync change (#7195) 2016-05-12 19:55:34 +02:00
Matteo Pagliazzi
93336f3894 v3: misc fixes 2016-05-12 18:06:26 +02:00
Keith Holliday
01a8fde124 Fixed cron test 2016-05-11 23:40:20 -05:00
Keith Holliday
5d7ebd82a4 Updated party and group tests 2016-05-11 17:06:16 -05:00
Matteo Pagliazzi
a8f4731a0a Merge pull request #7091 from HabitRPG/api-v3-client 
[API v3] Client
 2016-05-11 16:36:22 +02:00
Matteo Pagliazzi
969459252b v3: do not await a non promise 2016-05-11 16:22:56 +02:00
Matteo Pagliazzi
8276ffcfe2 v3: fix tests 2016-05-11 16:21:22 +02:00
Matteo Pagliazzi
998c679e96 Merge branch 'api-v3' into api-v3-client 2016-05-11 16:01:54 +02:00
Matteo Pagliazzi
95aff08de3 v3 fix tests and use coroutines instead of regenerator 2016-05-11 15:59:18 +02:00
Matteo Pagliazzi
84b198f17f v3 fix tests with deferred 2016-05-11 14:55:51 +02:00
Matteo Pagliazzi
a947afa5c6 Merge branch 'develop' into api-v3 2016-05-11 14:36:58 +02:00
Matteo Pagliazzi
cee7700a50 switch from Q to Bluebird 2016-05-11 14:34:01 +02:00
Keith Holliday
f807bc2a49 Fixed auth tests. Updated Authctrl response 2016-05-10 22:09:04 -05:00
Sabe Jones
7f11e766c3 Sabrecat/glasses chairs (#7182) 
* feat(customization): new chairs, eyeglass sprites

* feat(avatar): finish glasses implementation

* fix(test): include glasses in base equipment
 2016-05-10 16:07:46 -05:00
Keith Holliday
4e41028ddd Fixed more tests 2016-05-10 15:15:55 -05:00
Keith Holliday
632a1ebbf3 Fixed linting and some tests 2016-05-10 15:15:55 -05:00
Keith Holliday
a92359e119 Moved markPMSRead to common.ops. Added tests 2016-05-10 15:15:55 -05:00
Matteo Pagliazzi
b3a78fba97 v3 payments: fix tests 2016-05-10 18:14:28 +02:00
Matteo Pagliazzi
d33564e5d4 v3 payments: port paypal 2016-05-10 17:57:55 +02:00
Matteo Pagliazzi
1c887b18e1 v3 payments: fix urls in tests 2016-05-10 17:00:47 +02:00
Keith Holliday
9146e4601e Added tags service (#7176) 2016-05-10 16:27:36 +02:00
Matteo Pagliazzi
03008c0d40 Merge branch 'api-v3' into sabrecat/v3-payments 2016-05-09 23:29:38 +02:00
Keith Holliday
20f9bbf449 Corrected reset checklist logic (#7154) 
* Corrected reset checklist logic

* Change cron logic to reset rather than set

* Remove extra paranthesis
 2016-05-09 23:06:27 +02:00
Matteo Pagliazzi
e980b3ce0a Merge branch 'api-v3' into sabrecat/v3-payments 2016-05-08 19:19:20 +02:00
Keith Holliday
e747bba669 Updated add and remove tests for challenges (#7155) 2016-05-08 18:35:38 +02:00
Matteo Pagliazzi
34251ca7fc Merge branch 'api-v3-client-tests' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-client-tests2 2016-05-08 16:59:15 +02:00
Keith Holliday
4c37417bd4 Updated task service to use api v3 (#7136) 
* Updated task service to use api v3

* Add user.ops functions back

* Removed extra parameter
 2016-05-08 16:52:43 +02:00
Blade Barringer
7d41b76b2e Merge pull request #7148 from crookedneighbor/require-again 
feat: Add require-again to help with unit testing
 2016-05-06 12:20:19 -05:00
Blade Barringer
192488cb02 feat: Add require-again to help with unit testing 2016-05-06 12:05:06 -05:00
Keith Holliday
6556c2a670 Added missing done to tests. Fixed partyCtrl tests 2016-05-06 09:10:47 -05:00
Keith Holliday
fd244ac021 Turned on client side tests. Fixed broken tests 2016-05-05 23:36:17 -05:00
Keith Holliday
78a8eea79a Updated quest service to use new api-v3 (#7126) 
* Updated quest service to use new api-v3

* Updated inviteToQuest function name. Used quest return rather than syncing party
 2016-05-03 17:16:30 +02:00
Matteo Pagliazzi
21d798bca7 v3: GET /groups accept a guilds type which returns all the guilds the user is a member of 2016-05-03 15:49:47 +02:00
Matteo Pagliazzi
72f4bd0aab Merge branch 'api-v3' into sabrecat/v3-payments 2016-05-02 00:26:02 +02:00
Matteo Pagliazzi
01c07ae6df Merge branch 'api-v3' into api-v3-client 2016-05-02 00:25:25 +02:00
Matteo Pagliazzi
8391494b89 v3: fix tags tests 2016-05-01 14:15:26 +02:00
Matteo Pagliazzi
a63d5ae97f v3: fix tags tests 2016-05-01 13:25:19 +02:00
Matteo Pagliazzi
f5144fddaa v3 adapt v2: fix tags _id, stickyHeader and unlocking 2016-05-01 12:51:32 +02:00
Matteo Pagliazzi
79c8449e1e Merge branch 'api-v3' into sabrecat/v3-payments 2016-04-30 19:28:45 +02:00
Matteo Pagliazzi
115c5374cb Merge branch 'api-v3' into api-v3-client 2016-04-30 19:28:16 +02:00
Matteo Pagliazzi
6380161321 Api v3 Migration (WIP) (#7131) 
* v3 migration: remove old code and polish user migration

* v3 migration: start to work on challenges

* wip v3 migration

* wip v3 migration: fix _id -> id for reminders, tags and checklists
 2016-04-30 18:34:16 +02:00
Matteo Pagliazzi
0c38caa2f9 Merge branch 'api-v3' into sabrecat/v3-payments 2016-04-30 16:51:51 +02:00
Matteo Pagliazzi
3437744f62 Merge branch 'api-v3' into api-v3-client 2016-04-30 16:51:15 +02:00
Matteo Pagliazzi
f69a566178 Merge branch 'develop' into api-v3 2016-04-30 16:49:44 +02:00
Victor Pudeyev
a567476bb7 V3 payments 7 stripe (#7124) 
* payments api: cancelSubscription

* some more tests for amazon payments

* promisifying amazon payments

* somehow payment stub is not working

* cleaning up tests

* renaming tests in api/v3/integration/payments

* improvements

* cleanup, lint

* fixes as per comments

* moment.zone() is back in.

* basic controller for stripe payments

* authWithUrl is in

* stripe cleanup

* making tests pass

* stripe bug fixes

* 400 error is right

* cleanup of sinon spy for fakeSend

* paypal payments

* lint of paypal

* require -> import
 2016-04-30 16:42:10 +02:00
Keith Holliday
415418f30c Api v3 members port (#7109) 
* Ported groups service to user new api v3 and ported dependent controllers

* Remove  and extra remove inviation code. Fixed group service caching and update group service tests

* Fixed test logic and added party cache support

* Updated members service to use api v3

* Removed onlys

* Added invites to group detail

* Removed old user reject invite code
 2016-04-30 10:54:25 +02:00
Victor Pudeyev
fa21577c46 V3 payments 6 (#7104) 
* payments api: cancelSubscription

* some more tests for amazon payments

* promisifying amazon payments

* somehow payment stub is not working

* cleaning up tests

* renaming tests in api/v3/integration/payments

* improvements

* cleanup, lint

* fixes as per comments

* moment.zone() is back in.
 2016-04-27 21:26:32 +02:00
Keith Holliday
570d5c7fd9 Updated challenge service to user apiv3 and update challenge ctrl (#7111) 
* Updated challenge service to user apiv3 and update challenge ctrl

* Removed extra code. Added challenge update. Fixed group qurey
 2016-04-27 16:11:06 +02:00
Keith Holliday
2619b34c65 Updated chat service to use api v3 (#7113) 
* Updated chat service to use api v3

* Removed , added back User functions, added todo
 2016-04-27 15:59:10 +02:00
Blade Barringer
e7315253dd feat: Switch out js-emoji for habtiica-markdown 2016-04-26 08:19:47 -05:00
Keith Holliday
ea490c9a1f Ported groups service to user new api v3 and ported dependent controllers (#7108) 
* Ported groups service to user new api v3 and ported dependent controllers

* Remove  and extra remove inviation code. Fixed group service caching and update group service tests

* Fixed test logic and added party cache support

* Added promise rejections and updated http interceptor
 2016-04-25 23:11:23 +02:00
Matteo Pagliazzi
d6ea0a3b40 v3: fix setting challenge.official 2016-04-25 14:34:59 +02:00
Keith Holliday
050539d8f3 Added tests for cron (#7081) 
* Added inital cron tests

* Added more subscribe tests and updated various tests for syntax and expectations
 2016-04-24 00:54:50 +02:00
Matteo Pagliazzi
7dab7939cc v3: fix tavern during tests 2016-04-23 03:33:00 +02:00
Matteo Pagliazzi
c5aa15cf47 v3: fix ability to join public guild you were already a member of 2016-04-23 03:08:03 +02:00
Matteo Pagliazzi
6ba1afe479 Merge branch 'api-v3' into api-v3-unlock-fix 2016-04-22 12:33:39 +02:00
Victor Piousbox
cbf1a4c8d3 breaking changes promisifying amazon payments 2016-04-21 04:37:25 +00:00
Victor Piousbox
54a94db2de working on amazon payments 2016-04-21 03:52:29 +00:00
Victor Piousbox
612e3b725f little changes to lint 2016-04-21 00:25:43 +00:00
Victor Piousbox
f9915c3f77 recovering last weeks work on promisifying amazon payments 2016-04-21 00:07:58 +00:00
Matteo Pagliazzi
6568fcfd5e res.respond: allow for thrid parameter (message), refactor shared ops responses and adapt tests 2016-04-21 00:52:03 +02:00
Victor Piousbox
3cba6d934b resolving conflicts 2016-04-20 22:04:31 +00:00
Keith Holliday
9e3d8ba4ac Separated out buy functions into buyGear, buyArmoire, and buyPotion (#7065) 2016-04-19 16:50:04 +02:00
Matteo Pagliazzi
7aa6587f2f Merge branch 'shared-code-random-drop' of https://github.com/piousbox/habitrpg into piousbox-shared-code-random-drop2 2016-04-19 12:07:18 +02:00
Matteo Pagliazzi
277248b8b7 switch to standard response format in v3 2016-04-18 21:56:58 +02:00
Matteo Pagliazzi
b271520c53 v3: general cleanup 2016-04-17 01:17:22 +02:00
Matteo Pagliazzi
dea693f799 v3: start to fix unlocking 2016-04-16 20:51:16 +02:00
Victor Pudeyev
715bb5e047 shared-code-statsComputed (#7067) 
* shared-code-statsComputed

* \$w is in common/script/index.js
 2016-04-16 19:24:13 +02:00
Victor Piousbox
4a45fc1c37 working on amazon payment promisification 2016-04-15 16:46:50 +00:00
Victor Piousbox
2bb36b5e04 things are broken with nconf 2016-04-15 16:46:50 +00:00
Victor Piousbox
261a5a66b1 working on promisifying amazonPayments 2016-04-15 16:46:50 +00:00
Blade Barringer
887aa478ec chore: merge in develop 2016-04-15 10:11:54 -05:00
Blade Barringer
10936d9a4d chore: Switch to custom eslint-config 2016-04-15 09:03:59 -05:00
Blade Barringer
33c0cdd569 chore(lint): lint files in preparation for eslint v2 2016-04-15 08:37:05 -05:00
Blade Barringer
1a64886f7d Merge branch 'develop' into api-v3 2016-04-15 08:04:46 -05:00
Matteo Pagliazzi
11b5c1b405 v3: several fixes to class system, move /logout outside of api 2016-04-14 20:05:30 +02:00
Matteo Pagliazzi
bc9f2b81e7 refactor getUserLanguage, automatically apply getUserLanguage and cron middlewares where needed 2016-04-14 13:30:58 +02:00
Matteo Pagliazzi
a590a66c47 support top level controllers 2016-04-14 11:54:47 +02:00
Blade Barringer
e70add1ac4 chore: lint files 2016-04-13 20:11:07 -05:00
Matteo Pagliazzi
54aac99a6a v2: make tests working with new tavern id 2016-04-13 22:28:29 +02:00
Matteo Pagliazzi
57497f246f make tests working with new tavern id 2016-04-13 22:27:32 +02:00
Matteo Pagliazzi
2458f92e1b fix linting and correctly save collect quests progress 2016-04-13 20:03:26 +02:00
Matteo Pagliazzi
471657c013 fix tests that relied on different logger 2016-04-13 18:43:15 +02:00
Matteo Pagliazzi
8817f795b1 v3: expose public interface for logger and add tests 2016-04-13 18:18:00 +02:00
Matteo Pagliazzi
28d8c370c3 v3 adapt v2: remove references to sanitizeCreate and fix tests 2016-04-12 23:53:55 +02:00
Matteo Pagliazzi
793ce38f6b v3: review some more files, add logging for unhandled promises 2016-04-12 20:14:36 +02:00
Matteo Pagliazzi
6458796a36 v3: first review of common code and task models 2016-04-12 19:30:39 +02:00
Keith Holliday
3970064fe5 Ported reset. Added unit tests. Added reset route. Added integration tests 2016-04-12 11:19:36 -05:00
Matteo Pagliazzi
fa32dabc92 Merge pull request #7064 from piousbox/shared-code-crit 
shared-code-crit
 2016-04-12 09:58:46 +02:00
Victor Pudeyev
2f1329254e shared-code-tags-gold-silver (#7056) 2016-04-12 09:57:57 +02:00
Victor Piousbox
2d69285080 shared-code-crit 2016-04-11 20:21:33 +00:00
Keith Holliday
42ef779b46 Ported addPushDevice. Added unit tests. Added addPushDevice route. Added integration tests 2016-04-10 09:47:14 -05:00
Matteo Pagliazzi
7a24bceac9 Merge pull request #7051 from piousbox/shared-code-percent 
shared-code-percent
 2016-04-10 12:29:43 +02:00
Victor Piousbox
3c784e869a shared-code-percent 2016-04-09 21:13:16 +00:00
Victor Piousbox
1f4a0680ea shared-code-private-messages 2016-04-09 16:56:03 +00:00
Matteo Pagliazzi
f4d2184f34 Merge pull request #7010 from HabitRPG/api-v3-adapt-v2 
[API v3] Adapt v2
 2016-04-09 17:42:44 +02:00
Matteo Pagliazzi
6b2d1a1416 v3 adapt v2: adapt common ops 2016-04-09 16:45:43 +02:00
Blade Barringer
231cfc176a Merge branch 'develop' into api-v3 2016-04-09 09:12:53 -05:00
Matteo Pagliazzi
910ea836ba Merge branch 'api-v3' into api-v3-adapt-v2 2016-04-09 15:31:09 +02:00
Blade Barringer
db62d1add0 fix: correct coupon generation code 2016-04-09 08:03:32 -05:00
Keith Holliday
1685b7285f Ported reroll. Added unit tests. Added reroll route. Added integration tests 2016-04-08 15:56:11 -05:00
Matteo Pagliazzi
70fd869934 Merge branch 'api-v3' into api-v3-adapt-v2 2016-04-08 12:03:50 +02:00
Victor Piousbox
9704c47293 Merge branch 'api-v3' into shared-code-webhooks 2016-04-07 21:23:38 +00:00
Victor Piousbox
4c0f9ed1c8 resolving conflicts 2016-04-07 21:23:16 +00:00
Keith Holliday
fec9ce3dbe Ported rebirth. Add unit tests. Added rebirth route. Added integration tests 2016-04-07 15:02:55 -05:00
Matteo Pagliazzi
2d3fbe9f13 v3 adapt v2: lint client only shared ops and enable members integration tests 2016-04-07 11:54:36 +02:00
Matteo Pagliazzi
d49847688e v2 adapt to v3: port challenges create, get and list 2016-04-07 11:22:10 +02:00
Matteo Pagliazzi
81d665513c Merge branch 'api-v3-ops-revive' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-revive 2016-04-06 23:24:14 +02:00
Keith Holliday
621bf9609e Ported revive. Added unit tests. Add revive route. Added integration tests 2016-04-06 15:59:42 -05:00
Keith Holliday
2bd710a882 Ported unlock. Add unit tests. Create unlock route. Add integration tests 2016-04-06 15:53:32 -05:00
Matteo Pagliazzi
b431b02012 v3 adapt v2: port tags, cast, cron, deletUser and removeMember. Fix a few bugs in v3 2016-04-06 19:28:43 +02:00
Keith Holliday
05b41bb41c Ported sell function. Add unit tests. Create sell route. Add integration tests 2016-04-06 08:27:18 -05:00
Matteo Pagliazzi
08239345b5 v3 adapt v2: port leave, join and invite for groups controller 2016-04-05 13:03:20 +02:00
Matteo Pagliazzi
374d11b0e4 v3 adapt v2: port chat routes and group.update 2016-04-05 12:02:00 +02:00
Matteo Pagliazzi
0a40c56973 api v3 adapt v2: correctly import dependencies, port create, get, list groups 2016-04-04 23:18:49 +02:00
Victor Piousbox
14b0ec8b03 shared-code-webhooks 2016-04-04 16:31:48 +00:00
Matteo Pagliazzi
f6fc50f6c2 adapt v2: port updateUser 2016-04-04 17:18:42 +02:00
Matteo Pagliazzi
10583b78de fix challenge unit tests 2016-04-04 17:18:42 +02:00
Matteo Pagliazzi
c3945de098 fix tasks updating and reminders tests 2016-04-04 17:18:42 +02:00
Matteo Pagliazzi
f3abdaf692 adapt v2: port updateTask 2016-04-04 17:18:42 +02:00
Matteo Pagliazzi
382e391fd0 port updateTask, addTask, clearCompleted, taskDefaults, uuid 2016-04-04 17:18:42 +02:00
Matteo Pagliazzi
060e3b1045 adapt v2: fix linting 2016-04-04 17:16:57 +02:00
Matteo Pagliazzi
cc65bb1ed7 adapt v2: getTask, getTasks, clearCompleted, addTask, deleteTask, getUser, getUserAnonymized, scoreTask (challenge part missing) 2016-04-04 17:16:57 +02:00
Matteo Pagliazzi
58c20c2a64 v2 port: enable integration tests, port register route 2016-04-04 17:16:57 +02:00
Matteo Pagliazzi
68ff26e6d6 v3: check that tasks are deleted when the user deletes the acocunt and misc fixes 2016-04-04 17:16:36 +02:00
Matteo Pagliazzi
c86898c7e4 Merge branch 'api-v3-ops-release-mounts' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-release-mounts 2016-04-04 11:49:06 +02:00
Matteo Pagliazzi
66959c23f5 Merge branch 'api-v3-ops-release-both' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-release-both 2016-04-04 11:46:46 +02:00
Keith Holliday
c916c74775 Ported release both, added unit tests, add release both route with integration tests 2016-04-03 14:44:00 -05:00
Keith Holliday
487a26ec43 Ported release pets, added unit tests, added route with integration tests 2016-04-03 14:37:20 -05:00
Keith Holliday
24b7b4c838 Ported release mounts, add unit tests, added release mounts route with integration tests 2016-04-03 14:34:43 -05:00
Victor Piousbox
3844bafae5 shared-code-random-drop 2016-04-03 16:22:21 +00:00
Matteo Pagliazzi
de74fae0b4 v3: port coupons 2016-04-02 16:37:55 +02:00
Matteo Pagliazzi
3b98fe377f Merge pull request #6999 from piousbox/shared-code-update-stats 
Shared code update stats
 2016-04-01 23:16:35 +02:00
Victor Piousbox
7f3feedd12 shared-code-update-stats 2016-04-01 20:50:28 +00:00
Matteo Pagliazzi
843dd09d35 Merge pull request #6986 from HabitRPG/api-v3-one-app 
[Api v3] Consolidate server code and share middlewares where possible
 2016-04-01 19:30:52 +02:00
Matteo Pagliazzi
6cbbdcdcbe v3: port static pages, make routes lib more flexible, share middlewares between v2 and v3, port v1, simplify server.js 2016-04-01 19:07:03 +02:00
Matteo Pagliazzi
238dee7608 Merge pull request #6962 from piousbox/shared-code-user-score-task 
shared-code-user-score-task
 2016-04-01 18:28:55 +02:00
Victor Piousbox
e6e2c26a12 shared-code-user-score-task 2016-04-01 16:11:37 +00:00
Matteo Pagliazzi
aae94bf1b4 Merge branch 'api-v3-open-mystery-item' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-open-mystery-item3 2016-04-01 16:39:52 +02:00
Matteo Pagliazzi
82afc1971d Merge branch 'api-v3-ops-read-card' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-read-card 2016-04-01 16:30:48 +02:00
Matteo Pagliazzi
7e093f1622 Merge branch 'api-v3-hourglass-purchase' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-hourglass-purchase2 2016-04-01 16:28:20 +02:00
Keith Holliday
6d9617e345 Ported read card, added unit tests, added read card route and integration tests 2016-04-01 09:17:40 -05:00
Keith Holliday
3fe88fd8d0 Ported open mystery item, added unit tests, added route, and integration tests 2016-04-01 08:23:40 -05:00
Keith Holliday
ad0bc58028 Ported purchase, add unit tests, created new user purchase route, and added tests 2016-04-01 08:14:15 -05:00
Keith Holliday
dd12443166 Ported Hourglass Purchase, add unit tests. Created new hourglass purchase route and tests 2016-04-01 08:11:26 -05:00
Matteo Pagliazzi
3089658cc7 Merge branch 'develop' into api-v3 2016-03-30 23:40:00 +02:00
Matteo Pagliazzi
7e9520b920 fix(test): make sure error is catched using done() callback 2016-03-30 23:32:12 +02:00
Matteo Pagliazzi
d0383766e3 Merge pull request #6985 from HabitRPG/api-v3-update-user 
[Api v3] update user
 2016-03-30 23:16:28 +02:00
Matteo Pagliazzi
bf93275693 v3: port updateUser 2016-03-30 16:18:22 +02:00
Lucas Braun
ee9dc7c196 Remove extra 'it' from spec description 2016-03-29 22:11:36 -04:00
Alys
ae9e6fbe30 allow cron to record user's current timezone offset in preferences.timezoneOffsetAtLastCron (initial stage of cron timezone fix for https://github.com/HabitRPG/habitrpg/issues/3806 ) 2016-03-29 22:34:23 +10:00
Blade Barringer
02a60d90d8 Merge branch 'develop' into api-v3 2016-03-28 16:02:04 -05:00
Blade Barringer
cf8153fd93 chore: Update res.send(code) to res.sendStatus(code) 2016-03-28 10:24:00 -05:00
Matteo Pagliazzi
1112d93b15 Merge pull request #6907 from HabitRPG/sabrecat/server-party-cheevos 
[v3] Add Party Up / Party On achievements to server in V3
 2016-03-27 20:53:15 +02:00
Sabe Jones
861a32f72a feat(achievements): move party cheevos to server 2016-03-27 14:51:39 -04:00
Matteo Pagliazzi
c4bbfcf2f3 Merge pull request #6968 from HabitRPG/api-v3-buy-list 
v3: port getBuyList and shared.updateStore
 2016-03-26 16:39:52 +01:00
Matteo Pagliazzi
67d49bc9fc v3: port getContent route caching responses to disk 2016-03-26 16:29:22 +01:00
Matteo Pagliazzi
3002c9b7fd v3: port getBuyList and shared.updateStore 2016-03-26 16:25:15 +01:00
Matteo Pagliazzi
5ee33b08b9 Merge branch 'api-v3-get-user-anonymized' of https://github.com/piousbox/habitrpg into piousbox-api-v3-get-user-anonymized 2016-03-25 16:04:48 +01:00
Matteo Pagliazzi
d89d1e50dd Merge branch 'develop' into api-v3 2016-03-25 15:58:04 +01:00
Matteo Pagliazzi
15e8f881fe Merge branch 'api-v3-send-private-message' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-send-private-message 2016-03-25 15:56:28 +01:00
Keith Holliday
d7b6e0b760 Ported refPush and added tests 2016-03-25 08:33:55 -05:00
Keith Holliday
19a63e8128 Ported sendGift route and renamed it to transferGems. Refactored user.sendMessage logic. 2016-03-25 08:33:54 -05:00
Keith Holliday
95ea73d440 Fixed route namespace and added translation strings 2016-03-25 08:33:54 -05:00
Keith Holliday
e9a9079c46 Ported sendPrivateMessage route and added initial tests 2016-03-25 08:33:54 -05:00
Keith Holliday
075b31c075 Added password requirement 2016-03-25 08:32:49 -05:00
Keith Holliday
7f65707ee4 Ported user delete route and added initial tests 2016-03-25 08:32:49 -05:00
Matteo Pagliazzi
192409a0b5 Merge branch 'api-v3' into api-v3-equip-feed-hatch2 2016-03-25 12:22:55 +01:00
Victor Piousbox
5aacd978c6 api-v3-get-user-anonymized 2016-03-24 18:23:43 +00:00
Matteo Pagliazzi
9452fd3128 Merge pull request #6945 from piousbox/api-v3-test-attach-local-to-social-auth 
[v3] working on attaching local to social auth
 2016-03-24 19:18:04 +01:00
Matteo Pagliazzi
0a65e6a6f1 v3: port hatch, equip and feed ops 2016-03-24 18:59:09 +01:00
Victor Piousbox
528d805cda api-v3-test-attach-local-to-social-auth 2016-03-24 17:51:31 +00:00
Matteo Pagliazzi
159b9eaa8d port disable classes and change class ops 2016-03-24 14:25:30 +01:00
Blade Barringer
fd10422e0c tests: Add preliminary tests around send message and send gift 2016-03-22 21:49:27 -05:00
Matteo Pagliazzi
23f92e2d28 Merge pull request #6923 from TheHollidayInn/api-v3-groups-reject-invite 
[v3] Added group reject invite route and initial tests
 2016-03-22 22:46:12 +01:00
Keith Holliday
da08b6c814 Removed group query from route 2016-03-22 16:10:17 -05:00
Matteo Pagliazzi
0bde9e2df2 Merge branch 'develop' into api-v3 2016-03-21 23:03:28 +01:00
Matteo Pagliazzi
d8dab49b79 Merge pull request #6898 from HabitRPG/api-v3-buy-ops 
[v3] Port several shared ops and their linked fns
 2016-03-21 23:00:43 +01: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
Matteo Pagliazzi
d6fa16f86c skip tests that cannot be stubbed correctly 2016-03-21 22:22:26 +01:00
Keith Holliday
a8e4455124 Added group reject invite route and initial tests 2016-03-21 15:42:38 -05:00
Victor Piousbox
fa079bd764 added those awaits for DELETE social user testing 2016-03-21 18:35:00 +00:00
Victor Piousbox
ebcf913676 strengthen the test of password-reset just a little 2016-03-21 04:49:29 +00:00
Matteo Pagliazzi
bd3c162b97 port allocateNow and autoAllocate 2016-03-20 20:21:15 +01:00
Matteo Pagliazzi
480194f53c add routes for buy ops and integration tests 2016-03-20 17:41:17 +01:00
Matteo Pagliazzi
fea2e0d8c0 correctly stub methods and test errors 2016-03-20 16:06:31 +01:00
Matteo Pagliazzi
657f19af0d add tests for shared.ops.buySpecialSpell and partially fix shared.ops.buy 2016-03-20 13:46:56 +01:00
Matteo Pagliazzi
2560096466 port buyQuest tests 2016-03-20 13:33:34 +01:00
Matteo Pagliazzi
ad8834f4ed port tests for shared.ops.buyMysterySet.js 2016-03-20 13:12:06 +01:00
Matteo Pagliazzi
71f304786c add pickDeep utility function to pick nested properties from objects 2016-03-20 13:07:14 +01: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
957e1d26d6 add tests for fns/ultimateGear, fns/handleTwoHanded, fns/randomVal, fns/predictableRandom and partial tests for ops/buy 2016-03-19 18:05:02 +01: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
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
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
Blade Barringer
22c83c92c2 Merge pull request #6904 from HabitRPG/inventory_sorting_debug 
Inventory sorting debug
 2016-03-18 07:33:45 -05:00
Matteo Pagliazzi
6d14b9d5c5 move preening tests to correct location 2016-03-18 02:59:17 +01:00
Blade Barringer
de2f9eb28b Update tests to us set by default 2016-03-17 17:28:46 -05:00
Victor Piousbox
4655e5061a api-v3 password reset 2016-03-17 14:47:22 -07: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
Blade Barringer
c7310b97ec Revert "Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues." 
This reverts commit 9d50201180.
 2016-03-17 08:09:18 -05:00
Alys
9d50201180 Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues. 
This reverts commits 1c811dbc82, 146810a3e9, 9508ed45df, a6fb945120.
 2016-03-17 21:47:29 +10:00
Kaitlin Hipkin
0ca949b1bb pull initialization of controller into helper method and stub state 2016-03-16 23:50:16 -04:00
Kaitlin Hipkin
469ece70c3 clean up party {up,on} tests, add calls to $controller after setup 2016-03-16 22:32:24 -04:00
Kaitlin Hipkin
ee09bee1e2 use sandbox.stub instead of sandbox.spy 2016-03-16 00:55:20 -04:00
Blade Barringer
146810a3e9 feat: Add set property to content 2016-03-15 19:41:19 -05:00
Blade Barringer
9508ed45df refactor: Move order by equipmentment button to top of view 2016-03-15 19:41:11 -05:00
Matt Harrington
a6fb945120 inventory sorting 
Add inventory sorting buttons based on name, attribute, and set (armoire):
-  Each gear[klass] has its own sorting buttons and sorting state including costume classes
-  The attributes sort descending when selected, then by sum of all attributes
-  There is no default sort
-  The armoire also sorts by set which sorts by item[set] descending, it does not sort within a set (ex "1 of 3" vs "2 of 3")
-  Name sorts by .text() ascending
 2016-03-15 19:41:11 -05:00
Kaitlin Hipkin
68c3c2973b cannot spy on an undefined function 2016-03-15 19:49:33 -04:00
Kaitlin Hipkin
c0e636dba0 fix spy? 2016-03-15 18:36:36 -04:00
Kaitlin Hipkin
979acded92 Merge branch 'develop' into new_party_badges 2016-03-15 16:17:25 -04:00
Kaitlin Hipkin
93c5cc0385 add tests for awarding party {up,on} achievs 2016-03-15 16:03:36 -04:00
Matteo Pagliazzi
3db06c6537 Merge branch 'develop' into api-v3 2016-03-15 19:23:23 +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
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