Commit Graph

651 Commits

Author SHA1 Message Date
Matteo Pagliazzi b3a78fba97 v3 payments: fix tests 2016-05-10 18:14:28 +02:00
Matteo Pagliazzi 1c887b18e1 v3 payments: fix urls in tests 2016-05-10 17:00:47 +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
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
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 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 79c8449e1e Merge branch 'api-v3' into sabrecat/v3-payments 2016-04-30 19:28:45 +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
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
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
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 c5aa15cf47 v3: fix ability to join public guild you were already a member of 2016-04-23 03:08:03 +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 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
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 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
Keith Holliday 42ef779b46 Ported addPushDevice. Added unit tests. Added addPushDevice route. Added integration tests 2016-04-10 09:47:14 -05:00
Victor Piousbox 1f4a0680ea shared-code-private-messages 2016-04-09 16:56:03 +00:00
Matteo Pagliazzi 910ea836ba Merge branch 'api-v3' into api-v3-adapt-v2 2016-04-09 15:31:09 +02:00
Keith Holliday 1685b7285f Ported reroll. Added unit tests. Added reroll route. Added integration tests 2016-04-08 15:56:11 -05:00