This repository was archived by the owner on Mar 4, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 59
Sup 2361 social no password #522
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,97 @@ | ||
| /* jshint -W117, -W030 */ | ||
| describe('Account Info Controller', function() { | ||
| var controller; | ||
| var vm; | ||
| var credential = {hasPassword: true}; | ||
| var deferred; | ||
| var fakeStateGo; | ||
|
|
||
| beforeEach(function() { | ||
| bard.appModule('tc.settings'); | ||
| bard.inject(this, '$controller', '$rootScope', '$q'); | ||
|
|
||
| deferred = $q.defer(); | ||
|
|
||
| var userService = { | ||
| getUserIdentity: function() { | ||
| return {handle: 'nicktest', email: '[email protected]'}; | ||
| }, | ||
| resetPassword: function() { | ||
| return $q.when({}); | ||
| }, | ||
| getUserProfile: function() { | ||
| return deferred.promise; | ||
| } | ||
| }; | ||
|
|
||
| var userData = { | ||
| handle: 'nicktest', | ||
| email: '[email protected]', | ||
| homeCountryCode: 'USA' | ||
| homeCountryCode: 'USA', | ||
| clone: function() { | ||
| return angular.copy(this); | ||
| } | ||
| }; | ||
|
|
||
| var state = { | ||
| go: function(transitionTo) { | ||
| return transitionTo; | ||
| } | ||
| } | ||
|
|
||
| fakeStateGo = sinon.spy(state, 'go'); | ||
|
|
||
| controller = $controller('AccountInfoController', { | ||
| UserService: userService, | ||
| userData: userData | ||
| userData: userData, | ||
| $scope: $rootScope.$new(), | ||
| $state: state | ||
| }); | ||
|
|
||
| vm = controller; | ||
| }); | ||
|
|
||
| bard.verifyNoOutstandingHttpRequests(); | ||
|
|
||
| // TODO: re-add tests! | ||
| // it('should be created successfully', function() { | ||
| // expect(controller).to.exist; | ||
| // }); | ||
| // | ||
| // describe('updating a user\'s password', function() { | ||
| // beforeEach(function() { | ||
| // $rootScope.$apply(); | ||
| // }); | ||
| // | ||
| // xit('should update a user\'s password if the current password was entered correctly', function() { | ||
| // controller.submitNewPassword(); | ||
| // }); | ||
| // | ||
| // xit('should return an error if the user entered an incorrect current password', function() { | ||
| // | ||
| // }); | ||
| // | ||
| // xit('should return an error if there was a server error', function() { | ||
| // | ||
| // }); | ||
| // }); | ||
| it('should be created successfully', function() { | ||
| expect(controller).to.exist; | ||
| }); | ||
|
|
||
| describe('updating a user\'s password', function() { | ||
| // beforeEach(function() { | ||
| // $rootScope.$apply(); | ||
| // }); | ||
|
|
||
| xit('should return an error if the user entered an incorrect current password', function() { | ||
|
|
||
| }); | ||
| }); | ||
|
|
||
| describe('vm.isSocialRegistrant', function() { | ||
| it('should be false if a user has a password', function() { | ||
| deferred.resolve({credential: credential}); | ||
|
|
||
| $rootScope.$apply(); | ||
|
|
||
| expect(vm.isSocialRegistrant).to.be.false; | ||
| }); | ||
|
|
||
| it('should be true if a user does not have a password', function() { | ||
| credential.hasPassword = false; | ||
|
|
||
| deferred.resolve({credential: credential}); | ||
|
|
||
| $rootScope.$apply(); | ||
|
|
||
| expect(vm.isSocialRegistrant).to.be.true; | ||
| }); | ||
|
|
||
| it('should go to the edit page on error', function() { | ||
| deferred.reject(); | ||
|
|
||
| $rootScope.$apply(); | ||
|
|
||
| expect(fakeStateGo).to.have.been.calledWith('settings.profile'); | ||
| }); | ||
| }); | ||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we add tests for this case please?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
argh, you saw that