8f744b043a
Add gear owned to spec helper
2015-06-05 08:59:45 -05:00
95bb5be22a
Merge branch 'develop' into armoire
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith0.css
common/dist/sprites/spritesmith0.png
common/dist/sprites/spritesmith1.css
common/dist/sprites/spritesmith1.png
common/dist/sprites/spritesmith2.css
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
common/dist/sprites/spritesmith5.css
common/dist/sprites/spritesmith5.png
common/dist/sprites/spritesmith6.css
common/dist/sprites/spritesmith6.png
2015-06-04 15:49:06 -05:00
865f7651a9
Merge branch 'TheHollidayInn-invite-friends-in-header' into develop
2015-06-04 08:54:04 -05:00
7a1c5835d0
Final adjustments to PR #5114
...
* Added test for header ctrl
* Made openModal function more readable
* Only show setting to disable invite friends if party is exactly 1 member big
* Use party.memberCount instead of party.members.length because it's more expressive
2015-06-04 08:48:05 -05:00
09d32390f9
feat(Armoire): Item counter
...
Implements a counter for how many pieces of equipment remain to be found in the Armoire, including tests for same.
2015-06-03 16:48:11 -05:00
e52a73f367
Merge branch 'negue-fixQuestNotify' into develop
2015-06-03 07:38:38 -05:00
64a61a26ca
Add test for push notifications
2015-06-02 22:55:26 -05:00
c90f7e2c34
feat(Armoire): WIP
2015-06-02 17:42:14 -05:00
7a157fabb2
Finish tests for castEnd
2015-06-02 17:32:44 -05:00
88e1ec690a
Start tests for rootScope castEnd
2015-06-02 13:04:59 -05:00
ca31b490e6
Add missing semicolons and s's
2015-06-02 08:43:10 -05:00
24c299783a
Merge branch 'TheHollidayInn-markdown-for-spells' into develop
2015-06-02 07:58:29 -05:00
b375c068de
Refactor notification service and add tests
2015-06-02 07:51:54 -05:00
39f363ec29
Add tests for castEnd on root controller
2015-06-01 17:38:18 -05:00
6fb100874c
Added mixpanel mock to make karma tests happy
2015-05-30 23:29:52 -05:00
466221f848
Correct test syntax
2015-05-24 22:13:51 -05:00
30ef563534
Merge branch 'negue-anonymizedUser' into develop
2015-05-24 22:04:18 -05:00
0afd56e8ad
Refine anonymous user test
2015-05-24 22:03:40 -05:00
abbfdaeda5
Adjust NotGonnaGitUs's PR
...
* move challenge test to separate file
* adjust wording of popover text
* prevent refunding gems for tavern challenges
* adjust ui of challenge creation page
* fix bug in cancel function
* adjust wording of delete confirmation message
2015-05-24 21:22:40 -05:00
120872ffd2
Merge in develop
2015-05-24 15:46:57 -05:00
2900c53b84
Fix and unpend dailies test
2015-05-19 20:22:43 -05:00
bd76b762e6
Merge pull request #5212 from HabitRPG/negue-WIP-Push-notifications
...
Negue wip push notifications
2015-05-18 11:14:53 -05:00
56b6794c66
Correct test string
2015-05-14 22:09:36 -05:00
547d234b46
Add final test for push notifications
2015-05-14 21:32:28 -05:00
7a2e2fa227
Add tests for invites to guilds or parties
2015-05-14 17:29:33 -05:00
84aaeedfff
Add challenges test
2015-05-14 07:32:16 -05:00
2fac464160
Remove extranious pushSpy declaration
2015-05-13 19:35:26 -05:00
023458b6e5
Add test for getting push notification when gifted a subscription
2015-05-13 19:31:26 -05:00
68ce9a8457
fix(test): Unlock takes query, not params
2015-05-13 14:34:20 -05:00
0cb1d8ec9a
test(purchases): Gem buying tests
...
Also corrects the byline for Inn improvements to credit primary coder @hairlessbear.
2015-05-13 14:21:13 -05:00
dca45d7845
Enable new inn behavior
2015-05-13 08:44:08 -05:00
0629b6af18
Correct bad tests in common suite
2015-05-13 08:37:52 -05:00
5cc847857f
Unpend in test, pend failing tests
2015-05-13 07:50:16 -05:00
8a4abc632f
Refactor push notifications test; Prevent push notification from being sent when buying gems for yourself as a gift
2015-05-12 20:18:06 -05:00
9a84503aed
Merge branch 'develop' into negue-WIP-Push-notifications
2015-05-12 19:06:34 -05:00
292b8a6741
Correct comments
2015-05-12 18:58:56 -05:00
8f17519cd3
Reduce timeout time
2015-05-12 18:57:35 -05:00
e35b24582b
Fix push notification tests
2015-05-12 18:26:18 -05:00
adef6bef7b
tried to add a test for purchased gem gift
2015-05-12 21:36:22 +02:00
b635c62d16
Add contexts
2015-05-12 09:04:07 -05:00
ff41a2c240
Refactor group tests
2015-05-12 08:08:55 -05:00
faa897e4ae
Re-enable skipped test
2015-05-11 17:29:46 -05:00
60857994c3
Add expectation that push notification gets called when sending gems
2015-05-11 17:27:58 -05:00
3c61b8dc4f
Add todo about re-enabling test
2015-05-11 14:41:35 -05:00
b663ff7101
Skipping group tests while we sort out join issue
2015-05-11 14:40:45 -05:00
c3bb6b88fa
fix(tests): temporarily skip test
2015-05-11 17:21:57 +02:00
3cda9ff820
Update push notification test to use chai expect
2015-05-11 08:19:49 -05:00
a7fa8dc9a4
Merge branch 'develop' into negue-WIP-Push-notifications
2015-05-11 08:18:11 -05:00
c444f54e42
Remove unnecessary global declarations
2015-05-11 08:17:46 -05:00
ed8a4ef651
Use chai expect instead of expect.js
2015-05-11 08:13:23 -05:00
Blade Barringer