Commit Graph

459 Commits

Author SHA1 Message Date
Kevin Gisi c8b5480157 Repair tests to respect setTimeout 2015-06-24 03:41:49 -04:00
Sabe Jones fcd278c2f6 fix(analytics): Pass tests
Restores the "UUID" property so that tests no longer fail. Corrects various typos in analytics service test. Moves landing page tracking to the Jade file to avoid duplicate tracking.
2015-06-23 10:11:03 -05:00
Blade Barringer 78689e6e7c Made analytics mock, adjusted sandbox 2015-06-22 12:52:24 -05:00
Blade Barringer 8579bb86df Merge branch 'develop' into sabrecat/analytics-service 2015-06-22 12:37:17 -05:00
Blade Barringer b4c4b891a1 Moved sandbox.js to mocks directory 2015-06-21 20:02:48 -05:00
Blade Barringer 7ee1899807 Refactore analytics service and tests 2015-06-21 16:39:32 -05:00
Blade Barringer 1be73011eb Merge branch 'develop' into add-user-to-analyticsService 2015-06-21 14:04:17 -05:00
Blade Barringer 96162b37bd Merge pull request #5433 from gisikw/ultimate-gear-fix
Ultimate gear fix
2015-06-20 17:34:47 -05:00
Blade Barringer d96b362531 Add additional tests for updateUser 2015-06-20 16:37:30 -05:00
Blade Barringer 9008a31c4a Add user to analytics service, rewrite updateUser to match test 2015-06-20 16:04:34 -05:00
Blade Barringer 71fad8ca97 Provide user for anaylitcs service test 2015-06-20 15:50:06 -05:00
Blade Barringer ab53391fee Convert analytics service to use sinon.sandbox 2015-06-20 15:00:30 -05:00
Blade Barringer c7615e1cbd Merge branch 'develop' into gisikw-sabrecat/analytics-service 2015-06-20 14:52:28 -05:00
Blade Barringer 944cef4d44 Switch over to using sinon.sandbox in karma specs 2015-06-20 14:48:38 -05:00
Kevin Gisi 266122567d Repaired specs (stubbing issues) 2015-06-20 14:25:34 -04:00
Kevin Gisi 951d5417bc Add failing spec for armoire edge case 2015-06-20 01:58:05 -04:00
Blade Barringer 2acf7eb71e Move score tests to separate file 2015-06-19 23:51:37 -05:00
Blade Barringer ddc8508816 Merge branch 'develop' into TheHollidayInn-tasks-api-up-checkoff-todo 2015-06-19 23:00:18 -05:00
TheHollidayInn 925cc81425 Removed complete param from creating todos with up and down url and added test for overriding complete parameter 2015-06-18 23:10:50 -05:00
Sabe Jones 86d711bb5e WIP(analytics): Remove Mixpanel 2015-06-18 20:33:54 -05:00
Sabe Jones 3c5ae80e0b WIP(analytics): Move client tracking to service 2015-06-18 15:43:57 -05:00
Blade Barringer 4da3018ad9 Simplify editTask 2015-06-17 07:51:07 -05:00
Blade Barringer e422ea065f Reword tests 2015-06-16 23:16:11 -05:00
Blade Barringer 3ab27f32d2 Refactored editTask into TaskService 2015-06-16 23:11:04 -05:00
TheHollidayInn 3dc3891ec6 Fixed habit tests to create habits and check scoring 2015-06-16 20:19:02 -05:00
Blade Barringer ecb2544cdc Merge pull request #5396 from hairlessbear/remove_freeRebirth
Removed 'freeRebirth' from user model and everywhere else in codebase
2015-06-15 08:00:18 -05:00
Phillip Thelen 39adff0e2c improve error reporting for iOS IAP 2015-06-15 13:09:22 +02:00
Blade Barringer bb2f97e802 Added android tests for iap 2015-06-14 18:35:19 -05:00
Blade Barringer 1ea7193694 Add missing test 2015-06-14 18:11:07 -05:00
Blade Barringer 6318b0828f Add test for iOS in-app purchases 2015-06-14 18:04:47 -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