Commit Graph

128 Commits

Author SHA1 Message Date
Keith Holliday
1a87619bac Api v3 party quest fixes (#7341)
* Fix display of add challenge message when group challenges are empty

* Fixed forced quest start to update quest without reload

* Fixed needing to reload when accepting party invite

* Fix group leave and join reload

* Fixed leave current party and join another

* Updated party tests
2016-05-18 11:22:32 +02:00
Matteo Pagliazzi
e8b8fc3b3a v3 client: fix tests 2016-05-17 22:43:18 +02:00
Keith Holliday
bc44fa062e Api v3 challenge fixes (#7287)
* Fixed join/leave button updates

* Queried only user groups to be available when creating challenges

* Fixed bulk add tasks to challenge

* Synced challenge tasks after leave and join.

* Fixed default selected group

* Fixed challenge member info. Fixed challenge winner selection

* Fixed deleting challenge tasks

* Fixed particiapting filter

* Fixed viewing user progress on challenge

* Updated tests

* Added delete for saved challenge task
2016-05-16 21:49:22 +02:00
Keith Holliday
2d5bf9b1bc Fixed reload tests 2016-05-14 12:00:41 -05: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
Keith Holliday
ca6dca5fd0 Fixed test broken by part sync change (#7195) 2016-05-12 19:55:34 +02:00
Keith Holliday
5d7ebd82a4 Updated party and group tests 2016-05-11 17:06:16 -05:00
Keith Holliday
f807bc2a49 Fixed auth tests. Updated Authctrl response 2016-05-10 22:09:04 -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
e747bba669 Updated add and remove tests for challenges (#7155) 2016-05-08 18:35:38 +02: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
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
Lucas Braun
ee9dc7c196 Remove extra 'it' from spec description 2016-03-29 22:11:36 -04:00
Blade Barringer
22c83c92c2 Merge pull request #6904 from HabitRPG/inventory_sorting_debug
Inventory sorting debug
2016-03-18 07:33:45 -05:00
Blade Barringer
de2f9eb28b Update tests to us set by default 2016-03-17 17:28:46 -05: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
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
93c5cc0385 add tests for awarding party {up,on} achievs 2016-03-15 16:03:36 -04:00
Blade Barringer
92657fa8af refactor: Remove unused code in test 2016-01-18 22:40:11 -06:00
Jason Vinson
2989057dd3 Fix for issue #5182: Allow cancel editing group infobox 2016-01-18 22:39:06 -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
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
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
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
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
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
Keith Holliday
b6e79f3ba8 Prevented modal from showing when user tries to hatch a pet they own 2015-11-23 10:20:39 -06:00
Sabe Jones
aad3e5ade6 fix(sharing): Add social service to Inventory
Also fixes accidental 'only' in tests.
2015-10-28 16:52:07 -04:00
Sabe Jones
f4ea6c1d5d feat(sharing): Opt Out WIP
First draft of support for opting out of future modal display on specific events, and adds the second barebones target page for sharing.
2015-10-28 16:36:47 -04:00
TheHollidayInn
bfca612be2 Moved intial filtering to a scope function and added test 2015-09-24 16:39:53 -05:00
Blade Barringer
955c163544 Merge branch 'develop' into refactor-content 2015-09-23 07:52:36 -05:00
Sabe Jones
87f6af346a fix(misc): Tweaks
* Updates the text shown for Mystic Hourglasses in the inventory to account for new features.
* Fixes the date range for the Fall Festival to correctly start September 21.
* Updates test for the Inventory Controller to use lodash for object key iteration.
2015-09-21 13:59:00 -04:00
Blade Barringer
8881dbc034 Remove uneeded blank spaces 2015-09-16 20:01:42 -05:00
Sabe Jones
15cddabd80 fix(test): Remove only 2015-09-16 19:21:05 -04:00