From 83bd4dcf60e8955e5dc2008a9a012aa49df382cf Mon Sep 17 00:00:00 2001 From: Clint Ryan Date: Tue, 14 Mar 2017 12:35:48 +1100 Subject: [PATCH] Add failing test, seeking help/advice --- .../spec/controllers/userCtrlSpec.js | 37 +++++++++++++++++++ website/client-old/js/controllers/userCtrl.js | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 test/client-old/spec/controllers/userCtrlSpec.js diff --git a/test/client-old/spec/controllers/userCtrlSpec.js b/test/client-old/spec/controllers/userCtrlSpec.js new file mode 100644 index 0000000000..54be4a43ec --- /dev/null +++ b/test/client-old/spec/controllers/userCtrlSpec.js @@ -0,0 +1,37 @@ +'use strict'; + +describe('User Controller', function() { + var $rootScope, shared, scope, user, User, ctrl, content; + + beforeEach(function() { + user = specHelper.newUser(); + User = { + user: user + }; + + module(function($provide) { + $provide.value('User', User); + $provide.value('Guide', {}); + }); + + inject(function($rootScope, $controller, Shared, Content){ + scope = $rootScope.$new(); + Shared.wrap(user); + shared = Shared; + content = Content + $controller('RootCtrl', {$scope: scope, User: User, Shared: Shared}); + ctrl = $controller('UserCtrl', {$scope: scope, User: User}); + }); + }); + + describe.only('getProgressDisplay', function() { + it('should return initial progress', function() { + sinon.stub(content, 'loginIncentives').onFirstCall().returns({ + prevRewardKey: 0, + nextRewardKey: 1 + }); + var actual = scope.getProgressDisplay(); + expect(actual).to.eql(''); + }); + }); +}); diff --git a/website/client-old/js/controllers/userCtrl.js b/website/client-old/js/controllers/userCtrl.js index 679e3f101b..b13a941eff 100644 --- a/website/client-old/js/controllers/userCtrl.js +++ b/website/client-old/js/controllers/userCtrl.js @@ -1,6 +1,6 @@ "use strict"; -habitrpg.controller("UserCtrl", ['$rootScope', '$scope', '$location', 'User', '$http', '$state', 'Guide', 'Shared', 'Content', 'Stats', 'Social', 'Costume', +habitrpg.controller('UserCtrl', ['$rootScope', '$scope', '$location', 'User', '$http', '$state', 'Guide', 'Shared', 'Content', 'Stats', 'Social', 'Costume', function($rootScope, $scope, $location, User, $http, $state, Guide, Shared, Content, Stats, Social, Costume) { $scope.profile = User.user;