Skip to content

Commit 0eb743f

Browse files
committed
fixed typo in warning exception messages: ambigous -> ambiguous
1 parent 0366f69 commit 0eb743f

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/GitVersionCore.Tests/ConfigProviderTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ public void WarnOnExistingGitVersionConfigYamlFile(string path)
252252

253253
[TestCase(DefaultRepoPath)]
254254
[TestCase(DefaultWorkingPath)]
255-
public void WarnOnAmbigousConfigFilesAtTheSameProjectRootDirectory(string path)
255+
public void WarnOnAmbiguousConfigFilesAtTheSameProjectRootDirectory(string path)
256256
{
257257
SetupConfigFileContent(string.Empty, ConfigurationProvider.ObsoleteConfigFileName, path);
258258
SetupConfigFileContent(string.Empty, ConfigurationProvider.DefaultConfigFileName, path);
@@ -263,22 +263,22 @@ public void WarnOnAmbigousConfigFilesAtTheSameProjectRootDirectory(string path)
263263

264264
ConfigurationProvider.Verify(workingPath, repoPath, fileSystem);
265265

266-
var configFileDeprecatedWarning = string.Format("Ambigous config files at '{0}'", path);
266+
var configFileDeprecatedWarning = string.Format("Ambiguous config files at '{0}'", path);
267267
logOutput.Contains(configFileDeprecatedWarning).ShouldBe(true);
268268
}
269269

270270
[TestCase(ConfigurationProvider.DefaultConfigFileName, ConfigurationProvider.DefaultConfigFileName)]
271271
[TestCase(ConfigurationProvider.DefaultConfigFileName, ConfigurationProvider.ObsoleteConfigFileName)]
272272
[TestCase(ConfigurationProvider.ObsoleteConfigFileName, ConfigurationProvider.DefaultConfigFileName)]
273273
[TestCase(ConfigurationProvider.ObsoleteConfigFileName, ConfigurationProvider.ObsoleteConfigFileName)]
274-
public void ThrowsExceptionOnAmbigousConfigFileLocation(string repoConfigFile, string workingConfigFile)
274+
public void ThrowsExceptionOnAmbiguousConfigFileLocation(string repoConfigFile, string workingConfigFile)
275275
{
276276
var repositoryConfigFilePath = SetupConfigFileContent(string.Empty, repoConfigFile, repoPath);
277277
var workingDirectoryConfigFilePath = SetupConfigFileContent(string.Empty, workingConfigFile, workingPath);
278278

279279
WarningException exception = Should.Throw<WarningException>(() => { ConfigurationProvider.Verify(workingPath, repoPath, fileSystem); });
280280

281-
var expecedMessage = string.Format("Ambigous config file selection from '{0}' and '{1}'", workingDirectoryConfigFilePath, repositoryConfigFilePath);
281+
var expecedMessage = string.Format("Ambiguous config file selection from '{0}' and '{1}'", workingDirectoryConfigFilePath, repositoryConfigFilePath);
282282
exception.Message.ShouldBe(expecedMessage);
283283
}
284284

src/GitVersionCore/Configuration/ConfigurationProvider.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,10 @@ public static void Verify(string workingDirectory, string projectRootDirectory,
217217
WarnAboutObsoleteConfigFile(workingDirectory, fileSystem);
218218
WarnAboutObsoleteConfigFile(projectRootDirectory, fileSystem);
219219

220-
WarnAboutAmbigousConfigFileSelection(workingDirectory, projectRootDirectory, fileSystem);
220+
WarnAboutAmbiguousConfigFileSelection(workingDirectory, projectRootDirectory, fileSystem);
221221
}
222222

223-
private static void WarnAboutAmbigousConfigFileSelection(string workingDirectory, string projectRootDirectory, IFileSystem fileSystem)
223+
private static void WarnAboutAmbiguousConfigFileSelection(string workingDirectory, string projectRootDirectory, IFileSystem fileSystem)
224224
{
225225
var workingConfigFile = GetConfigFilePath(workingDirectory, fileSystem);
226226
var projectRootConfigFile = GetConfigFilePath(projectRootDirectory, fileSystem);
@@ -229,7 +229,7 @@ private static void WarnAboutAmbigousConfigFileSelection(string workingDirectory
229229
bool hasConfigInProjectRootDirectory = fileSystem.Exists(projectRootConfigFile);
230230
if (hasConfigInProjectRootDirectory && hasConfigInWorkingDirectory)
231231
{
232-
throw new WarningException(string.Format("Ambigous config file selection from '{0}' and '{1}'", workingConfigFile, projectRootConfigFile));
232+
throw new WarningException(string.Format("Ambiguous config file selection from '{0}' and '{1}'", workingConfigFile, projectRootConfigFile));
233233
}
234234
}
235235

@@ -278,7 +278,7 @@ static bool WarnAboutObsoleteConfigFile(string workingDirectory, IFileSystem fil
278278
var defaultConfigFilePath = Path.Combine(workingDirectory, DefaultConfigFileName);
279279
if (fileSystem.Exists(defaultConfigFilePath))
280280
{
281-
Logger.WriteWarning(string.Format("Ambigous config files at '{0}': '{1}' (deprecated) and '{2}'. Will be used '{2}'", workingDirectory, ObsoleteConfigFileName, DefaultConfigFileName));
281+
Logger.WriteWarning(string.Format("Ambiguous config files at '{0}': '{1}' (deprecated) and '{2}'. Will be used '{2}'", workingDirectory, ObsoleteConfigFileName, DefaultConfigFileName));
282282
return true;
283283
}
284284

0 commit comments

Comments
 (0)