8000 Master PR for refactoring connections by grokys · Pull Request #1277 · github/VisualStudio · GitHub
[go: up one dir, main page]

Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Master PR for refactoring connections #1277

Merged
merged 43 commits into from
Nov 21, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
b790d96
ILoginCache -> IKeychain
grokys Aug 25, 2017
1c81104
Use IKeychain for credentials.
grokys Aug 25, 2017
21f888e
Updated parameter name.
grokys Aug 25, 2017
7e061d1
Removed unneeded usings.
grokys Aug 25, 2017
c8b8dd7
Updated variable names.
grokys Aug 25, 2017
95f2c0b
Remove `IObservableKeychainAdapter`.
grokys Aug 25, 2017
7b4080f
Merge branch 'master' into fixes/1176-duplicate-login-classes
grokys Aug 30, 2017
3b13736
Store "master" credential.
grokys Aug 30, 2017
a142423
Merge branch 'master' into fixes/1176-duplicate-login-classes
grokys Sep 7, 2017
bcfbd79
Fix broken merge.
grokys Sep 7, 2017
c52a261
Merge branch 'fixes/1176-duplicate-login-classes' into fixes/harden-c…
grokys Sep 7, 2017
e6c5d89
Merge branch 'master' into fixes/1176-duplicate-login-classes
grokys Oct 20, 2017
17c845e
Merge branch 'fixes/1176-duplicate-login-classes' into fixes/harden-c…
grokys Oct 20, 2017
a627271
Merge branch 'master' into refactor/connections-master
grokys Oct 20, 2017
470ea13
Removed `IConnection.Repositories`.
grokys Oct 20, 2017
d98ec51
Refactored ConnectionManager/Connection.
grokys Oct 23, 2017
aa78f03
Refactored RepositoryHost(s).
grokys Oct 23, 2017
7cf89c9
Added DebuggerDisplay back in.
grokys Oct 23, 2017
213a7fc
Moved LocalRepositories to GitHub.VisualStudio.
grokys Oct 24, 2017
90c35c5
Track login metrics.
grokys Oct 26, 2017
9db05a7
Fix failing tests.
grokys Oct 26, 2017
f854b79
WIP: Removing RepositoryHost(s)
grokys Oct 26, 2017
3240372
WIP: Still removing RepositoryHost(s)
grokys Oct 26, 2017
038f232
WIP: Removing RepositoryHost(s) from tests.
grokys Oct 26, 2017
a57a759
Finished migrating tests (I think).
grokys Oct 27, 2017
95cd0b1
Added IModelServiceFactory implemenation.
grokys Oct 27, 2017
6034643
Added IGlobalConnection.
grokys Oct 27, 2017
17aebf8
Removed ConnectionManager.ConnectionCreated.
grokys Oct 27, 2017
00232f0
Merge branch 'master' into refactor/connections-master
grokys Nov 3, 2017
01aad33
Merge branch 'refactor/connections-master' into refactor/connections/…
grokys Nov 3, 2017
217e415
Merge branch 'refactor/connections/local-repositories' into refactor/…
grokys Nov 3, 2017
7e57621
Insert AccountCacheItem for connection.
grokys Nov 7, 2017
e45d0c6
Merge branch 'master' into refactor/connections-master
grokys Nov 7, 2017
8f6d218
Merge branch 'refactor/connections-master' into refactor/connections/…
grokys Nov 7, 2017
32f073a
Merge branch 'refactor/connections/local-repositories' into refactor/…
grokys Nov 7, 2017
9f15db6
Merge branch 'refactor/connection-manager' into refactor/connections/…
grokys Nov 7, 2017
cd546bb
Fix CA errors.
grokys Nov 7, 2017
def6070
Merge pull request #1283 from github/refactor/connections/remove-repo…
grokys Nov 8, 2017
fc57163
Merge branch 'master' into refactor/connections-master
grokys Nov 8, 2017
d9c2a2f
Removed empty file.
grokys Nov 8, 2017
cefd4b9
Merge branch 'master' into refactor/connections-master
grokys Nov 14, 2017
7d7b188
Merge branch 'master' into refactor/connections-master
grokys Nov 20, 2017
4701dd0
Merge branch 'master' into refactor/connections-master
grokys Nov 20, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Insert AccountCacheItem for connection.
When creating a `ModelService`, ensure that the correct `AccountCacheItem` is inserted.
  • Loading branch information
grokys committed Nov 7, 2017
commit 7e57621d56ec6489a38b4e11d3843ef4cf1d1e7c
3 changes: 3 additions & 0 deletions src/GitHub.App/Factories/ModelServiceFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.ComponentModel.Composition;
using System.Threading;
using System.Threading.Tasks;
using GitHub.Caches;
using GitHub.Models;
using GitHub.Services;
using Microsoft.VisualStudio.Shell;
Expand Down Expand Up @@ -44,6 +45,8 @@ public async Task<IModelService> CreateAsync(IConnection connection)
await apiClientFactory.Create(connection.HostAddress),
await hostCacheFactory.Create(connection.HostAddress),
avatarProvider);
result.InsertUser(AccountCacheItem.Create(connection.User));
cache.Add(connection, result);
}
}
finally
Expand Down
85 changes: 85 additions & 0 deletions src/UnitTests/GitHub.App/Factories/ModelServiceFactoryTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
using System;
using System.Threading.Tasks;
using GitHub.Caches;
using GitHub.Extensions;
using GitHub.Factories;
using GitHub.Models;
using GitHub.Primitives;
using GitHub.Services;
using NSubstitute;
using Xunit;

namespace UnitTests.GitHub.App.Factories
{
public class ModelServiceFactoryTests : TestBaseClass
{
public class TheCreateAsyncMethod
{
[Fact]
public async Task ShouldCreateDifferentModelServiceForDifferentHost()
{
var target = CreateTarget();
var instance1 = await target.CreateAsync(CreateConnection("https://github.com"));
var instance2 = await target.CreateAsync(CreateConnection("https://another.com"));

Assert.NotSame(instance1, instance2);
}

[Fact]
public async Task ShouldCreateDifferentModelServiceForDifferentConnectionsWithSameAddress()
{
var target = CreateTarget();
var instance1 = await target.CreateAsync(CreateConnection("https://github.com"));
var instance2 = await target.CreateAsync(CreateConnection("https://github.com"));

Assert.NotSame(instance1, instance2);
}

[Fact]
public async Task ShouldCacheModelServiceForHost()
{
var target = CreateTarget();
var connection = CreateConnection("https://github.com");
var instance1 = await target.CreateAsync(connection);
var instance2 = await target.CreateAsync(connection);

Assert.Same(instance1, instance2);
}

[Fact]
public async Task ShouldInsertUser()
{
var hostCacheFactory = Substitute.For<IHostCacheFactory>();
var target = CreateTarget(hostCacheFactory: hostCacheFactory);
var connection = CreateConnection("https://github.com");
var hostCache = await hostCacheFactory.Create(connection.HostAddress);
var modelService = await target.CreateAsync(connection);

hostCache.Received().Insert("GitHub.Caches.AccountCacheItem___user", Arg.Any<byte[]>());
}
}

static ModelServiceFactory CreateTarget(
IHostCacheFactory hostCacheFactory = null)
{
var apiClientFactory = Substitute.For<IApiClientFactory>();
var avatarProvider = Substitute.For<IAvatarProvider>();

hostCacheFactory = hostCacheFactory ?? Substitute.For<IHostCacheFactory>();

return new ModelServiceFactory(
apiClientFactory,
hostCacheFactory,
avatarProvider);
}

static IConnection CreateConnection(string address, string login = "user")
{
var result = Substitute.For<IConnection>();
var user = CreateOctokitUser(login, address);
result.HostAddress.Returns(HostAddress.Create(address));
result.User.Returns(user);
return result;
}
}
}
1 change: 1 addition & 0 deletions src/UnitTests/UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@
<Compile Include="GitHub.Api\SimpleApiClientTests.cs" />
<Compile Include="GitHub.App\Caches\ImageCacheTests.cs" />
<Compile Include="GitHub.App\Controllers\UIProviderTests.cs" />
<Compile Include="GitHub.App\Factories\ModelServiceFactoryTests.cs" />
<Compile Include="GitHub.App\Models\AccountModelTests.cs" />
<Compile Include="GitHub.App\Models\ModelServiceTests.cs" />
<Compile Include="GitHub.App\Controllers\UIControllerTests.cs" />
Expand Down
0