@@ -118,21 +118,18 @@ describe('login command', function() {
118118 } ) ;
119119 } ) ;
120120
121- it ( 'should throw an error on a failed log in' , function ( done ) {
121+ it ( 'should display the error on a failed log in attempt ' , function ( done ) {
122122 var processArguments = [ 'node' , 'ionic' , 'login' , '--email' , '[email protected] ' , '--password' , 'asdf1234' ] ; 123123 var rawCliArguments = processArguments . slice ( 2 ) ;
124124 var argv = optimist ( rawCliArguments ) . argv ;
125125
126- var error = new Error ( 'error occurred' ) ;
126+ var error = 'Email or Password incorrect. Please visit' ;
127127 spyOn ( log , 'error' ) ;
128128 spyOn ( login , 'promptForLogin' ) ;
129- spyOn ( appLibLogin , 'requestLogIn' ) . andCallFake ( function ( ) {
130- throw error ;
131- } ) ;
129+ spyOn ( appLibLogin , 'requestLogIn' ) . andReturn ( Q . reject ( error ) ) ;
132130
133- login . login ( argv ) . catch ( function ( err ) {
134- expect ( log . error ) . toHaveBeenCalledWith ( 'Error logging in' ) ;
135- expect ( err ) . toEqual ( error ) ;
131+ login . login ( argv ) . then ( function ( ) {
132+ expect ( log . error ) . toHaveBeenCalledWith ( error ) ;
136133 done ( ) ;
137134 } ) ;
138135 } ) ;
@@ -159,25 +156,5 @@ describe('login command', function() {
159156 done ( ) ;
160157 } ) ;
161158 } ) ;
162-
163- it ( 'should return a rejected promise on failure' , function ( done ) {
164- var processArguments = [ 'node' , 'ionic' , 'login' ] ;
165- var rawCliArguments = processArguments . slice ( 2 ) ;
166- var argv = optimist ( rawCliArguments ) . argv ;
167-
168- spyOn ( log , 'info' ) ;
169- spyOn ( prompt , 'start' ) ;
170- spyOn ( prompt , 'get' ) . andCallFake ( function ( schema , callback ) {
171- callback ( 'an error occurred' , null ) ;
172- } ) ;
173-
174- var promptForLogin = login . __get__ ( 'promptForLogin' ) ;
175-
176- promptForLogin ( argv ) . catch ( function ( results ) {
177- expect ( prompt . get ) . toHaveBeenCalled ( ) ;
178- expect ( results ) . toEqual ( 'Error logging in: an error occurred' ) ;
179- done ( ) ;
180- } ) ;
181- } ) ;
182159 } ) ;
183160} ) ;
0 commit comments