Commit Graph

2785 Commits

Author SHA1 Message Date
Blade Barringer 5385471cb2 Fix push notifications test 2015-06-14 17:00:13 -05:00
Blade Barringer 14fe29dd4a Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync 2015-06-14 16:33:38 -05:00
Blade Barringer 3457068351 Cleaned up location of test files 2015-06-13 21:11:43 -05:00
Blade Barringer 6513527d8b Refactor challenges filter 2015-06-13 19:41:41 -05:00
Blade Barringer ddb28c0305 Merge branch 'develop' into TheHollidayInn-challenges-owner-filter 2015-06-13 18:23:51 -05:00
hairlessbear 4bf1b94c1d Removed 'freeRebirth' from user model and all uses in codebase 2015-06-13 14:18:03 -04:00
Blade Barringer 8faf96f5b9 Refactored filters 2015-06-13 12:39:11 -05:00
Blade Barringer 719907189f Organized spec folder 2015-06-13 09:58:08 -05:00
Blade Barringer 5d56bd02ef Merge branch 'develop' into blade-feature/search 2015-06-13 00:10:44 -05:00
Blade Barringer 2f1111522c Adjust PR #5389
* Convert $watch to ng-change and re-wrote test
* Removed unnecessary styles
* Use .form-control instead of class='form-control'
2015-06-12 09:05:06 -05:00
TheHollidayInn 8d20168b6b Added up and down test to complete and uncomplete a todo respectively. 2015-06-11 23:38:44 -05:00
Blade Barringer 54681e36b5 Merge branch 'develop' into blade-Finish_weeklies_pr 2015-06-11 19:47:46 -05:00
Jiri Chara 2c52829256 Implement filter tasks by text & notes
In order to be able to filter tasks by it's text or notes - we need an
extra filter to be implemented, because angular does not support OR
condition for it's default filter directive.
2015-06-11 20:39:29 +02:00
Jiri Chara df7d36923c Enable filtering for tasks and custom rewards
Add search input box next to the tags. When user changes the value of
the input box then it's propagated to the user service as filterQuery
string. filterQuery string is then used in the tasks template to filter
tasks by text.
2015-06-11 09:10:31 +02:00
Blade Barringer 8dde41d18a Wrie and refactor guild tests 2015-06-10 23:39:46 -05:00
TheHollidayInn 31f61c05f4 Added tests for using directional tasks endpoints 2015-06-10 23:10:37 -05:00
Blade Barringer 1d18f53a67 Merge branch 'develop' into blade-Finish_weeklies_pr
Added Sabe's novalidate change to adding a new task
2015-06-10 07:53:37 -05:00
Blade Barringer 40f9ff93de Adjusted guilds test 2015-06-09 22:52:38 -05:00
Blade Barringer 553538f7ba Adjust party tests 2015-06-09 22:36:37 -05:00
Blade Barringer 39c75d5b07 Adjustments to chat tests 2015-06-09 18:24:56 -05:00
Blade Barringer b53ff67c1f Merge branch 'develop' into TheHollidayInn-groups-api-tests 2015-06-09 18:19:35 -05:00
Blade Barringer ca72b9a9e1 Merge branch 'chimericdream-issues/4838' into develop 2015-06-09 12:45:22 -05:00
Blade Barringer ec3b32fccb Add test for preventing task with id that already exists 2015-06-09 12:44:49 -05:00
Sabe Jones 413b01348d fix(test): Ultimate Gear passing 2015-06-09 11:22:45 -05:00
Sabe Jones 62eea3d928 fix(test): Group Ultimate Gear tests 2015-06-09 11:05:25 -05:00
Sabe Jones 8a6aa0ed6c test(achievements): Ultimate Gear persistence 2015-06-09 11:01:11 -05:00
Blade Barringer dabb6244e7 Merge pull request #5370 from gisikw/split-out-directives
Split out Angular directives
2015-06-09 07:42:12 -05:00
Blade Barringer 74112fd66d Test automatic refresh 2015-06-09 07:02:15 -05:00
Kevin Gisi 9cc4993fb3 Refactor focus-me spec to use an assertion 2015-06-08 23:21:55 -04:00
TheHollidayInn b5abfd828d Separated chat and party test into their own files 2015-06-08 21:37:46 -05:00
Kevin Gisi 8171209ab1 Add some directive specs 2015-06-08 10:02:45 -04:00
Kevin Gisi f95eaa736a Add first directive spec 2015-06-08 10:02:45 -04: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 6a397a8be5 First pass at Gulpifying the test suite. 2015-06-06 08:27:15 -04:00
TheHollidayInn dccbcb46d0 Fixed member error and fixed inconsistency in party query tests 2015-06-05 20:27:00 -05:00
Blade Barringer 164a26616e Merge branch 'develop' into blade-Finish_weeklies_pr 2015-06-05 17:35:16 -05: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
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
Blade Barringer db38663f94 Merge branch 'develop' into blade-Finish_weeklies_pr 2015-06-04 12:45:23 -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
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
Blade Barringer 7adde1d1dd Merge branch 'develop' into blade-Finish_weeklies_pr 2015-06-03 07:41:09 -05:00
Blade Barringer e52a73f367 Merge branch 'negue-fixQuestNotify' into develop 2015-06-03 07:38:38 -05: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 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