diff options
| author | Jameson Miller <jamill@microsoft.com> | 2015-02-05 01:54:03 +0300 |
|---|---|---|
| committer | Jameson Miller <jamill@microsoft.com> | 2015-02-05 02:12:52 +0300 |
| commit | bd06dac2db9947808a933d217e21816f05a77dc9 (patch) | |
| tree | b2db0fe6e0382b0c260271619f4065277e5579ab /LibGit2Sharp.Tests | |
| parent | aa70916bc3798948385967aaa1eff05c9378f758 (diff) | |
Fix misspelled enum
Diffstat (limited to 'LibGit2Sharp.Tests')
| -rw-r--r-- | LibGit2Sharp.Tests/MergeFixture.cs | 12 | ||||
| -rw-r--r-- | LibGit2Sharp.Tests/NetworkFixture.cs | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/LibGit2Sharp.Tests/MergeFixture.cs b/LibGit2Sharp.Tests/MergeFixture.cs index af386bd6..bf6ba48e 100644 --- a/LibGit2Sharp.Tests/MergeFixture.cs +++ b/LibGit2Sharp.Tests/MergeFixture.cs @@ -324,9 +324,9 @@ namespace LibGit2Sharp.Tests [Theory] [InlineData(true, FastForwardStrategy.Default, MergeStatus.NonFastForward)] - [InlineData(true, FastForwardStrategy.NoFastFoward, MergeStatus.NonFastForward)] + [InlineData(true, FastForwardStrategy.NoFastForward, MergeStatus.NonFastForward)] [InlineData(false, FastForwardStrategy.Default, MergeStatus.NonFastForward)] - [InlineData(false, FastForwardStrategy.NoFastFoward, MergeStatus.NonFastForward)] + [InlineData(false, FastForwardStrategy.NoFastForward, MergeStatus.NonFastForward)] public void CanNonFastForwardMergeCommit(bool fromDetachedHead, FastForwardStrategy fastForwardStrategy, MergeStatus expectedMergeStatus) { string path = SandboxMergeTestRepo(); @@ -516,7 +516,7 @@ namespace LibGit2Sharp.Tests { Commit commitToMerge = repo.Branches["fast_forward"].Tip; - MergeResult result = repo.Merge(commitToMerge, Constants.Signature, new MergeOptions() { FastForwardStrategy = FastForwardStrategy.NoFastFoward }); + MergeResult result = repo.Merge(commitToMerge, Constants.Signature, new MergeOptions() { FastForwardStrategy = FastForwardStrategy.NoFastForward }); Assert.Equal(MergeStatus.NonFastForward, result.Status); Assert.Equal("f58f780d5a0ae392efd4a924450b1bbdc0577d32", result.Commit.Id.Sha); @@ -550,7 +550,7 @@ namespace LibGit2Sharp.Tests { Commit commitToMerge = repo.Branches["master"].Tip; - MergeResult result = repo.Merge(commitToMerge, Constants.Signature, new MergeOptions() { FastForwardStrategy = FastForwardStrategy.NoFastFoward }); + MergeResult result = repo.Merge(commitToMerge, Constants.Signature, new MergeOptions() { FastForwardStrategy = FastForwardStrategy.NoFastForward }); Assert.Equal(MergeStatus.UpToDate, result.Status); Assert.Equal(null, result.Commit); @@ -578,8 +578,8 @@ namespace LibGit2Sharp.Tests [Theory] [InlineData(true, FastForwardStrategy.FastForwardOnly)] [InlineData(false, FastForwardStrategy.FastForwardOnly)] - [InlineData(true, FastForwardStrategy.NoFastFoward)] - [InlineData(false, FastForwardStrategy.NoFastFoward)] + [InlineData(true, FastForwardStrategy.NoFastForward)] + [InlineData(false, FastForwardStrategy.NoFastForward)] public void MergeWithWorkDirConflictsThrows(bool shouldStage, FastForwardStrategy strategy) { // Merging the fast_forward branch results in a change to file diff --git a/LibGit2Sharp.Tests/NetworkFixture.cs b/LibGit2Sharp.Tests/NetworkFixture.cs index 31959286..52b9d467 100644 --- a/LibGit2Sharp.Tests/NetworkFixture.cs +++ b/LibGit2Sharp.Tests/NetworkFixture.cs @@ -132,7 +132,7 @@ namespace LibGit2Sharp.Tests [Theory] [InlineData(FastForwardStrategy.Default)] - [InlineData(FastForwardStrategy.NoFastFoward)] + [InlineData(FastForwardStrategy.NoFastForward)] public void CanPull(FastForwardStrategy fastForwardStrategy) { string url = "https://github.com/libgit2/TestGitRepository"; |