jakubgarfield · Pireax · Jun 17, 2019
diff --git a/.gitignore b/.gitignore
@@ -128,6 +128,7 @@ publish/
 *.azurePubxml
 *.pubxml
 *.pubxml.user
+!Release.pubxml
 
 # NuGet Packages Directory
 ## TODO: If you have NuGet Package Restore enabled, uncomment the next line

diff --git a/Bonobo.Git.Server.Test/Bonobo.Git.Server.Test.csproj b/Bonobo.Git.Server.Test/Bonobo.Git.Server.Test.csproj
diff --git a/Bonobo.Git.Server.Test/MembershipTests/ADTests/ADBackendStoreTest.cs b/Bonobo.Git.Server.Test/MembershipTests/ADTests/ADBackendStoreTest.cs
@@ -2,7 +2,9 @@
 using System.IO;
 using System.Linq;
 using Bonobo.Git.Server.Data;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NSubstitute;
 
 namespace Bonobo.Git.Server.Test.MembershipTests.ADTests
 {
@@ -42,7 +44,8 @@ private void SafelyDeleteTestData()
 
         private static ADBackendStore<StorableClass> MakeStore()
         {
-            return new ADBackendStore<StorableClass>(Path.GetTempPath(), "BonoboTestStore");
+            var hostingEnvironment = Substitute.For<IHostingEnvironment>();
+            return new ADBackendStore<StorableClass>(hostingEnvironment, Path.GetTempPath(), "BonoboTestStore");
         }
 
         [TestMethod]

diff --git a/Bonobo.Git.Server.Test/MembershipTests/ADTests/ADPermissionServiceTest.cs b/Bonobo.Git.Server.Test/MembershipTests/ADTests/ADPermissionServiceTest.cs
@@ -31,10 +31,7 @@ private void InitialiseTestObjects()
             _users = new ADMembershipServiceTestFacade(new ADMembershipService(), _testSupport);
             _repos = new ADRepositoryRepository();
 
-            _service = new RepositoryPermissionService
-            {
-                Repository = _repos, RoleProvider = _roles, TeamRepository = _teams
-            };
+            _service = new RepositoryPermissionService(_repos, _roles, _teams);
         }
 
         protected override TeamModel CreateTeam()

diff --git a/Bonobo.Git.Server.Test/MembershipTests/EFTests/EFMembershipServiceTest.cs b/Bonobo.Git.Server.Test/MembershipTests/EFTests/EFMembershipServiceTest.cs
@@ -5,6 +5,7 @@
 using Bonobo.Git.Server.Data.Update;
 using Bonobo.Git.Server.Security;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NSubstitute;
 
 namespace Bonobo.Git.Server.Test.MembershipTests.EFTests
 {
@@ -19,7 +20,7 @@ public abstract class EFMembershipServiceTest : MembershipServiceTestBase
         public void UpdatesCanBeRunOnAlreadyUpdatedDatabase()
         {
             // Run all the updates again - this should be completely harmless
-            new AutomaticUpdater().RunWithContext(GetContext());
+            new AutomaticUpdater().RunWithContext(GetContext(), Substitute.For<IAuthenticationProvider>());
         }
 
         [TestMethod]
@@ -123,8 +124,8 @@ private BonoboGitServerContext GetContext()
 
         protected void InitialiseTestObjects()
         {
-            _service = new EFMembershipService {CreateContext = GetContext};
-            new AutomaticUpdater().RunWithContext(GetContext());
+            _service = new EFMembershipService(GetContext);
+            new AutomaticUpdater().RunWithContext(GetContext(), Substitute.For<IAuthenticationProvider>());
         }
     }
 }
diff --git a/Bonobo.Git.Server.Test/MembershipTests/EFTests/EFPermissionServiceTest.cs b/Bonobo.Git.Server.Test/MembershipTests/EFTests/EFPermissionServiceTest.cs
@@ -3,6 +3,7 @@
 using Bonobo.Git.Server.Models;
 using Bonobo.Git.Server.Security;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NSubstitute;
 
 namespace Bonobo.Git.Server.Test.MembershipTests.EFTests
 {
@@ -44,19 +45,14 @@ public abstract class EFPermissionServiceTest : PermissionServiceTestBase
 
         protected void InitialiseTestObjects()
         {
-            _teams = new EFTeamRepository { CreateContext = () => _connection.GetContext() };
-            _users = new EFMembershipService { CreateContext = () => _connection.GetContext() };
-            _repos = new EFRepositoryRepository { CreateContext = () => _connection.GetContext() };
-            _roles = new EFRoleProvider { CreateContext = () => _connection.GetContext() };
+            _teams = new EFTeamRepository(() => _connection.GetContext());
+            _users = new EFMembershipService(() => _connection.GetContext());
+            _repos = new EFRepositoryRepository(() => _connection.GetContext());
+            _roles = new EFRoleProvider(() => _connection.GetContext() );
 
-            _service = new RepositoryPermissionService
-            {
-                Repository = _repos,
-                TeamRepository = _teams,
-                RoleProvider = _roles
-            };
+            _service = new RepositoryPermissionService(_repos, _roles, _teams);
 
-            new AutomaticUpdater().RunWithContext(_connection.GetContext());
+            new AutomaticUpdater().RunWithContext(_connection.GetContext(), Substitute.For<IAuthenticationProvider>());
         }
 
         protected override TeamModel CreateTeam()

diff --git a/Bonobo.Git.Server.Test/MembershipTests/EFTests/EFRepositoryRepositoryTest.cs b/Bonobo.Git.Server.Test/MembershipTests/EFTests/EFRepositoryRepositoryTest.cs
@@ -3,6 +3,7 @@
 using Bonobo.Git.Server.Models;
 using Bonobo.Git.Server.Security;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NSubstitute;
 
 namespace Bonobo.Git.Server.Test.MembershipTests.EFTests
 {
@@ -44,14 +45,14 @@ public abstract class EFRepositoryRepositoryTest : RepositoryRepositoryTestBase
 
         protected override UserModel AddUserFred()
         {
-            IMembershipService memberService = new EFMembershipService { CreateContext = GetContext };
+            IMembershipService memberService = new EFMembershipService(GetContext);
             memberService.CreateUser("fred", "letmein", "Fred", "Blogs", "fred@aol");
             return memberService.GetUserModel("fred");
         }
 
         protected override TeamModel AddTeam()
         {
-            EFTeamRepository teams = new EFTeamRepository { CreateContext = GetContext };
+            EFTeamRepository teams = new EFTeamRepository(GetContext);
             var newTeam = new TeamModel { Name="Team1" };
             teams.Create(newTeam);
             return newTeam;
@@ -64,8 +65,8 @@ BonoboGitServerContext GetContext()
 
         protected void InitialiseTestObjects()
         {
-            _repo = new EFRepositoryRepository {CreateContext = () => _connection.GetContext()};
-            new AutomaticUpdater().RunWithContext(_connection.GetContext());
+            _repo = new EFRepositoryRepository(() => _connection.GetContext());
+            new AutomaticUpdater().RunWithContext(_connection.GetContext(), Substitute.For<IAuthenticationProvider>());
         }
     }
 }
diff --git a/Bonobo.Git.Server.Test/MembershipTests/EFTests/EFRoleProviderTest.cs b/Bonobo.Git.Server.Test/MembershipTests/EFTests/EFRoleProviderTest.cs
@@ -4,6 +4,7 @@
 using Bonobo.Git.Server.Data.Update;
 using Bonobo.Git.Server.Security;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NSubstitute;
 
 namespace Bonobo.Git.Server.Test.MembershipTests.EFTests
 {
@@ -48,7 +49,7 @@ public abstract class EFRoleProviderTest
         public void UpdatesCanBeRunOnAlreadyUpdatedDatabase()
         {
             // Run all the updates again - this should be completely harmless
-            new AutomaticUpdater().RunWithContext(GetContext());
+            new AutomaticUpdater().RunWithContext(GetContext(), Substitute.For<IAuthenticationProvider>());
         }
 
         [TestMethod]
@@ -148,14 +149,14 @@ public void TestRoleCanBeDeletedWhilePopulatedIfAllowed()
 
         Guid AddUserFred()
         {
-            EFMembershipService memberService = new EFMembershipService { CreateContext = GetContext };
+            EFMembershipService memberService = new EFMembershipService(GetContext);
             memberService.CreateUser("fred", "letmein", "Fred", "FredBlogs", "fred@aol");
             return memberService.GetUserModel("fred").Id;
         }
 
         Guid GetAdminId()
         {
-            EFMembershipService memberService = new EFMembershipService { CreateContext = GetContext };
+            EFMembershipService memberService = new EFMembershipService(GetContext);
             return memberService.GetUserModel("Admin").Id;
         }
 
@@ -166,8 +167,8 @@ private BonoboGitServerContext GetContext()
 
         protected void InitialiseTestObjects()
         {
-            _provider = new EFRoleProvider {CreateContext = () => _connection.GetContext()};
-            new AutomaticUpdater().RunWithContext(_connection.GetContext());
+            _provider = new EFRoleProvider(() => _connection.GetContext());
+            new AutomaticUpdater().RunWithContext(_connection.GetContext(), Substitute.For<IAuthenticationProvider>());
         }
     }
 }
diff --git a/Bonobo.Git.Server.Test/MembershipTests/EFTests/EFTeamRepositoryTests.cs b/Bonobo.Git.Server.Test/MembershipTests/EFTests/EFTeamRepositoryTests.cs
@@ -6,6 +6,7 @@
 using Bonobo.Git.Server.Models;
 using Bonobo.Git.Server.Security;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NSubstitute;
 
 namespace Bonobo.Git.Server.Test.MembershipTests.EFTests
 {
@@ -49,9 +50,9 @@ public abstract class EFTeamRepositoryTests : TeamRepositoryTestsBase
 
         protected void InitialiseTestObjects()
         {
-            _repo = new EFTeamRepository {CreateContext = () => _connection.GetContext()};
-            _membershipService = new EFMembershipService { CreateContext = () => _connection.GetContext() };
-            new AutomaticUpdater().RunWithContext(_connection.GetContext());
+            _repo = new EFTeamRepository(() => _connection.GetContext());
+            _membershipService = new EFMembershipService(() => _connection.GetContext());
+            new AutomaticUpdater().RunWithContext(_connection.GetContext(), Substitute.For<IAuthenticationProvider>());
         }
 
         protected override bool CreateTeam(TeamModel team)

diff --git a/Bonobo.Git.Server.Test/MembershipTests/EFTests/SqlServerTestConnection.cs b/Bonobo.Git.Server.Test/MembershipTests/EFTests/SqlServerTestConnection.cs
@@ -2,12 +2,13 @@
 using System.Data.SqlClient;
 using System.IO;
 using Bonobo.Git.Server.Data;
+using Microsoft.EntityFrameworkCore;
 
 namespace Bonobo.Git.Server.Test.MembershipTests.EFTests
 {
     class SqlServerTestConnection : IDatabaseTestConnection
     {
-        readonly SqlConnection _connection;
+        readonly DbContextOptionsBuilder<BonoboGitServerContext> _optionsBuilder;
         private readonly string _databaseName;
         private static readonly string _instanceName;
 
@@ -52,13 +53,15 @@ public SqlServerTestConnection()
 
             Console.WriteLine("Created test database: " + fileName);
 
-            _connection = new SqlConnection(String.Format(@"Data Source=(LocalDB)\{0};Integrated Security=True;AttachDbFilename={1};Initial Catalog={2}", _instanceName, fileName, _databaseName));
-            _connection.Open();
+            _optionsBuilder = new DbContextOptionsBuilder<BonoboGitServerContext>();
+            _optionsBuilder.UseSqlServer(string.Format(
+                @"Data Source=(LocalDB)\{0};Integrated Security=True;AttachDbFilename={1};Initial Catalog={2}",
+                _instanceName, fileName, _databaseName));
         }
 
         public BonoboGitServerContext GetContext()
         {
-            return BonoboGitServerContext.FromDatabase(_connection);
+            return new BonoboGitServerContext(_optionsBuilder.Options);
         }
 
         void CreateDB(string fileName)
@@ -96,7 +99,6 @@ private void Exec(SqlConnection connection, string commandText)
 
         public void Dispose()
         {
-            _connection.Dispose();
             SqlConnection.ClearAllPools();
             TryToDeleteDatabaseFiles();
         }

diff --git a/Bonobo.Git.Server.Test/MembershipTests/EFTests/SqliteTestConnection.cs b/Bonobo.Git.Server.Test/MembershipTests/EFTests/SqliteTestConnection.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Data.Common;
 using Bonobo.Git.Server.Data;
+using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
 
 namespace Bonobo.Git.Server.Test.MembershipTests.EFTests
 {
@@ -11,18 +13,20 @@ public interface IDatabaseTestConnection : IDisposable
 
     class SqliteTestConnection : IDatabaseTestConnection
     {
-        readonly DbConnection _connection;
+        private readonly DbConnection _connection;
 
         public SqliteTestConnection()
         {
-            _connection = DbProviderFactories.GetFactory("System.Data.SQLite").CreateConnection();
-            _connection.ConnectionString = "Data Source =:memory:;BinaryGUID=False";
+            _connection = SqliteFactory.Instance.CreateConnection();
+            _connection.ConnectionString = "Data Source =:memory:";
             _connection.Open();
         }
 
         public BonoboGitServerContext GetContext()
         {
-            return BonoboGitServerContext.FromDatabase(_connection);
+            var optionsBuilder = new DbContextOptionsBuilder<BonoboGitServerContext>();
+            optionsBuilder.UseSqlite(_connection);
+            return new BonoboGitServerContext(optionsBuilder.Options);
         }
 
         public void Dispose()

diff --git a/Bonobo.Git.Server.Test/Properties/AssemblyInfo.cs b/Bonobo.Git.Server.Test/Properties/AssemblyInfo.cs
diff --git a/Bonobo.Git.Server.Test/TestCategories.cs b/Bonobo.Git.Server.Test/TestCategories.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Bonobo.Git.Server.Test
 {
     public static class TestCategories
@@ -19,4 +13,4 @@ public static class TestCategories
         public const string AuthWindows = "AuthWindowsAuth";
         public const string AuthADFS = "AuthADFS";
     }
-}
+}
diff --git a/Bonobo.Git.Server.Test/UnitTests/CustomHtmlHelperTest.cs b/Bonobo.Git.Server.Test/UnitTests/CustomHtmlHelperTest.cs
@@ -1,15 +1,14 @@
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
-using Bonobo.Git.Server.Data;
 using Bonobo.Git.Server.Helpers;
+using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Bonobo.Git.Server.Test.UnitTests
 {
     [TestClass]
     public class CustomHtmlHelperTest
     {
-        readonly HtmlHelper Html = new HtmlHelper(new ViewContext(), new ViewPage());
+        private readonly IHtmlHelper Html;
 
         [TestMethod]
         public void EnumsWithDisplayAttributesAreFormatted()

diff --git a/Bonobo.Git.Server.Test/UnitTests/DatabaseUpdateTestsSqlServer.cs b/Bonobo.Git.Server.Test/UnitTests/DatabaseUpdateTestsSqlServer.cs
@@ -3,6 +3,7 @@
 using Bonobo.Git.Server.Test.MembershipTests.EFTests;
 using Bonobo.Git.Server.Data.Update;
 using Bonobo.Git.Server.Data;
+using Microsoft.EntityFrameworkCore;
 
 namespace Bonobo.Git.Server.Test.UnitTests
 {

diff --git a/Bonobo.Git.Server.Test/UnitTests/DatabaseUpdateTestsSqlite.cs b/Bonobo.Git.Server.Test/UnitTests/DatabaseUpdateTestsSqlite.cs
@@ -3,6 +3,9 @@
 using Bonobo.Git.Server.Test.MembershipTests.EFTests;
 using Bonobo.Git.Server.Data.Update;
 using Bonobo.Git.Server.Data;
+using Bonobo.Git.Server.Security;
+using Microsoft.EntityFrameworkCore;
+using NSubstitute;
 
 namespace Bonobo.Git.Server.Test.UnitTests
 {
@@ -91,7 +94,7 @@ Foreign Key ([Team_Name]) References [Team]([Name])
                     );
 
                     ");
-            new AutomaticUpdater().RunWithContext(_connection.GetContext());
+            new AutomaticUpdater().RunWithContext(_connection.GetContext(), Substitute.For<IAuthenticationProvider>());
         }
 
         [TestMethod]

diff --git a/Bonobo.Git.Server.Test/UnitTests/GitAuthorizeAttributeTest.cs b/Bonobo.Git.Server.Test/UnitTests/GitAuthorizeAttributeTest.cs
@@ -10,9 +10,9 @@ public class GitAuthorizeAttributeTest
         [TestMethod]
         public void GetRepoPathTest()
         {
-            var repo = GitAuthorizeAttribute.GetRepoPath("/other/test.git/info/refs", "/other");
+            var repo = GitAuthorizationHandler.GetRepoPath("/other/test.git/info/refs", "/other");
             Assert.AreEqual("test", repo);
-            repo = GitAuthorizeAttribute.GetRepoPath("/test.git/info/refs", "/");
+            repo = GitAuthorizationHandler.GetRepoPath("/test.git/info/refs", "/");
             Assert.AreEqual("test", repo);
         }
     }