Commit graph

1054 commits

Author SHA1 Message Date
Blade Barringer
e9f618da5e tests: Extract api objects to separate files 2016-01-16 14:06:47 -06:00
Blade Barringer
29415441f7 tests: Create base class that ApiUser and ApiGroup inherit from 2016-01-16 09:48:51 -06:00
Blade Barringer
9f2a8c03b2 tests: Remove references to different api routes in helper 2016-01-16 09:45:02 -06:00
Blade Barringer
28fc6dd4bd tests: Convert helpers to use async/await 2016-01-15 20:36:54 -06:00
Matteo Pagliazzi
f83b271b30 rever new history preening 2016-01-13 11:07:52 +01:00
Matteo Pagliazzi
be0fe3eb4f Merge pull request #6479 from HabitRPG/new-history-preening
New history preening
2016-01-09 20:12:33 +01:00
Matteo Pagliazzi
2fff34cff4 finalize tests 2016-01-09 19:47:18 +01:00
Alys
58a92f626d Merge pull request #6464 from HabitRPG/fix_stat_allocation_bug
fix: Corrects stat allocation bug where it was possible to receive more points than 100
2016-01-09 23:00:06 +10:00
Matteo Pagliazzi
dec08955ac fix tests 2016-01-08 23:02:18 +01:00
Matteo Pagliazzi
82651cf1ed initial tests 2016-01-08 18:58:54 +01:00
Matteo Pagliazzi
ae852f9a2e complete preening and enable for challenges too 2016-01-08 17:47:08 +01:00
Matteo Pagliazzi
243b839392 wip: new history preening, delineate process and differentiate between subscribers and non 2016-01-07 20:07:13 +01:00
Matteo Pagliazzi
fdd5ab724a begin implementing new preenUserHistory method: port current code to es6 and setup tests 2016-01-07 18:44:25 +01:00
Blade Barringer
8a19a84f3f lint(tests): Add e2e tests to linter 2016-01-06 20:52:24 -06:00
Taylor Hobbs
a92646b4e9 tests(e2e): Fix test name to use proper English 2016-01-06 20:09:42 -06:00
Blade Barringer
75f71bc2ca fix: Corrects stat allocation bug where it was possible to recieve more points than 100
fixes #6434
2016-01-05 08:35:40 -06:00
Alys
8db492099c Revert "fix(common): Corrects bug where stat points could be awarded after level 100"
This reverts commit 2bbdf66d76.
2016-01-05 07:05:40 +10:00
Blade Barringer
2bbdf66d76 fix(common): Corrects bug where stat points could be awarded after level 100
Closes #6434
2016-01-04 07:58:59 -06:00
Blade Barringer
874f319d95 fix: Corrects logic where it was possible to customize avatar
with gem purchasable items without purchasing them.

Closes #6427
Closes #6448

lint(common): Add unnecessary quotes to make object look less weird
2016-01-03 10:41:44 -06:00
Blade Barringer
dfa2228dcc tests(api): Convert v2 status test to use await syntax 2016-01-02 22:23:53 -06:00
Blade Barringer
116fffaf4f lint: Fix linting errors in api v2 tests 2016-01-02 22:19:47 -06:00
Blade Barringer
ff1e5ef221 lint: Use eslint --fix to automatically fix some issues in api v2 tests 2016-01-02 18:28:06 -06:00
Blade Barringer
66572ad9d5 tests(api): Update PUT user test to use await 2016-01-01 19:37:14 -06:00
Blade Barringer
195fdce9ce tests(api): Update GET groups and GET groups id tests to use await 2016-01-01 19:33:23 -06:00
Blade Barringer
9f9ba2797a tests(api): Update complex beforeEachs to use await 2016-01-01 13:31:11 -06:00
Blade Barringer
70b23d0629 tests(api): Convert simple user generation to use await 2016-01-01 13:17:25 -06:00
Blade Barringer
ed753f4921 tests(api): Remove extra async 2016-01-01 12:56:43 -06:00
Blade Barringer
69c5192f70 tests(api): Add async to every it, before and beforeEach in v2 tests 2016-01-01 10:33:26 -06:00
Blade Barringer
730e5e3431 chore(lint): Add sandbox as global to test .eslintrc 2015-12-31 15:49:59 -06:00
Blade Barringer
0d75d5b541 lint: Move test eslint rules to .eslintrc in test directory 2015-12-31 15:46:47 -06:00
Blade Barringer
108f90b0bf tests(api): Add update method for api user 2015-12-31 12:15:57 -06:00
Blade Barringer
4bc96c2c99 tests(api): Update GET /user test to use async syntax 2015-12-31 12:11:40 -06:00
Blade Barringer
4563f0efb7 tests(api): Convert new group tests to use async and await (ES7) 2015-12-30 17:32:08 -06:00
Blade Barringer
802bb93b6c tests(api): Update integration helper in v2 to v3 changes 2015-12-29 20:37:29 -06:00
Blade Barringer
4c74c9949c Correct linting error 2015-12-29 17:43:11 -06:00
Blade Barringer
4cf9518a5a tests(api): Convert tests to use new api user methods 2015-12-29 17:34:33 -06:00
Blade Barringer
b2336c7adf tests(api): Add http methods to user object that is returned form generateUser 2015-12-29 17:34:11 -06:00
Blade Barringer
773bb23b88 chore(dependency): Remove unneeded lodash submodules 2015-12-29 07:45:13 -06:00
Blade Barringer
b3050e5a67 chore(dependency): Upgrade lodash from v2 to v3 2015-12-29 07:45:03 -06:00
Georgi Gardev
ea54ec607a Add confirmation popover for Release pets/mounts
Add tests for releasing pets and mounts

Refactor tests to use expect syntax from sinon-chai

tests(karma): Refine settings controller tests

refactor(client): Remove unecessary releaseX functions from $scope in settings ctrl
2015-12-28 21:37:38 -06:00
Georgi Gardev
f6f82cafc4 Add confirmation popover for Rebirth
Add confirmation popover for Fortify/Reroll

Add tests for reroll and rebirth
2015-12-28 21:37:23 -06:00
Blade Barringer
d53ac4c66f tests: Add ability to use ES2015 in karma tests 2015-12-28 08:24:23 -06:00
Blade Barringer
b6ab74ceda refactor(common): Update variable name 2015-12-26 20:10:56 -06:00
Blade Barringer
80ed048d5c tests: Update updateStats test 2015-12-26 19:52:25 -06:00
Blade Barringer
1b118d86b2 refactor: Extract constants into constants file 2015-12-26 19:41:20 -06:00
Blade Barringer
ba31cda85d Merge branch 'develop' into TheHollidayInn-leveling-ensure-user-gets-100-points 2015-12-26 19:14:40 -06:00
Blade Barringer
d0e6dbe103 fix: Remove only call from tests 2015-12-26 19:04:14 -06:00
Blade Barringer
7df3b333f6 feat: Refine clear local storage function 2015-12-26 19:00:45 -06:00
Blade Barringer
d36755b64a tests: Remove unnecessary describe closure in auth ctrl spec 2015-12-26 19:00:44 -06:00
Blade Barringer
c5bf06cd24 tests(common): Add test for preening todos 2015-12-26 08:11:02 -06:00
Sabe Jones
799e68614d Revert "fix(test): pend brittle subscription checks"
This reverts commit 61c5e2e3e9.
2015-12-23 20:32:39 -05:00
Sabe Jones
61c5e2e3e9 fix(test): pend brittle subscription checks 2015-12-23 15:07:21 -05:00
Blade Barringer
1aaebef114 tests(docs): Document how to run tests against a locally running server 2015-12-21 18:08:01 -06:00
Blade Barringer
6539399667 tests: Move api integration test readme to api directory 2015-12-21 18:03:13 -06:00
Keith Holliday
5573689d4e Added tests for ensuring user gets 100 points 2015-12-15 18:38:33 -06:00
Nathan Maton
35a921bf43 feat(content): Make mystery set strings translatable
Squashed and cleaned up version of
https://github.com/HabitRPG/habitrpg/pull/6367
2015-12-15 08:47:13 -06:00
Sabe Jones
e638661c71 Merge pull request #6314 from TheHollidayInn/tasks-fix-delete-message
Changed language when deleteing tasks to indicate type and text of task
2015-12-14 14:30:06 -06:00
Blade Barringer
883fd14775 tests(lint): remove unused variables 2015-12-13 16:40:44 -06:00
Blade Barringer
9ec26a8ee9 tests(common): Use generateUser helper in dailies test 2015-12-13 16:29:29 -06:00
Blade Barringer
b10c6f21a8 tests(common): Convert algos tests to use generateUser helper 2015-12-13 16:23:25 -06:00
Blade Barringer
e82085ac1b tests(helpers): Add common helpers for generating tasks 2015-12-13 16:22:58 -06:00
Blade Barringer
ce06d8a873 tests(common): Simplify spell tests 2015-12-13 15:37:18 -06:00
Blade Barringer
4ee21f2578 tests(common): Use helper to generate user 2015-12-13 10:40:50 -06:00
Blade Barringer
70751abe01 tests(helpers): Add helper to generate user for common and content tests 2015-12-13 10:40:00 -06:00
Blade Barringer
dafe014ec8 Merge branch 'develop' into TheHollidayInn-skills-burst-backstap-leveling-fix 2015-12-13 10:06:27 -06:00
Keith Holliday
beea6d920f Added tests for backstab and fireball 2015-12-13 09:19:20 -06:00
Alys
cf01376f7d adjust forgot password text to specify that you must use the website - fixes https://github.com/HabitRPG/habitrpg-android/issues/170 2015-12-11 06:39:03 +10:00
Matteo Pagliazzi
c5b7873406 add support for habitica-android in x-client header 2015-12-09 11:02:26 +01:00
Keith Holliday
215cf840b1 Added tests for removing task 2015-12-08 12:40:43 -06:00
Sabe Jones
0f578b79ff feat(pets): Peppermint Hatching Potions
Also fixes an issue where the pet hatching modal would appear when the user attempted to hatch a premium version of a quest pet.
2015-12-04 17:20:33 -05:00
Sabe Jones
aa00eae0d5 Merge pull request #6324 from ojeytonwilliams/unequip-notification-fix
Unequip notification fix
2015-12-03 14:01:45 -06: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
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
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
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
Alys
431eaec71a add a missing full stop to a message and to the associated test 2015-11-24 14:11:01 +10: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
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
Alys
6183fd9e71 refactor api.startOfWeek to a cron.js function not exposed on api 2015-11-21 22:26:05 +10:00
Alys
a73662bab6 refactor api.dayMapping to DAY_MAPPING const, not exposed on api 2015-11-21 20:48:18 +10:00
Sabe Jones
66725a561c fix(test): Remove only 2015-11-20 13:39:54 -05:00
Sabe Jones
e5d3e7bc83 fix(test): Linting and coverage 2015-11-20 13:36:41 -05:00
Sabe Jones
fb17c3ae80 Merge branch 'develop' into sabrecat/modularize-statHelpers 2015-11-20 13:27:25 -05:00
Blade Barringer
776faddb34 (chore): lint test/common files 2015-11-19 20:27:39 -06:00
Sabe Jones
31b68219d1 refactor(stats): Address PR comments 2015-11-18 15:06:55 -05:00
Oliver Eyton-Williams
570d7c3c76 Added tests for buying two-handed weapons 2015-11-18 16:41:06 +01:00
Blade Barringer
eded44fea5 Adjust helper files for linting preferences. 2015-11-18 08:54:34 -06:00
Blade Barringer
f58b3eee64 Move special gear into own subdirectory 2015-11-17 17:06:00 -06:00
Sabe Jones
4bf20959dd refactor(stats): Math helpers ES2015 module 2015-11-17 15:41:26 -05:00
Blade Barringer
195b39561b Move contributor gear to own module 2015-11-17 09:01:38 -06:00
Blade Barringer
2bac9c3c17 Separate out backer gear into own module 2015-11-17 08:17:40 -06:00
Blade Barringer
639dfb31d7 Pull out gear into separate modules 2015-11-16 17:29:13 -06:00