Set the dummy user in the local configuration

carlosmn · carlosmn · commit f67f385b01b6 · 2016-03-08T09:26:09.000+01:00
We set a dummy user name and email in the global configuration through
the options. Move away from this obsoleted method and set the
configuration at the repo level, which is where a test-specific
configuration should live.
diff --git a/LibGit2Sharp.Tests/CommitFixture.cs b/LibGit2Sharp.Tests/CommitFixture.cs
@@ -542,11 +542,10 @@ public void DirectlyAccessingAnUnknownTreeEntryOfTheCommitReturnsNull()
         public void CanCommitWithSignatureFromConfig()
         {
             string repoPath = InitNewRepository();
-            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
-            var options = new RepositoryOptions { GlobalConfigurationLocation = configPath };
 
-            using (var repo = new Repository(repoPath, options))
+            using (var repo = new Repository(repoPath))
             {
+                CreateConfigurationWithDummyUser(repo, Constants.Identity);
                 string dir = repo.Info.Path;
                 Assert.True(Path.IsPathRooted(dir));
                 Assert.True(Directory.Exists(dir));
diff --git a/LibGit2Sharp.Tests/ConfigurationFixture.cs b/LibGit2Sharp.Tests/ConfigurationFixture.cs
@@ -139,12 +139,10 @@ public void CanReadStringValue()
         [Fact]
         public void CanEnumerateGlobalConfig()
         {
-            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
-            var options = new RepositoryOptions { GlobalConfigurationLocation = configPath };
-
             var path = SandboxStandardTestRepoGitDir();
-            using (var repo = new Repository(path, options))
+            using (var repo = new Repository(path))
             {
+                CreateConfigurationWithDummyUser(repo, Constants.Identity);
                 var entry = repo.Config.FirstOrDefault<ConfigurationEntry<string>>(e => e.Key == "user.name");
                 Assert.NotNull(entry);
                 Assert.Equal(Constants.Signature.Name, entry.Value);
@@ -196,16 +194,14 @@ public void CanFindInLocalConfig()
         [Fact]
         public void CanFindInGlobalConfig()
         {
-            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
-            var options = new RepositoryOptions { GlobalConfigurationLocation = configPath };
 
             var path = SandboxStandardTestRepoGitDir();
-            using (var repo = new Repository(path, options))
+            using (var repo = new Repository(path))
             {
-                var matches = repo.Config.Find(@"\.name", ConfigurationLevel.Global);
+                var matches = repo.Config.Find("-rocks", ConfigurationLevel.Global);
 
                 Assert.NotNull(matches);
-                Assert.Equal(new[] { "user.name" },
+                Assert.Equal(new[] { "woot.this-rocks" },
                              matches.Select(m => m.Key).ToArray());
             }
         }
@@ -375,16 +371,14 @@ public void CanAccessConfigurationWithoutARepository(Func<string, string> localC
         {
             var path = SandboxStandardTestRepoGitDir();
 
-            string globalConfigPath = CreateConfigurationWithDummyUser(Constants.Identity);
-            var options = new RepositoryOptions { GlobalConfigurationLocation = globalConfigPath };
-
-            using (var repo = new Repository(path, options))
+            using (var repo = new Repository(path))
             {
                 repo.Config.Set("my.key", "local");
                 repo.Config.Set("my.key", "mouse", ConfigurationLevel.Global);
             }
 
-            using (var config = Configuration.BuildFrom(localConfigurationPathProvider(path), globalConfigPath))
+            var globalPath = Path.Combine(GlobalSettings.GetConfigSearchPaths(ConfigurationLevel.Global).Single(), ".gitconfig");
+            using (var config = Configuration.BuildFrom(localConfigurationPathProvider(path), globalPath))
             {
                 Assert.Equal("local", config.Get<string>("my.key").Value);
                 Assert.Equal("mouse", config.Get<string>("my.key", ConfigurationLevel.Global).Value);
@@ -406,11 +400,10 @@ public void PassingANonExistingLocalConfigurationFileToBuildFromthrowss()
         public void CannotBuildAProperSignatureFromConfigWhenFullIdentityCannotBeFoundInTheConfig(string name, string email)
         {
             string repoPath = InitNewRepository();
-            string configPath = CreateConfigurationWithDummyUser(name, email);
-            var options = new RepositoryOptions { GlobalConfigurationLocation = configPath };
 
-            using (var repo = new Repository(repoPath, options))
+            using (var repo = new Repository(repoPath))
             {
+                CreateConfigurationWithDummyUser(repo, name, email);
                 Assert.Equal(name, repo.Config.GetValueOrDefault<string>("user.name"));
                 Assert.Equal(email, repo.Config.GetValueOrDefault<string>("user.email"));
 
diff --git a/LibGit2Sharp.Tests/FilterFixture.cs b/LibGit2Sharp.Tests/FilterFixture.cs
@@ -276,11 +276,9 @@ public void CanFilterLargeFiles()
                 string attributesPath = Path.Combine(Directory.GetParent(repoPath).Parent.FullName, ".gitattributes");
                 FileInfo attributesFile = new FileInfo(attributesPath);
 
-                string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
-                var repositoryOptions = new RepositoryOptions { GlobalConfigurationLocation = configPath };
-
-                using (Repository repo = new Repository(repoPath, repositoryOptions))
+                using (Repository repo = new Repository(repoPath))
                 {
+                    CreateConfigurationWithDummyUser(repo, Constants.Identity);
                     File.WriteAllText(attributesPath, "*.blob filter=test");
                     repo.Stage(attributesFile.Name);
                     repo.Stage(contentFile.Name);
@@ -421,9 +419,8 @@ private static FileInfo StageNewFile(IRepository repo, string contents = "null")
 
         private Repository CreateTestRepository(string path)
         {
-            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
-            var repositoryOptions = new RepositoryOptions { GlobalConfigurationLocation = configPath };
-            var repository = new Repository(path, repositoryOptions);
+            var repository = new Repository(path);
+            CreateConfigurationWithDummyUser(repository, Constants.Identity);
             CreateAttributesFile(repository, "* filter=test");
             return repository;
         }
diff --git a/LibGit2Sharp.Tests/FilterSubstitutionCipherFixture.cs b/LibGit2Sharp.Tests/FilterSubstitutionCipherFixture.cs
@@ -21,10 +21,9 @@ public void SmugdeIsNotCalledForFileWhichDoesNotMatchAnAttributeEntry()
 
             string repoPath = InitNewRepository();
             string fileName = Guid.NewGuid() + ".rot13";
-            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
-            var repositoryOptions = new RepositoryOptions { GlobalConfigurationLocation = configPath };
-            using (var repo = new Repository(repoPath, repositoryOptions))
+            using (var repo = new Repository(repoPath))
             {
+                CreateConfigurationWithDummyUser(repo, Constants.Identity);
                 CreateAttributesFile(repo, "*.rot13 filter=rot13");
 
                 var blob = CommitOnBranchAndReturnDatabaseBlob(repo, fileName, decodedInput);
@@ -61,10 +60,9 @@ public void CorrectlyEncodesAndDecodesInput()
 
             string repoPath = InitNewRepository();
             string fileName = Guid.NewGuid() + ".rot13";
-            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
-            var repositoryOptions = new RepositoryOptions { GlobalConfigurationLocation = configPath };
-            using (var repo = new Repository(repoPath, repositoryOptions))
+            using (var repo = new Repository(repoPath))
             {
+                CreateConfigurationWithDummyUser(repo, Constants.Identity);
                 CreateAttributesFile(repo, "*.rot13 filter=rot13");
 
                 var blob = CommitOnBranchAndReturnDatabaseBlob(repo, fileName, decodedInput);
@@ -106,10 +104,9 @@ public void WhenStagedFileDoesNotMatchPathSpecFileIsNotFiltered(string pathSpec,
             string repoPath = InitNewRepository();
             string fileName = Guid.NewGuid() + fileExtension;
 
-            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
-            var repositoryOptions = new RepositoryOptions { GlobalConfigurationLocation = configPath };
-            using (var repo = new Repository(repoPath, repositoryOptions))
+            using (var repo = new Repository(repoPath))
             {
+                CreateConfigurationWithDummyUser(repo, Constants.Identity);
                 CreateAttributesFile(repo, attributeFileEntry);
 
                 CommitOnBranchAndReturnDatabaseBlob(repo, fileName, decodedInput);
@@ -141,10 +138,9 @@ public void CleanIsCalledIfAttributeEntryMatches(string filterAttribute, string
             string repoPath = InitNewRepository();
             string fileName = Guid.NewGuid() + ".txt";
 
-            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
-            var repositoryOptions = new RepositoryOptions { GlobalConfigurationLocation = configPath };
-            using (var repo = new Repository(repoPath, repositoryOptions))
+            using (var repo = new Repository(repoPath))
             {
+                CreateConfigurationWithDummyUser(repo, Constants.Identity);
                 CreateAttributesFile(repo, attributeEntry);
 
                 CommitOnBranchAndReturnDatabaseBlob(repo, fileName, decodedInput);
@@ -172,10 +168,9 @@ public void SmudgeIsCalledIfAttributeEntryMatches(string filterAttribute, string
             string repoPath = InitNewRepository();
             string fileName = Guid.NewGuid() + ".txt";
 
-            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
-            var repositoryOptions = new RepositoryOptions { GlobalConfigurationLocation = configPath };
-            using (var repo = new Repository(repoPath, repositoryOptions))
+            using (var repo = new Repository(repoPath))
             {
+                CreateConfigurationWithDummyUser(repo, Constants.Identity);
                 CreateAttributesFile(repo, attributeEntry);
 
                 CommitOnBranchAndReturnDatabaseBlob(repo, fileName, decodedInput);
diff --git a/LibGit2Sharp.Tests/NoteFixture.cs b/LibGit2Sharp.Tests/NoteFixture.cs
@@ -168,12 +168,11 @@ public void CreatingANoteWhichAlreadyExistsOverwritesThePreviousNote()
         [Fact]
         public void CanAddANoteWithSignatureFromConfig()
         {
-            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
-            var options = new RepositoryOptions { GlobalConfigurationLocation = configPath };
             string path = SandboxBareTestRepo();
 
-            using (var repo = new Repository(path, options))
+            using (var repo = new Repository(path))
             {
+                CreateConfigurationWithDummyUser(repo, Constants.Identity);
                 var commit = repo.Lookup<Commit>("9fd738e8f7967c078dceed8190330fc8648ee56a");
 
                 Signature signature = repo.Config.BuildSignature(DateTimeOffset.Now);
@@ -268,12 +267,11 @@ public void RemovingANonExistingNoteDoesntThrow()
         [Fact]
         public void CanRemoveANoteWithSignatureFromConfig()
         {
-            string configPath = CreateConfigurationWithDummyUser(Constants.Identity);
-            RepositoryOptions options = new RepositoryOptions() { GlobalConfigurationLocation = configPath };
             string path = SandboxBareTestRepo();
 
-            using (var repo = new Repository(path, options))
+            using (var repo = new Repository(path))
             {
+                CreateConfigurationWithDummyUser(repo, Constants.Identity);
                 var commit = repo.Lookup<Commit>("8496071c1b46c854b31185ea97743be6a8774479");
                 var notes = repo.Notes[commit.Id];
 
diff --git a/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs b/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs
@@ -335,18 +335,14 @@ private static void BuildFakeRepositoryOptions(SelfCleaningDirectory scd, out st
         /// <remarks>The configuration file will be removed automatically when the tests are finished</remarks>
         /// <param name="identity">The identity to use for user.name and user.email</param>
         /// <returns>The path to the configuration file</returns>
-        protected string CreateConfigurationWithDummyUser(Identity identity)
+        protected void CreateConfigurationWithDummyUser(Repository repo, Identity identity)
         {
-            return CreateConfigurationWithDummyUser(identity.Name, identity.Email);
+            CreateConfigurationWithDummyUser(repo, identity.Name, identity.Email);
         }
 
-        protected string CreateConfigurationWithDummyUser(string name, string email)
+        protected void CreateConfigurationWithDummyUser(Repository repo, string name, string email)
         {
-            SelfCleaningDirectory scd = BuildSelfCleaningDirectory();
-
-            string configFilePath = Touch(scd.DirectoryPath, "fake-config");
-
-            using (Configuration config = Configuration.BuildFrom(configFilePath))
+            Configuration config = repo.Config;
             {
                 if (name != null)
                 {
@@ -358,8 +354,6 @@ protected string CreateConfigurationWithDummyUser(string name, string email)
                     config.Set("user.email", email);
                 }
             }
-
-            return configFilePath;
         }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -542,11 +542,10 @@ public void DirectlyAccessingAnUnknownTreeEntryOfTheCommitReturnsNull()`
`542`	`542`	`public void CanCommitWithSignatureFromConfig()`
`543`	`543`	`{`
`544`	`544`	`string repoPath = InitNewRepository();`
`545`		`- string configPath = CreateConfigurationWithDummyUser(Constants.Identity);`
`546`		`- var options = new RepositoryOptions { GlobalConfigurationLocation = configPath };`
`547`	`545`
`548`		`- using (var repo = new Repository(repoPath, options))`
	`546`	`+ using (var repo = new Repository(repoPath))`
`549`	`547`	`{`
	`548`	`+ CreateConfigurationWithDummyUser(repo, Constants.Identity);`
`550`	`549`	`string dir = repo.Info.Path;`
`551`	`550`	`Assert.True(Path.IsPathRooted(dir));`
`552`	`551`	`Assert.True(Directory.Exists(dir));`
Original file line number	Diff line number	Diff line change
`@@ -139,12 +139,10 @@ public void CanReadStringValue()`
`139`	`139`	`[Fact]`
`140`	`140`	`public void CanEnumerateGlobalConfig()`
`141`	`141`	`{`
`142`		`- string configPath = CreateConfigurationWithDummyUser(Constants.Identity);`
`143`		`- var options = new RepositoryOptions { GlobalConfigurationLocation = configPath };`
`144`		`-`
`145`	`142`	`var path = SandboxStandardTestRepoGitDir();`
`146`		`- using (var repo = new Repository(path, options))`
	`143`	`+ using (var repo = new Repository(path))`
`147`	`144`	`{`
	`145`	`+ CreateConfigurationWithDummyUser(repo, Constants.Identity);`
`148`	`146`	`var entry = repo.Config.FirstOrDefault<ConfigurationEntry<string>>(e => e.Key == "user.name");`
`149`	`147`	`Assert.NotNull(entry);`
`150`	`148`	`Assert.Equal(Constants.Signature.Name, entry.Value);`
`@@ -196,16 +194,14 @@ public void CanFindInLocalConfig()`
`196`	`194`	`[Fact]`
`197`	`195`	`public void CanFindInGlobalConfig()`
`198`	`196`	`{`
`199`		`- string configPath = CreateConfigurationWithDummyUser(Constants.Identity);`
`200`		`- var options = new RepositoryOptions { GlobalConfigurationLocation = configPath };`
`201`	`197`
`202`	`198`	`var path = SandboxStandardTestRepoGitDir();`
`203`		`- using (var repo = new Repository(path, options))`
	`199`	`+ using (var repo = new Repository(path))`
`204`	`200`	`{`
`205`		`- var matches = repo.Config.Find(@"\.name", ConfigurationLevel.Global);`
	`201`	`+ var matches = repo.Config.Find("-rocks", ConfigurationLevel.Global);`
`206`	`202`
`207`	`203`	`Assert.NotNull(matches);`
`208`		`- Assert.Equal(new[] { "user.name" },`
	`204`	`+ Assert.Equal(new[] { "woot.this-rocks" },`
`209`	`205`	`matches.Select(m => m.Key).ToArray());`
`210`	`206`	`}`
`211`	`207`	`}`
`@@ -375,16 +371,14 @@ public void CanAccessConfigurationWithoutARepository(Func<string, string> localC`
`375`	`371`	`{`
`376`	`372`	`var path = SandboxStandardTestRepoGitDir();`
`377`	`373`
`378`		`- string globalConfigPath = CreateConfigurationWithDummyUser(Constants.Identity);`
`379`		`- var options = new RepositoryOptions { GlobalConfigurationLocation = globalConfigPath };`
`380`		`-`
`381`		`- using (var repo = new Repository(path, options))`
	`374`	`+ using (var repo = new Repository(path))`
`382`	`375`	`{`
`383`	`376`	`repo.Config.Set("my.key", "local");`
`384`	`377`	`repo.Config.Set("my.key", "mouse", ConfigurationLevel.Global);`
`385`	`378`	`}`
`386`	`379`
`387`		`- using (var config = Configuration.BuildFrom(localConfigurationPathProvider(path), globalConfigPath))`
	`380`	`+ var globalPath = Path.Combine(GlobalSettings.GetConfigSearchPaths(ConfigurationLevel.Global).Single(), ".gitconfig");`
	`381`	`+ using (var config = Configuration.BuildFrom(localConfigurationPathProvider(path), globalPath))`
`388`	`382`	`{`
`389`	`383`	`Assert.Equal("local", config.Get<string>("my.key").Value);`
`390`	`384`	`Assert.Equal("mouse", config.Get<string>("my.key", ConfigurationLevel.Global).Value);`
`@@ -406,11 +400,10 @@ public void PassingANonExistingLocalConfigurationFileToBuildFromthrowss()`
`406`	`400`	`public void CannotBuildAProperSignatureFromConfigWhenFullIdentityCannotBeFoundInTheConfig(string name, string email)`
`407`	`401`	`{`
`408`	`402`	`string repoPath = InitNewRepository();`
`409`		`- string configPath = CreateConfigurationWithDummyUser(name, email);`
`410`		`- var options = new RepositoryOptions { GlobalConfigurationLocation = configPath };`
`411`	`403`
`412`		`- using (var repo = new Repository(repoPath, options))`
	`404`	`+ using (var repo = new Repository(repoPath))`
`413`	`405`	`{`
	`406`	`+ CreateConfigurationWithDummyUser(repo, name, email);`
`414`	`407`	`Assert.Equal(name, repo.Config.GetValueOrDefault<string>("user.name"));`
`415`	`408`	`Assert.Equal(email, repo.Config.GetValueOrDefault<string>("user.email"));`
`416`	`409`
Original file line number	Diff line number	Diff line change
`@@ -335,18 +335,14 @@ private static void BuildFakeRepositoryOptions(SelfCleaningDirectory scd, out st`
`335`	`335`	`/// <remarks>The configuration file will be removed automatically when the tests are finished</remarks>`
`336`	`336`	`/// <param name="identity">The identity to use for user.name and user.email</param>`
`337`	`337`	`/// <returns>The path to the configuration file</returns>`
`338`		`- protected string CreateConfigurationWithDummyUser(Identity identity)`
	`338`	`+ protected void CreateConfigurationWithDummyUser(Repository repo, Identity identity)`
`339`	`339`	`{`
`340`		`- return CreateConfigurationWithDummyUser(identity.Name, identity.Email);`
	`340`	`+ CreateConfigurationWithDummyUser(repo, identity.Name, identity.Email);`
`341`	`341`	`}`
`342`	`342`
`343`		`- protected string CreateConfigurationWithDummyUser(string name, string email)`
	`343`	`+ protected void CreateConfigurationWithDummyUser(Repository repo, string name, string email)`
`344`	`344`	`{`
`345`		`- SelfCleaningDirectory scd = BuildSelfCleaningDirectory();`
`346`		`-`
`347`		`- string configFilePath = Touch(scd.DirectoryPath, "fake-config");`
`348`		`-`
`349`		`- using (Configuration config = Configuration.BuildFrom(configFilePath))`
	`345`	`+ Configuration config = repo.Config;`
`350`	`346`	`{`
`351`	`347`	`if (name != null)`
`352`	`348`	`{`
`@@ -358,8 +354,6 @@ protected string CreateConfigurationWithDummyUser(string name, string email)`
`358`	`354`	`config.Set("user.email", email);`
`359`	`355`	`}`
`360`	`356`	`}`
`361`		`-`
`362`		`- return configFilePath;`
`363`	`357`	`}`
`364`	`358`
`365`	`359`	`/// <summary>`