Commit Graph

1683 Commits

Author SHA1 Message Date
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
Blade Barringer
88ef920a2f fix: Update travis yaml to run protractor 3 2016-03-13 21:16:51 -05:00
Matteo Pagliazzi
e506864e00 Merge pull request #6877 from HabitRPG/v3-adapt-shared
Make shared code ready for API v3
2016-03-13 23:13:00 +01:00
Matteo Pagliazzi
f65a7321b7 fix common tests, explictly exclude tests from linting 2016-03-13 23:00:48 +01:00
Blade Barringer
17d2efb822 refactor: Organize protractor setup 2016-03-13 16:41:57 -05:00
Matteo Pagliazzi
70df1137a0 fix statsComputed getter 2016-03-13 22:39:14 +01:00
Matteo Pagliazzi
8e3284a4e3 wip(shared): adapt to v3 2016-03-13 22:26:32 +01:00
Victor Piousbox
0b25720232 cleanup 2016-03-13 14:01:53 -07:00
Victor Piousbox
c14f0c4247 update username, password 2016-03-13 10:42:59 -07:00
Blade Barringer
0b65292e4b test: Update protractor to v3 and use mocha 2016-03-13 09:51:01 -05:00
Keith Holliday
c04e53b5a5 Added initial delete challenge tasks tests 2016-03-12 21:00:43 -06:00
Matteo Pagliazzi
13a86c3858 Merge pull request #6869 from TheHollidayInn/api-v3-remove-challenge-checklist-item
Added initial test for removing challenge checklist item
2016-03-12 18:08:27 +01:00
Matteo Pagliazzi
ce916e31bd Merge pull request #6866 from TheHollidayInn/api-v3-updated-checklist-item
Added initial checklist item update tests
2016-03-12 18:07:50 +01:00
Keith Holliday
152f7605cd Added initial test for removing challenge checklist item 2016-03-12 10:55:12 -06:00
Keith Holliday
e4124f9e02 Added initial checklist item update tests 2016-03-12 10:38:40 -06:00
Matteo Pagliazzi
2fa361d9ea Merge pull request #6865 from TheHollidayInn/api-v3-challenge-add-checklist-item
Add initial tests for add checklist item to challenge
2016-03-12 15:56:32 +01:00
Matteo Pagliazzi
8463abb830 Merge pull request #6853 from TheHollidayInn/api-v3-challenge-tasks-put
Added initial challenge task update tests
2016-03-12 14:52:54 +01:00
Keith Holliday
0af912bebb Add initial tests for add checklist item to challenge 2016-03-11 14:19:46 -06:00
Matteo Pagliazzi
c6e5e3eb1f Merge pull request #6787 from TheHollidayInn/api-v3-challenge-model-tests
Added initial challenge model tests
2016-03-11 19:17:09 +01:00
Matteo Pagliazzi
8ca4a7ce8a Merge pull request #6824 from TheHollidayInn/api-v3-get-challenge-tasks
Added initial tests for get challenge tasks
2016-03-11 19:16:51 +01:00
Matteo Pagliazzi
29b6e958c6 fix failing tests 2016-03-11 09:51:59 +01:00
Keith Holliday
61e360a1d8 Added initial challenge task update tests 2016-03-10 15:30:22 -06:00
Matteo Pagliazzi
fbdbd8e006 Merge branch 'develop' into api-v3 2016-03-10 18:30:09 +01:00
Sabe Jones
cc53e6e9dc Merge pull request #6733 from vIiRuS/mobileStorage
Store data for next mobile update
2016-03-09 14:56:15 -06:00
Keith Holliday
f96de74abd Added test for incorrect task and id and renamed test file 2016-03-09 10:01:16 -06:00
Keith Holliday
22e64bb88e Added initial get challenge task by id 2016-03-08 12:42:05 -06:00
Phillip Thelen
36790592c6 add tests for improvement categories 2016-03-06 17:56:51 +01:00
Matteo Pagliazzi
b5e1cd33e2 Merge branch 'develop' into api-v3 2016-03-05 19:29:02 +01:00
Matteo Pagliazzi
6830a4464a Merge branch 'api-v3-email-3' of https://github.com/piousbox/habitrpg into piousbox-api-v3-email-3 2016-03-05 19:24:11 +01:00