11using System ;
2+ using System . Collections . Generic ;
3+ using System . Threading . Tasks ;
24using GitCredentialManager . Authentication ;
35using GitCredentialManager . Tests . Objects ;
46using Moq ;
@@ -14,11 +16,11 @@ public void BasicAuthentication_GetCredentials_NullResource_ThrowsException()
1416 var context = new TestCommandContext ( ) ;
1517 var basicAuth = new BasicAuthentication ( context ) ;
1618
17- Assert . Throws < ArgumentNullException > ( ( ) => basicAuth . GetCredentials ( null ) ) ;
19+ Assert . ThrowsAsync < ArgumentNullException > ( ( ) => basicAuth . GetCredentialsAsync ( null ) ) ;
1820 }
1921
2022 [ Fact ]
21- public void BasicAuthentication_GetCredentials_NonDesktopSession_ResourceAndUserName_PasswordPromptReturnsCredentials ( )
23+ public async Task BasicAuthentication_GetCredentials_NonDesktopSession_ResourceAndUserName_PasswordPromptReturnsCredentials ( )
2224 {
2325 const string testResource = "https://example.com" ;
2426 const string testUserName = "john.doe" ;
@@ -29,14 +31,14 @@ public void BasicAuthentication_GetCredentials_NonDesktopSession_ResourceAndUser
2931
3032 var basicAuth = new BasicAuthentication ( context ) ;
3133
32- ICredential credential = basicAuth . GetCredentials ( testResource , testUserName ) ;
34+ ICredential credential = await basicAuth . GetCredentialsAsync ( testResource , testUserName ) ;
3335
3436 Assert . Equal ( testUserName , credential . Account ) ;
3537 Assert . Equal ( testPassword , credential . Password ) ;
3638 }
3739
3840 [ Fact ]
39- public void BasicAuthentication_GetCredentials_NonDesktopSession_Resource_UserPassPromptReturnsCredentials ( )
41+ public async Task BasicAuthentication_GetCredentials_NonDesktopSession_Resource_UserPassPromptReturnsCredentials ( )
4042 {
4143 const string testResource = "https://example.com" ;
4244 const string testUserName = "john.doe" ;
@@ -48,7 +50,7 @@ public void BasicAuthentication_GetCredentials_NonDesktopSession_Resource_UserPa
4850
4951 var basicAuth = new BasicAuthentication ( context ) ;
5052
51- ICredential credential = basicAuth . GetCredentials ( testResource ) ;
53+ ICredential credential = await basicAuth . GetCredentialsAsync ( testResource ) ;
5254
5355 Assert . Equal ( testUserName , credential . Account ) ;
5456 Assert . Equal ( testPassword , credential . Password ) ;
@@ -67,100 +69,78 @@ public void BasicAuthentication_GetCredentials_NonDesktopSession_NoTerminalPromp
6769
6870 var basicAuth = new BasicAuthentication ( context ) ;
6971
70- Assert . Throws < InvalidOperationException > ( ( ) => basicAuth . GetCredentials ( testResource ) ) ;
72+ Assert . ThrowsAsync < InvalidOperationException > ( ( ) => basicAuth . GetCredentialsAsync ( testResource ) ) ;
7173 }
7274
73- [ PlatformFact ( Platforms . Windows ) ]
74- public void BasicAuthentication_GetCredentials_DesktopSession_Resource_UserPassPromptReturnsCredentials ( )
75+ [ Fact ]
76+ public async Task BasicAuthentication_GetCredentials_DesktopSession_CallsHelper ( )
7577 {
7678 const string testResource = "https://example.com" ;
7779 const string testUserName = "john.doe" ;
7880 const string testPassword = "letmein123" ; // [SuppressMessage("Microsoft.Security", "CS001:SecretInline", Justification="Fake credential")]
7981
8082 var context = new TestCommandContext
8183 {
82- SessionManager = { IsDesktopSession = true } ,
83- SystemPrompts =
84- {
85- CredentialPrompt = ( resource , userName ) =>
86- {
87- Assert . Equal ( testResource , resource ) ;
88- Assert . Null ( userName ) ;
89-
90- return new GitCredential ( testUserName , testPassword ) ;
91- }
92- }
84+ SessionManager = { IsDesktopSession = true }
9385 } ;
9486
95- var basicAuth = new BasicAuthentication ( context ) ;
96-
97- ICredential credential = basicAuth . GetCredentials ( testResource ) ;
98-
99- Assert . NotNull ( credential ) ;
100- Assert . Equal ( testUserName , credential . Account ) ;
101- Assert . Equal ( testPassword , credential . Password ) ;
102- }
103-
104- [ PlatformFact ( Platforms . Windows ) ]
105- public void BasicAuthentication_GetCredentials_DesktopSession_ResourceAndUser_PassPromptReturnsCredentials ( )
106- {
107- const string testResource = "https://example.com" ;
108- const string testUserName = "john.doe" ;
109- const string testPassword = "letmein123" ; // [SuppressMessage("Microsoft.Security", "CS001:SecretInline", Justification="Fake credential")]
110-
111- var context = new TestCommandContext
112- {
113- SessionManager = { IsDesktopSession = true } ,
114- SystemPrompts =
115- {
116- CredentialPrompt = ( resource , userName ) =>
87+ context . FileSystem . Files [ "/usr/local/bin/git-credential-manager-ui" ] = new byte [ 0 ] ;
88+ context . FileSystem . Files [ @"C:\Program Files\Git Credential Manager Core\git-credential-manager-ui.exe" ] = new byte [ 0 ] ;
89+
90+ var auth = new Mock < BasicAuthentication > ( MockBehavior . Strict , context ) ;
91+ auth . Setup ( x => x . InvokeHelperAsync (
92+ It . IsAny < string > ( ) ,
93+ $ "basic --resource { testResource } ",
94+ It . IsAny < IDictionary < string , string > > ( ) ,
95+ It . IsAny < System . Threading . CancellationToken > ( ) ) )
96+ . ReturnsAsync (
97+ new Dictionary < string , string >
11798 {
118- Assert . Equal ( testResource , resource ) ;
119- Assert . Equal ( testUserName , userName ) ;
120-
121- return new GitCredential ( testUserName , testPassword ) ;
99+ [ "username" ] = testUserName ,
100+ [ "password" ] = testPassword
122101 }
123- }
124- } ;
125-
126- var basicAuth = new BasicAuthentication ( context ) ;
102+ ) ;
127103
128- ICredential credential = basicAuth . GetCredentials ( testResource , testUserName ) ;
104+ ICredential credential = await auth . Object . GetCredentialsAsync ( testResource ) ;
129105
130106 Assert . NotNull ( credential ) ;
131107 Assert . Equal ( testUserName , credential . Account ) ;
132108 Assert . Equal ( testPassword , credential . Password ) ;
133109 }
134110
135- [ PlatformFact ( Platforms . Windows ) ]
136- public void BasicAuthentication_GetCredentials_DesktopSession_ResourceAndUser_PassPromptDiffUserReturnsCredentials ( )
111+ [ Fact ]
112+ public async Task BasicAuthentication_GetCredentials_DesktopSession_UserName_CallsHelper ( )
137113 {
138114 const string testResource = "https://example.com" ;
139115 const string testUserName = "john.doe" ;
140- const string newUserName = "jane.doe" ;
141116 const string testPassword = "letmein123" ; // [SuppressMessage("Microsoft.Security", "CS001:SecretInline", Justification="Fake credential")]
142117
143118 var context = new TestCommandContext
144119 {
145- SessionManager = { IsDesktopSession = true } ,
146- SystemPrompts =
147- {
148- CredentialPrompt = ( resource , userName ) =>
149- {
150- Assert . Equal ( testResource , resource ) ;
151- Assert . Equal ( testUserName , userName ) ;
152-
153- return new GitCredential ( newUserName , testPassword ) ;
154- }
155- }
120+ SessionManager = { IsDesktopSession = true }
156121 } ;
157122
158- var basicAuth = new BasicAuthentication ( context ) ;
123+ context . FileSystem . Files [ "/usr/local/bin/git-credential-manager-ui" ] = new byte [ 0 ] ;
124+ context . FileSystem . Files [ @"C:\Program Files\Git Credential Manager Core\git-credential-manager-ui.exe" ] = new byte [ 0 ] ;
125+
126+ var auth = new Mock < BasicAuthentication > ( MockBehavior . Strict , context ) ;
127+ auth . Setup ( x => x . InvokeHelperAsync (
128+ It . IsAny < string > ( ) ,
129+ $ "basic --resource { testResource } --username { testUserName } ",
130+ It . IsAny < IDictionary < string , string > > ( ) ,
131+ It . IsAny < System . Threading . CancellationToken > ( ) ) )
132+ . ReturnsAsync (
133+ new Dictionary < string , string >
134+ {
135+ [ "username" ] = testUserName ,
136+ [ "password" ] = testPassword
137+ }
138+ ) ;
159139
160- ICredential credential = basicAuth . GetCredentials ( testResource , testUserName ) ;
140+ ICredential credential = await auth . Object . GetCredentialsAsync ( testResource , testUserName ) ;
161141
162142 Assert . NotNull ( credential ) ;
163- Assert . Equal ( newUserName , credential . Account ) ;
143+ Assert . Equal ( testUserName , credential . Account ) ;
164144 Assert . Equal ( testPassword , credential . Password ) ;
165145 }
166146 }
0 commit comments