Commit Graph

9434 Commits

Author SHA1 Message Date
Kevin Gisi 7b2164e0db Update Karma config to include the new directives 2015-06-08 10:02:45 -04:00
Kevin Gisi 7ef98ff7e2 Split directives into separate files 2015-06-08 10:02:44 -04:00
Blade Barringer e0794b1f08 Merge pull request #5367 from gisikw/improve-test-suite
Add summary reporters to gulp tests and make protractor specs verbose
2015-06-08 07:41:05 -05:00
Alys e5b8c5c4e0 use a different random seed for starting Armoire randomness than for sub-choices within it to prevent bug that gives only some foods 2015-06-08 21:15:51 +10:00
Kevin Gisi a288b7404c Add summary reporters to gulp tests and make protractor specs verbose 2015-06-08 05:29:53 -04:00
Matteo Pagliazzi 9fa39d99ae perf(i18n): load only the language preference, not the whole user 2015-06-07 14:27:07 +02:00
Blade Barringer c9639cdd30 Merge pull request #5355 from gisikw/gulpify-test-suite
Gulpify test suite
2015-06-06 22:08:54 -05:00
Kevin Gisi 211424c4a3 Merge pull request #1 from crookedneighbor/blade-5355-gulpify-test-suite
For #5355 - gulpify test suite
2015-06-06 20:54:17 -04:00
Blade Barringer ed421ebcc5 Set npm test to call gulp test 2015-06-06 12:15:17 -05:00
Blade Barringer a1cce24010 Make test groups depend on specific test:prepare tasks 2015-06-06 12:14:28 -05:00
Kevin Gisi ff39773aa4 Drop Mongo DB using mongoose, rather than CLI. Show output for e2e specs 2015-06-06 11:25:26 -04:00
Kevin Gisi ff017be664 Remove Grunt from karma test chain 2015-06-06 10:48:38 -04:00
Kevin Gisi f613a5e5a7 Refactored Gulp tasks to exist within a tasks folder 2015-06-06 10:16:26 -04:00
Kevin Gisi 6a397a8be5 First pass at Gulpifying the test suite. 2015-06-06 08:27:15 -04:00
Alys 1743899dd4 adjust login code for ultimateGearSets migration script 2015-06-06 09:15:54 +10:00
Alys 488919d5ce fixes to ultimateGearSets migration script - NOT FULLY TESTED YET 2015-06-06 08:03:33 +10:00
Alys a35fa6850c changed ultimateGearSets migration script to require only one run for all classes - NOT TESTED YET 2015-06-06 07:34:47 +10:00
Sabe Jones cfa6efce85 Merge pull request #5351 from HabitRPG/armoire
Enchanted Armoire
2015-06-05 11:58:59 -07:00
Blade Barringer e8c131cde8 Add rudimentary test for migration script 2015-06-05 13:12:38 -05:00
Sabe Jones f4a4dbdfd8 fix(tests): Armoire probabilities
Updates the random number generation for Armoire tests to match the new 60/40 distribution.
2015-06-05 10:34:25 -05:00
Sabe Jones 804cced3ff chore(various): News and sprites
Also tweaks the drop probability of equipment from 70% to 60%.
2015-06-05 10:22:22 -05:00
Blade Barringer 8f744b043a Add gear owned to spec helper 2015-06-05 08:59:45 -05:00
Sabe Jones 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
Sabe Jones 20859b83ef feat(Armoire): Improved counter
The popover counter of remaining Equipment in the Armoire now counts down immediately instead of requiring a browser refresh. A modal announces when the last item has been found. Also includes several fixes to the Ultimate Gear migration.
2015-06-04 15:45:55 -05:00
Sabe Jones c39ad2a2ae Merge pull request #5344 from SabreCat/develop
June BGs
2015-06-04 09:55:29 -07:00
Sabe Jones 6074774e14 feat(backgrounds): June BGs 2015-06-04 11:30:25 -05:00
Sabe Jones c8f4e6209a Merge pull request #5343 from HabitRPG/sabrecat/mounts
Readjusted lion
2015-06-04 09:24:21 -07:00
Sabe Jones 4f6f0220ad fix(mounts): Readjusted lion 2015-06-04 11:02:58 -05:00
Blade Barringer 865f7651a9 Merge branch 'TheHollidayInn-invite-friends-in-header' into develop 2015-06-04 08:54:04 -05:00
Blade Barringer 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
TheHollidayInn 2234c7219e Moved invite friends button to under the subscribe button 2015-06-03 20:33:39 -05:00
Sabe Jones 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
Sabe Jones 97ae243c40 fix(Armoire): Fixes
Armoire items are now breakable on character death, and can be purchased back directly from Rewards after death or Rebirth. Corrected string token on Costume area. Images show up correctly on Armoire drop notifications.
2015-06-03 12:50:57 -05:00
Sabe Jones af3ee8cfcd feat(Armoire): Updates from feedback
Adds images to Armoire drop notifications, refreshes the Rewards column when the Armoire is enabled, adds Armoire items to Costume customization, and introduces a migration for granting the new style Ultimate Gear achievement to those who have already earned it.
2015-06-03 11:58:30 -05:00
Blade Barringer e52a73f367 Merge branch 'negue-fixQuestNotify' into develop 2015-06-03 07:38:38 -05:00
negue d6f5ba0fc7 Merge pull request #5336 from negue/fixQuestNotify
FIX: Quest Invitation Notification
2015-06-03 07:52:09 +02:00
Blade Barringer 64a61a26ca Add test for push notifications 2015-06-02 22:55:26 -05:00
Sabe Jones c90f7e2c34 feat(Armoire): WIP 2015-06-02 17:42:14 -05:00
Blade Barringer 399ff8c00b Merge branch 'http-tests' into develop 2015-06-02 17:34:07 -05:00
Blade Barringer 7a157fabb2 Finish tests for castEnd 2015-06-02 17:32:44 -05:00
Nick Tomlin 88e1ec690a Start tests for rootScope castEnd 2015-06-02 13:04:59 -05:00
Negue 5612b4be6b Only send "Quest Started" Notifications to users which accepted the quest 2015-06-02 20:02:14 +02:00
Blade Barringer 3ed6db753d Merge pull request #5337 from NickTomlin/notification-service
Change signature of notification service
2015-06-02 12:37:25 -05:00
Nick Tomlin ee88ed4b44 Change signature of notification service 2015-06-02 12:33:21 -05:00
Negue 264a1e4b16 FIX: Quest Invitation Notification
ADD: Quest Started Notification
2015-06-02 17:40:19 +02:00
Blade Barringer ca31b490e6 Add missing semicolons and s's 2015-06-02 08:43:10 -05:00
Blade Barringer af94236a01 Add wiki link to reward help string.
Fixes #5333
2015-06-02 08:15:16 -05:00
Blade Barringer 24c299783a Merge branch 'TheHollidayInn-markdown-for-spells' into develop 2015-06-02 07:58:29 -05:00
Blade Barringer b375c068de Refactor notification service and add tests 2015-06-02 07:51:54 -05:00
TheHollidayInn d1df5d740d Changed button to invite friends text 2015-06-01 21:10:49 -05:00