Skip to content

Commit 90b3597

Browse files
arturcicarturcic
committed
fix code after the update of Shouldly
1 parent 7d7350f commit 90b3597

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

‎src/GitVersion.sln.DotSettings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -549,6 +549,7 @@ II.2.12 <HandlesEvent />
549549
<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=5C63448180C9174C8C28A084F80E37DF/RelativePath/@EntryValue"></s:String>
550550
<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File5C63448180C9174C8C28A084F80E37DF/@KeyIndexDefined">True</s:Boolean>
551551
<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File5C63448180C9174C8C28A084F80E37DF/RelativePriority/@EntryValue">1</s:Double>
552+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002EDaemon_002ESettings_002EMigration_002ESwaWarningsModeSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
552553
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
553554
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpFileLayoutPatternsUpgrade/@EntryIndexedValue">True</s:Boolean>
554555
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>

‎src/GitVersionCore.Tests/Configuration/IgnoreConfigTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
namespace GitVersionCore.Tests.Configuration
1010
{
11+
1112
[TestFixture]
1213
public class IgnoreConfigTests : TestBase
1314
{
@@ -34,7 +35,7 @@ public void ShouldSupportsOtherSequenceFormat()
3435
{
3536
var yaml = @"
3637
ignore:
37-
sha:
38+
sha:
3839
- b6c0c9fda88830ebcd563e500a5a7da5a1658e98
3940
- 6c19c7c219ecf8dbc468042baefa73a1b213e8b1
4041
";
@@ -59,7 +60,7 @@ public void WhenNotInConfigShouldHaveDefaults()
5960

6061
config.Ignore.ShouldNotBeNull();
6162
config.Ignore.ShAs.ShouldBeEmpty();
62-
config.Ignore.Before.ShouldBeNull();
63+
config.Ignore.Before.ShouldBe(null);
6364
}
6465

6566
[Test]

‎src/GitVersionCore.Tests/Core/GitVersionExecutorTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public void CacheFileExistsOnDisk()
172172

173173
var logsMessages = stringBuilder.ToString();
174174

175-
logsMessages.ShouldContain("Deserializing version variables from cache file", () => logsMessages);
175+
logsMessages.ShouldContain("Deserializing version variables from cache file", logsMessages);
176176
}
177177

178178
[Test]
@@ -234,7 +234,7 @@ public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDyn
234234
versionVariables.AssemblySemVer.ShouldBe("0.1.0.0");
235235

236236
var cachedDirectoryTimestampAfter = fileSystem.GetLastDirectoryWrite(cacheDirectory);
237-
cachedDirectoryTimestampAfter.ShouldBe(cacheDirectoryTimestamp, () => "Cache was updated when override config was set");
237+
cachedDirectoryTimestampAfter.ShouldBe(cacheDirectoryTimestamp, "Cache was updated when override config was set");
238238
}
239239

240240
[Test]
@@ -256,7 +256,7 @@ public void CacheFileIsMissing()
256256
gitVersionCalculator.CalculateVersionVariables();
257257

258258
var logsMessages = stringBuilder.ToString();
259-
logsMessages.ShouldContain("yml not found", () => logsMessages);
259+
logsMessages.ShouldContain("yml not found", logsMessages);
260260
}
261261

262262
[Test]

‎src/GitVersionCore.Tests/Model/MergeMessageTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public void EmptyMessageString(string message)
3131
sut.TargetBranch.ShouldBeNull();
3232
sut.MergedBranch.ShouldBeEmpty();
3333
sut.IsMergedPullRequest.ShouldBeFalse();
34-
sut.PullRequestNumber.ShouldBeNull();
34+
sut.PullRequestNumber.ShouldBe(null);
3535
sut.Version.ShouldBeNull();
3636
}
3737

@@ -51,7 +51,7 @@ public void EmptyTagPrefix(string prefix)
5151
sut.TargetBranch.ShouldBeNull();
5252
sut.MergedBranch.ShouldBeEmpty();
5353
sut.IsMergedPullRequest.ShouldBeFalse();
54-
sut.PullRequestNumber.ShouldBeNull();
54+
sut.PullRequestNumber.ShouldBe(null);
5555
sut.Version.ShouldBeNull();
5656
}
5757

@@ -81,7 +81,7 @@ public void ParsesMergeMessage(
8181
sut.TargetBranch.ShouldBe(expectedTargetBranch);
8282
sut.MergedBranch.ShouldBe(expectedMergedBranch);
8383
sut.IsMergedPullRequest.ShouldBeFalse();
84-
sut.PullRequestNumber.ShouldBeNull();
84+
sut.PullRequestNumber.ShouldBe(null);
8585
sut.Version.ShouldBe(expectedVersion);
8686
}
8787

@@ -205,7 +205,7 @@ public void ParsesSmartGitMergeMessage(
205205
sut.TargetBranch.ShouldBe(expectedTargetBranch);
206206
sut.MergedBranch.ShouldBe(expectedMergedBranch);
207207
sut.IsMergedPullRequest.ShouldBeFalse();
208-
sut.PullRequestNumber.ShouldBeNull();
208+
sut.PullRequestNumber.ShouldBe(null);
209209
sut.Version.ShouldBe(expectedVersion);
210210
}
211211

@@ -235,7 +235,7 @@ public void ParsesRemoteTrackingMergeMessage(
235235
sut.TargetBranch.ShouldBe(expectedTargetBranch);
236236
sut.MergedBranch.ShouldBe(expectedMergedBranch);
237237
sut.IsMergedPullRequest.ShouldBeFalse();
238-
sut.PullRequestNumber.ShouldBeNull();
238+
sut.PullRequestNumber.ShouldBe(null);
239239
sut.Version.ShouldBe(expectedVersion);
240240
}
241241

@@ -285,7 +285,7 @@ public void MatchesSingleCustomMessage()
285285
sut.TargetBranch.ShouldBeNull();
286286
sut.MergedBranch.ShouldBeEmpty();
287287
sut.IsMergedPullRequest.ShouldBeFalse();
288-
sut.PullRequestNumber.ShouldBeNull();
288+
sut.PullRequestNumber.ShouldBe(null);
289289
sut.Version.ShouldBeNull();
290290
}
291291

@@ -310,7 +310,7 @@ public void MatchesMultipleCustomMessages()
310310
sut.TargetBranch.ShouldBeNull();
311311
sut.MergedBranch.ShouldBeEmpty();
312312
sut.IsMergedPullRequest.ShouldBeFalse();
313-
sut.PullRequestNumber.ShouldBeNull();
313+
sut.PullRequestNumber.ShouldBe(null);
314314
sut.Version.ShouldBeNull();
315315
}
316316

@@ -362,7 +362,7 @@ public void ReturnsAfterFirstMatchingPattern()
362362
sut.TargetBranch.ShouldBeNull();
363363
sut.MergedBranch.ShouldBe("this");
364364
sut.IsMergedPullRequest.ShouldBeFalse();
365-
sut.PullRequestNumber.ShouldBeNull();
365+
sut.PullRequestNumber.ShouldBe(null);
366366
sut.Version.ShouldBeNull();
367367
}
368368
}

‎src/GitVersionExe.Tests/ExecCmdLineArgumentTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void WorkingDirectoryDoesNotExistFailsWithInformativeMessage()
9191

9292
exitCode.ShouldNotBe(0);
9393
var outputString = output.ToString();
94-
outputString.ShouldContain($"The working directory '{workingDirectory}' does not exist.", () => outputString);
94+
outputString.ShouldContain($"The working directory '{workingDirectory}' does not exist.", outputString);
9595
}
9696
}
9797
}

0 commit comments

Comments
 (0)