@@ -20,65 +20,56 @@ public class TheDoneSignal : TestBaseClass
2020 [ Test ]
2121 public async Task SucessfulGitHubLoginSignalsDoneAsync ( )
2222 {
23- using ( TestUtils . WithScheduler ( Scheduler . CurrentThread ) )
24- {
25- var connectionManager = Substitute . For < IConnectionManager > ( ) ;
26- var connection = Substitute . For < IConnection > ( ) ;
23+ var connectionManager = Substitute . For < IConnectionManager > ( ) ;
24+ var connection = Substitute . For < IConnection > ( ) ;
2725
28- var gitHubLogin = CreateLoginToHostViewModel < ILoginToGitHubViewModel > ( connection ) ;
29- var enterpriseLogin = CreateLoginToHostViewModel < ILoginToGitHubForEnterpriseViewModel > ( ) ;
30- var loginViewModel = new LoginCredentialsViewModel ( connectionManager , gitHubLogin , enterpriseLogin ) ;
31- var signalled = false ;
26+ var gitHubLogin = CreateLoginToHostViewModel < ILoginToGitHubViewModel > ( connection ) ;
27+ var enterpriseLogin = CreateLoginToHostViewModel < ILoginToGitHubForEnterpriseViewModel > ( ) ;
28+ var loginViewModel = new LoginCredentialsViewModel ( connectionManager , gitHubLogin , enterpriseLogin ) ;
29+ var signalled = false ;
3230
33- loginViewModel . Done . Subscribe ( _ => signalled = true ) ;
34- await gitHubLogin . Login . Execute ( ) ;
31+ loginViewModel . Done . Subscribe ( _ => signalled = true ) ;
32+ await gitHubLogin . Login . Execute ( ) ;
3533
36- Assert . True ( signalled ) ;
37- }
34+ Assert . True ( signalled ) ;
3835 }
3936
4037 [ Test ]
4138 public async Task FailedGitHubLoginDoesNotSignalDoneAsync ( )
4239 {
43- using ( TestUtils . WithScheduler ( Scheduler . CurrentThread ) )
44- {
45- var connectionManager = Substitute . For < IConnectionManager > ( ) ;
40+ var connectionManager = Substitute . For < IConnectionManager > ( ) ;
4641
47- var gitHubLogin = CreateLoginToHostViewModel < ILoginToGitHubViewModel > ( ) ;
48- var enterpriseLogin = CreateLoginToHostViewModel < ILoginToGitHubForEnterpriseViewModel > ( ) ;
49- var loginViewModel = new LoginCredentialsViewModel ( connectionManager , gitHubLogin , enterpriseLogin ) ;
50- var signalled = false ;
42+ var gitHubLogin = CreateLoginToHostViewModel < ILoginToGitHubViewModel > ( ) ;
43+ var enterpriseLogin = CreateLoginToHostViewModel < ILoginToGitHubForEnterpriseViewModel > ( ) ;
44+ var loginViewModel = new LoginCredentialsViewModel ( connectionManager , gitHubLogin , enterpriseLogin ) ;
45+ var signalled = false ;
5146
52- loginViewModel . Done . Subscribe ( _ => signalled = true ) ;
53- await gitHubLogin . Login . Execute ( ) ;
47+ loginViewModel . Done . Subscribe ( _ => signalled = true ) ;
48+ await gitHubLogin . Login . Execute ( ) ;
5449
55- Assert . False ( signalled ) ;
56- }
50+ Assert . False ( signalled ) ;
5751 }
5852
5953 [ Test ]
6054 public async Task AllowsLoginFromEnterpriseAfterGitHubLoginHasFailedAsync ( )
6155 {
62- using ( TestUtils . WithScheduler ( Scheduler . CurrentThread ) )
63- {
64- var connectionManager = Substitute . For < IConnectionManager > ( ) ;
65- var connection = Substitute . For < IConnection > ( ) ;
66-
67- var gitHubLogin = CreateLoginToHostViewModel < ILoginToGitHubViewModel > ( ) ;
68- var enterpriseLogin = CreateLoginToHostViewModel < ILoginToGitHubForEnterpriseViewModel > ( connection ) ;
69- var loginViewModel = new LoginCredentialsViewModel ( connectionManager , gitHubLogin , enterpriseLogin ) ;
70- var success = false ;
71-
72- loginViewModel . Done
73- . OfType < IConnection > ( )
74- . Where ( x => x != null )
75- . Subscribe ( _ => success = true ) ;
76-
77- await gitHubLogin . Login . Execute ( ) ;
78- await enterpriseLogin . Login . Execute ( ) ;
79-
80- Assert . True ( success ) ;
81- }
56+ var connectionManager = Substitute . For < IConnectionManager > ( ) ;
57+ var connection = Substitute . For < IConnection > ( ) ;
58+
59+ var gitHubLogin = CreateLoginToHostViewModel < ILoginToGitHubViewModel > ( ) ;
60+ var enterpriseLogin = CreateLoginToHostViewModel < ILoginToGitHubForEnterpriseViewModel > ( connection ) ;
61+ var loginViewModel = new LoginCredentialsViewModel ( connectionManager , gitHubLogin , enterpriseLogin ) ;
62+ var success = false ;
63+
64+ loginViewModel . Done
65+ . OfType < IConnection > ( )
66+ . Where ( x => x != null )
67+ . Subscribe ( _ => success = true ) ;
68+
69+ await gitHubLogin . Login . Execute ( ) ;
70+ await enterpriseLogin . Login . Execute ( ) ;
71+
72+ Assert . True ( success ) ;
8273 }
8374 }
8475
0 commit comments