From 1ed6ea7b5246d3d3ba85cef34c441025d238878e Mon Sep 17 00:00:00 2001 From: Alex Pop - Zengenti Date: Thu, 11 Apr 2024 11:33:29 +0100 Subject: [PATCH] chore: removed redundant attributes --- .../Models/Headers/CreateHeaderSpecs.cs | 8 -------- .../Models/Headers/HeaderMergeSpecs.cs | 9 --------- .../Models/MetricsSpecs.cs | 6 ------ .../Parsing/HtmlParserSpecs.cs | 18 ------------------ .../ResolveEncodedStaticPaths.cs | 3 --- .../ResolveStaticPaths.cs | 4 ---- .../Resolving/HtmlContentSpecs.cs | 12 ------------ .../Resolving/HtmlResponseResolverSpecs.cs | 18 ++++++------------ .../StaticPathSpecs/InvalidRewrittenPath.cs | 4 ---- .../StaticPathSpecs/ValidNonRewrittenPath.cs | 4 ---- .../StaticPathSpecs/ValidRewrittenPath.cs | 5 ----- .../Services/RouteInfoFactorySpecs/ApiPath.cs | 5 ----- .../RouteInfoFactorySpecs/FullUriRouting.cs | 5 ----- .../FullUriRoutingWithBlockClusterConfig.cs | 6 ------ .../RouteInfoFactorySpecs/IisFallback.cs | 6 ------ .../RouteInfoFactorySpecs/ProxyPath.cs | 5 ----- .../StaticResourcePath.cs | 5 ----- .../NodeDoesNotExistAndRouteIsNotProxied.cs | 4 ---- .../NodeExistsAndRendererDoesNotMatch.cs | 5 ----- .../NodeExistsAndRendererMatched.cs | 4 ---- ...istsAndRendererMatchedWithFullUriRouting.cs | 4 ---- .../RouteServiceSpecs/PathIsProxiedApiCall.cs | 4 ---- .../PathIsRewrittenStaticResource.cs | 5 ----- ...IsRewrittenStaticResourceWithQueryString.cs | 5 ----- ...ShouldNotPerformNodeLookupIfExcludedPath.cs | 3 --- .../ShouldPerformNodeLookup.cs | 3 --- .../ShouldResolveForInvalidData.cs | 3 --- .../ShouldResolveForValidData.cs | 3 --- 28 files changed, 6 insertions(+), 160 deletions(-) diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Models/Headers/CreateHeaderSpecs.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Models/Headers/CreateHeaderSpecs.cs index f8932ac..22958f4 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Models/Headers/CreateHeaderSpecs.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Models/Headers/CreateHeaderSpecs.cs @@ -11,7 +11,6 @@ public class CreateFromAnIEnumerableDictionary { private Domain.ValueTypes.Headers _result; - [When] public void WhenHeadersAreCreatedFromAnIEnumerableDictionary() { _result = new Domain.ValueTypes.Headers( @@ -32,7 +31,6 @@ public void WhenHeadersAreCreatedFromAnIEnumerableDictionary() }); } - [Then] public void ThenTheValuesAreCorrectlySet() { Assert.That(_result.Values.Count, Is.EqualTo(2)); @@ -51,7 +49,6 @@ public class CreateFromASingleValueDictionary { private Domain.ValueTypes.Headers _result; - [When] public void WhenHeadersAreCreatedFromASingleValueDictionary() { _result = new Domain.ValueTypes.Headers( @@ -66,7 +63,6 @@ public void WhenHeadersAreCreatedFromASingleValueDictionary() }); } - [Then] public void ThenTheValuesAreCorrectlySet() { Assert.That(_result.Values.Count, Is.EqualTo(2)); @@ -85,7 +81,6 @@ public class CreateFromAnIHeaderDictionary { private Domain.ValueTypes.Headers _result; - [When] public void WhenHeadersAreCreatedFromAnIHeaderDictionary() { _result = new Domain.ValueTypes.Headers( @@ -101,7 +96,6 @@ public void WhenHeadersAreCreatedFromAnIHeaderDictionary() })); } - [Then] public void ThenTheValuesAreCorrectlySet() { Assert.That(_result.Values.Count, Is.EqualTo(2)); @@ -120,7 +114,6 @@ public class CreateFromHttpResponseHeaders { private Domain.ValueTypes.Headers _result; - [When] public void WhenHeadersAreCreatedFromHttpResponseHeaders() { var response = new HttpResponseMessage(); @@ -130,7 +123,6 @@ public void WhenHeadersAreCreatedFromHttpResponseHeaders() _result = new Domain.ValueTypes.Headers(response.Headers); } - [Then] public void ThenTheValuesAreCorrectlySet() { Assert.That(_result.Values.Count, Is.EqualTo(2)); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Models/Headers/HeaderMergeSpecs.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Models/Headers/HeaderMergeSpecs.cs index 22dd604..34793e9 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Models/Headers/HeaderMergeSpecs.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Models/Headers/HeaderMergeSpecs.cs @@ -10,7 +10,6 @@ public class MatchingHeadersExists private readonly Domain.ValueTypes.Headers _sut = new(); private Domain.ValueTypes.Headers _result; - [Given] public void GivenHeadersExist() { _sut.Add( @@ -27,7 +26,6 @@ public void GivenHeadersExist() }); } - [When] public void WhenAMatchingHeaderValueIsMerged() { var toMerge = new Domain.ValueTypes.Headers(); @@ -41,7 +39,6 @@ public void WhenAMatchingHeaderValueIsMerged() _result = _sut.Merge(toMerge); } - [Then] public void ThenTheMatchingHeaderValueIsOverridden() { Assert.That(_result.Values.Count, Is.EqualTo(2)); @@ -61,7 +58,6 @@ public class NoMatchingHeadersExist private readonly Domain.ValueTypes.Headers _sut = new(); private Domain.ValueTypes.Headers _result; - [Given] public void GivenHeadersExist() { _sut.Add( @@ -78,7 +74,6 @@ public void GivenHeadersExist() }); } - [When] public void WhenAHeaderValueIsMergedThatDoesNotAlreadyExist() { var toMerge = new Domain.ValueTypes.Headers(); @@ -92,7 +87,6 @@ public void WhenAHeaderValueIsMergedThatDoesNotAlreadyExist() _result = _sut.Merge(toMerge); } - [Then] public void ThenTheNewHeaderValueIsAdded() { Assert.That(_result.Values.Count, Is.EqualTo(3)); @@ -115,7 +109,6 @@ public class CaseInsensitiveKey private readonly Domain.ValueTypes.Headers _sut = new(); private Domain.ValueTypes.Headers _result; - [Given] public void GivenAHeadersExistsThatIsHandledCaseInsensitively() { _sut.Add( @@ -126,7 +119,6 @@ public void GivenAHeadersExistsThatIsHandledCaseInsensitively() }); } - [When] public void WhenAHeaderWithTheSameNameButDifferentCaseIsMerged() { var toMerge = new Domain.ValueTypes.Headers(); @@ -140,7 +132,6 @@ public void WhenAHeaderWithTheSameNameButDifferentCaseIsMerged() _result = _sut.Merge(toMerge); } - [Then] public void ThenTheHeaderValueIsOverriden() { Assert.That(_result.Values.Count, Is.EqualTo(1)); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Models/MetricsSpecs.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Models/MetricsSpecs.cs index b531031..87f9ba2 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Models/MetricsSpecs.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Models/MetricsSpecs.cs @@ -10,7 +10,6 @@ public class HasMetrics private readonly Metrics _sut = new(); private string _result; - [Given] public void GivenThereAreSomeMetrics() { _sut.Add("metric1", 100); @@ -18,13 +17,11 @@ public void GivenThereAreSomeMetrics() _sut.Add("metric3", 300); } - [When] public void WhenToStringIsInvoked() { _result = _sut.ToString(); } - [Then] public void ThenTheMetricsAreFormattedCorrectly() { Assert.That(_result, Is.EqualTo("metric1: 100ms, metric2: 200ms, metric3: 300ms")); @@ -42,18 +39,15 @@ public class HasNoMetrics private readonly Metrics _sut = new(); private string _result; - [Given] public void GivenThereAreSomeMetrics() { } - [When] public void WhenToStringIsInvoked() { _result = _sut.ToString(); } - [Then] public void ThenTheMetricsAreFormattedCorrectly() { Assert.That(_result, Is.EqualTo("")); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Parsing/HtmlParserSpecs.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Parsing/HtmlParserSpecs.cs index 57f9d9a..145e8fe 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Parsing/HtmlParserSpecs.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Parsing/HtmlParserSpecs.cs @@ -10,13 +10,11 @@ class SelfClosingTags private HtmlParser _sut; private readonly List _tags = new List(); - [Given] public void GivenHtmlContainsSelfClosingTags() { _sut = new HtmlParser(SpecHelper.GetFile("Parsing/Files/Self-closing-tags.html")); } - [When] public void WhenTheHtmlIsParsed() { while (_sut.ParseNext( @@ -30,7 +28,6 @@ public void WhenTheHtmlIsParsed() } } - [Then] public void ThenTheTagsAreExtracted() { Assert.That(_tags, Has.Count.EqualTo(3)); @@ -51,13 +48,11 @@ class EndTags private HtmlParser _sut; private readonly List _tags = new List(); - [Given] public void GivenHtmlContainsTagsWithEndTags() { _sut = new HtmlParser(SpecHelper.GetFile("Parsing/Files/End-tags.html")); } - [When] public void WhenTheHtmlIsParsed() { while (_sut.ParseNext( @@ -71,7 +66,6 @@ public void WhenTheHtmlIsParsed() } } - [Then] public void ThenTheTagsAreExtracted() { Assert.That(_tags, Has.Count.EqualTo(3)); @@ -94,13 +88,11 @@ class NonClosedTags private HtmlParser _sut; private readonly List _tags = new List(); - [Given] public void GivenHtmlContainsNonClosedTags() { _sut = new HtmlParser(SpecHelper.GetFile("Parsing/Files/Non-closed-tags.html")); } - [When] public void WhenTheHtmlIsParsed() { while (_sut.ParseNext( @@ -114,7 +106,6 @@ public void WhenTheHtmlIsParsed() } } - [Then] public void ThenTheTagsAreExtracted() { Assert.That(_tags, Has.Count.EqualTo(2)); @@ -134,13 +125,11 @@ class NoClosingBracket private HtmlParser _sut; private readonly List _tags = new List(); - [Given] public void GivenHtmlContainsATagWithoutAClosingBracket() { _sut = new HtmlParser(SpecHelper.GetFile("Parsing/Files/Invalid-tag-with-no-closing-bracket.html")); } - [When] public void WhenTheHtmlIsParsed() { while (_sut.ParseNext( @@ -154,7 +143,6 @@ public void WhenTheHtmlIsParsed() } } - [Then] public void ThenTheTagIsIgnored() { Assert.That(_tags, Has.Count.EqualTo(0)); @@ -172,14 +160,12 @@ class LastTagWithNoClosingBracket private HtmlParser _sut; private readonly List _tags = new List(); - [Given] public void GivenHtmlContainsAnEndTagWithoutAClosingBracket() { _sut = new HtmlParser( SpecHelper.GetFile("Parsing/Files/Invalid-last-tag-with-no-closing-bracket.html")); } - [When] public void WhenTheHtmlIsParsed() { while (_sut.ParseNext( @@ -193,7 +179,6 @@ public void WhenTheHtmlIsParsed() } } - [Then] public void ThenTheTagIsIgnored() { Assert.That(_tags, Has.Count.EqualTo(0)); @@ -211,13 +196,11 @@ class InvalidAttributes private HtmlParser _sut; private readonly List _tags = new List(); - [Given] public void GivenHtmlContainsATagWithInvalidAttributes() { _sut = new HtmlParser(SpecHelper.GetFile("Parsing/Files/Tag-with-invalid-attributes.html")); } - [When] public void WhenTheHtmlIsParsed() { while (_sut.ParseNext( @@ -231,7 +214,6 @@ public void WhenTheHtmlIsParsed() } } - [Then] public void ThenTheTagIsIgnored() { Assert.That(_tags, Has.Count.EqualTo(0)); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/GenericResponseResolverSpecs/ResolveEncodedStaticPaths.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/GenericResponseResolverSpecs/ResolveEncodedStaticPaths.cs index 4be6c78..14a579a 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/GenericResponseResolverSpecs/ResolveEncodedStaticPaths.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/GenericResponseResolverSpecs/ResolveEncodedStaticPaths.cs @@ -13,13 +13,11 @@ class ResolveEncodedStaticPaths private readonly Guid _blockVersionId = Guid.NewGuid(); private readonly Guid _projectUuid = Guid.NewGuid(); - [Given] public void GivenTheGenericResponseResolver() { _sut = new GenericResponseResolver(); } - [When] public async void WhenAResponseContainsStaticLinks() { var html = SpecHelper.GetFile("Resolving/Files/encoded.json"); @@ -28,7 +26,6 @@ public async void WhenAResponseContainsStaticLinks() _result = await _sut.Resolve(html, routeInfo, 0, CancellationToken.None); } - [Then] public void ThenTheStaticPathsAreRewrittenWithABlockVersionIdPrefix() { var expected = diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/GenericResponseResolverSpecs/ResolveStaticPaths.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/GenericResponseResolverSpecs/ResolveStaticPaths.cs index cdf910c..62e46e1 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/GenericResponseResolverSpecs/ResolveStaticPaths.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/GenericResponseResolverSpecs/ResolveStaticPaths.cs @@ -13,13 +13,11 @@ class ResolveStaticPaths private readonly Guid _blockVersionId = Guid.NewGuid(); private readonly Guid _projectUuid = Guid.NewGuid(); - [Given] public void GivenTheGenericResponseResolver() { _sut = new GenericResponseResolver(); } - [When] public async void WhenAResponseContainsStaticLinks() { var html = SpecHelper.GetFile("Resolving/Files/site.css"); @@ -28,7 +26,6 @@ public async void WhenAResponseContainsStaticLinks() _result = await _sut.Resolve(html, routeInfo, 0, CancellationToken.None); } - [Then] public void ThenTheTargetedStaticPathsAreRewrittenWithABlockVersionIdPrefix() { var expected = @@ -36,7 +33,6 @@ public void ThenTheTargetedStaticPathsAreRewrittenWithABlockVersionIdPrefix() Assert.That(_result, Contains.Substring(expected)); } - [AndThen] public void AndThenTheRestOfTheStaticPathsAreNotRewritten() { var expectedUrls = new[] diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/HtmlContentSpecs.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/HtmlContentSpecs.cs index 95d7c69..995853a 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/HtmlContentSpecs.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/HtmlContentSpecs.cs @@ -13,7 +13,6 @@ class MultiplePageletsResolvedInOrder private HtmlContent _sut; private readonly List _tagIds = new List(); - [Given] public void GivenMultiplePagelets() { var html = SpecHelper.GetFile("Resolving/Files/Record-multiple-pagelets.html"); @@ -33,7 +32,6 @@ public void GivenMultiplePagelets() } } - [When] public async Task WhenThePageletsAreResolvedInOrder() { await _sut.UpdateTag(_tagIds[0], SpecHelper.GetFile("Resolving/Files/Pagelet1.html")); @@ -41,7 +39,6 @@ public async Task WhenThePageletsAreResolvedInOrder() await _sut.UpdateTag(_tagIds[2], SpecHelper.GetFile("Resolving/Files/Pagelet3.html")); } - [Then] public void ThenThePageletsAreResolvedCorrectly() { var result = _sut.ToString().NormalizeLineEndings(); @@ -65,7 +62,6 @@ class MultiplePageletsResolvedUnordered private HtmlContent _sut; private readonly List _tagIds = new List(); - [Given] public void GivenMultiplePagelets() { var html = SpecHelper.GetFile("Resolving/Files/Record-multiple-pagelets.html"); @@ -85,7 +81,6 @@ public void GivenMultiplePagelets() } } - [When] public async Task WhenThePageletsAreResolvedUnOrdered() { await _sut.UpdateTag(_tagIds[2], SpecHelper.GetFile("Resolving/Files/Pagelet3.html")); @@ -93,7 +88,6 @@ public async Task WhenThePageletsAreResolvedUnOrdered() await _sut.UpdateTag(_tagIds[0], SpecHelper.GetFile("Resolving/Files/Pagelet1.html")); } - [Then] public void ThenThePageletsAreResolvedCorrectly() { var result = _sut.ToString().NormalizeLineEndings(); @@ -116,7 +110,6 @@ class HtmlTagIdDoesNotExist { private HtmlContent _sut; - [Given] public void GivenAHtmlTagIdDoesNotExist() { var html = SpecHelper.GetFile("Resolving/Files/Record-single-pagelet.html"); @@ -135,13 +128,11 @@ public void GivenAHtmlTagIdDoesNotExist() } } - [When] public async Task WhenTheTagUpdateIsApplied() { await _sut.UpdateTag(new Guid(), SpecHelper.GetFile("Resolving/Files/Pagelet1.html")); } - [Then] public void ThenTheUpdateIsIgnored() { Assert.That(_sut.ToString().NormalizeLineEndings().Length, Is.EqualTo(782)); @@ -159,7 +150,6 @@ class HtmlTagContentUpdateIsNull private HtmlContent _sut; private Guid _tagId; - [Given] public void GivenAPageletResponseIsNull() { var html = SpecHelper.GetFile("Resolving/Files/Record-single-pagelet.html"); @@ -179,13 +169,11 @@ public void GivenAPageletResponseIsNull() } } - [When] public async Task WhenTheTagUpdateIsApplied() { await _sut.UpdateTag(_tagId, null); } - [Then] public void ThenTheUpdateIsIgnored() { Assert.That(_sut.ToString().NormalizeLineEndings().Length, Is.EqualTo(751)); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/HtmlResponseResolverSpecs.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/HtmlResponseResolverSpecs.cs index 441f9f0..a39ca15 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/HtmlResponseResolverSpecs.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/HtmlResponseResolverSpecs.cs @@ -13,7 +13,6 @@ class ResolvePagelets private HtmlResponseResolver _sut; private string _result; - [Given] public void GivenTheHtmlResponseResolver() { _sut = SpecHelper.CreateHtmlResponseResolver(); @@ -24,7 +23,6 @@ public void GivenTheHtmlResponseResolver() SpecHelper.GetFile("Resolving/Files/Pagelet1.html")); } - [When] public async Task WhenHtmlWithSinglePageletIsResolved() { var html = SpecHelper.GetFile("Resolving/Files/Record-single-pagelet.html"); @@ -45,7 +43,6 @@ public async Task WhenHtmlWithSinglePageletIsResolved() _result = await _sut.Resolve(html, routeInfo, 0, CancellationToken.None); } - [Then] public void ThenTheResultIsCorrect() { Assert.That(_result, Is.Not.Null.Or.Empty); @@ -65,7 +62,6 @@ class ResolvePageletsWithTraceEnabled private HtmlResponseResolver _sut; private string _result; - [Given] public void GivenTheHtmlResponseResolverWithTraceEnabled() { _sut = SpecHelper.CreateHtmlResponseResolver(true); @@ -96,7 +92,6 @@ public void GivenTheHtmlResponseResolverWithTraceEnabled() requestMessage.Headers)); } - [When] public async Task WhenHtmlWithSinglePageletIsResolved() { var html = SpecHelper.GetFile("Resolving/Files/Record-single-pagelet.html"); @@ -119,7 +114,6 @@ public async Task WhenHtmlWithSinglePageletIsResolved() _result = await _sut.Resolve(html, routeInfo, 0, CancellationToken.None); } - [Then] public void ThenTheResultIsCorrect() { var separator = Environment.NewLine; @@ -147,7 +141,7 @@ public void Run() // private string _result; // private Exception _ex; - // [Given] + // // public void GivenTheHtmlResponseResolver() // { @@ -158,7 +152,7 @@ public void Run() // } - // [When] + // // public async Task WhenHtmlWithSinglePageletIsResolved() // { // var html = SpecHelper.GetFile("Resolving/Files/Record-single-pagelet.html"); @@ -182,7 +176,7 @@ public void Run() // } // } - // [Then] + // // public void ThenAnEndpointExceptionIsThrown() // { // Assert.That(_result, Is.Null); @@ -209,7 +203,7 @@ public void Run() // private string _result; // private Exception _ex; - // [Given] + // // public void GivenTheHtmlResponseResolver() // { @@ -223,7 +217,7 @@ public void Run() // "404 error", 404); // } - // [When] + // // public async Task WhenHtmlWithMultiplePageletsIsResolved() // { // var html = SpecHelper.GetFile("Resolving/Files/Record-multiple-pagelets.html"); @@ -248,7 +242,7 @@ public void Run() // } // } - // [Then] + // // public void ThenAnAggregateExceptionIsThrown() // { // Assert.That(_result, Is.Null); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/StaticPathSpecs/InvalidRewrittenPath.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/StaticPathSpecs/InvalidRewrittenPath.cs index 88ac0c0..c665c7d 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/StaticPathSpecs/InvalidRewrittenPath.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/StaticPathSpecs/InvalidRewrittenPath.cs @@ -8,24 +8,20 @@ class InvalidRewrittenPath string _path; StaticPath _result; - [Given] public void GivenARewrittenStaticPath() { } - [When] public void WhenItIsParsed() { _result = StaticPath.Parse(_path); } - [Then] public void ThenItIsNotRewritten() { Assert.That(_result.IsRewritten, Is.False); } - [AndThen] public void AndTheTheOriginalPathIsCorrect() { Assert.That(_result.OriginalPath, Is.EqualTo(_path)); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/StaticPathSpecs/ValidNonRewrittenPath.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/StaticPathSpecs/ValidNonRewrittenPath.cs index 695f927..a621d73 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/StaticPathSpecs/ValidNonRewrittenPath.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/StaticPathSpecs/ValidNonRewrittenPath.cs @@ -8,24 +8,20 @@ class ValidNonRewrittenPath string _path; StaticPath _result; - [Given] public void GivenANonRewrittenStaticPath() { } - [When] public void WhenItIsParsed() { _result = StaticPath.Parse(_path); } - [Then] public void ThenItIsUnderstoodToNotBeRewritten() { Assert.That(_result.IsRewritten, Is.False); } - [AndThen] public void AndThenThePathPropertiesAreTheSame() { Assert.That(_result.Path, Is.EqualTo(_path)); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/StaticPathSpecs/ValidRewrittenPath.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/StaticPathSpecs/ValidRewrittenPath.cs index 4efab3a..7b659eb 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/StaticPathSpecs/ValidRewrittenPath.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Resolving/StaticPathSpecs/ValidRewrittenPath.cs @@ -8,30 +8,25 @@ class ValidRewrittenPath string _path; StaticPath _result; - [Given] public void GivenARewrittenStaticPath() { } - [When] public void WhenItIsParsed() { _result = StaticPath.Parse(_path); } - [Then] public void ThenItIsUnderstoodToBeRewritten() { Assert.That(_result.IsRewritten, Is.True); } - [AndThen] public void AndTheTheOriginalPathIsCorrect() { Assert.That(_result.OriginalPath, Is.EqualTo("/images/fight-club.png")); } - [AndThen] public void AndTheThePrefixValueIsCorrect() { Assert.That(_result.BlockVersionId.ToString(), Is.EqualTo("a8cbb345-7f9e-4027-88d0-a684892f9d52")); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/ApiPath.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/ApiPath.cs index 5e29c84..075e5c9 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/ApiPath.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/ApiPath.cs @@ -14,13 +14,11 @@ public class ApiPath private RouteInfo _result; - [Given] public void GivenAnOriginPathIsAnApiPath() { // Empty } - [When] public void WhenCreateIsInvoked() { _result = _sut.CreateForNonNodePath( @@ -34,7 +32,6 @@ public void WhenCreateIsInvoked() })); } - [Then] public void ThenTheUriIsRewrittenCorrectly() { Assert.That(_result, Is.Not.Null); @@ -42,13 +39,11 @@ public void ThenTheUriIsRewrittenCorrectly() Assert.That(_result.Uri.AbsolutePath, Is.EqualTo("/api/delivery/projects/website/entries")); } - [AndThen] public void AndThenTheHeadersAreMapped() { Assert.That(_result.Headers.GetFirstValueIfExists(Constants.Headers.Alias) == "zenhub"); } - [AndThen] public void AndThenTheQueryStringValuesAreCorrect() { var query = HttpUtility.ParseQueryString(_result.Uri.Query); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/FullUriRouting.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/FullUriRouting.cs index 1b9c2a2..883d71d 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/FullUriRouting.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/FullUriRouting.cs @@ -20,12 +20,10 @@ public class FullUriRouting private readonly Guid _nodeId = Guid.NewGuid(); private readonly Guid _entryId = Guid.NewGuid(); - [Given] public void GivenABaseUriWithNoEndpointPath() { } - [When] public void WhenCreateIsInvoked() { _result = _sut.Create( @@ -54,7 +52,6 @@ public void WhenCreateIsInvoked() 1)); } - [Then] public void ThenTheUriIsRewrittenCorrectly() { Assert.That(_result, Is.Not.Null); @@ -62,13 +59,11 @@ public void ThenTheUriIsRewrittenCorrectly() Assert.That(_result.Uri.AbsolutePath, Is.EqualTo("/some-path/")); } - [AndThen] public void AndThenTheHeadersAreMapped() { Assert.That(_result.Headers.GetFirstValueIfExists(Constants.Headers.Alias) == "zenhub"); } - [AndThen] public void AndThenTheQueryStringValuesAreCorrect() { var query = HttpUtility.ParseQueryString(_result.Uri.Query); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/FullUriRoutingWithBlockClusterConfig.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/FullUriRoutingWithBlockClusterConfig.cs index d5941bb..005ef18 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/FullUriRoutingWithBlockClusterConfig.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/FullUriRoutingWithBlockClusterConfig.cs @@ -22,12 +22,10 @@ public class FullUriRoutingWithBlockClusterConfig private readonly Guid _nodeId = Guid.NewGuid(); private readonly Guid _entryId = Guid.NewGuid(); - [Given] public void GivenABaseUriWithNoEndpointPath() { } - [When] public void WhenCreateIsInvoked() { _result = _sut.Create( @@ -56,7 +54,6 @@ public void WhenCreateIsInvoked() 1)); } - [Then] public void ThenTheUriIsRewrittenCorrectly() { Assert.That(_result, Is.Not.Null); @@ -64,20 +61,17 @@ public void ThenTheUriIsRewrittenCorrectly() Assert.That(_result.Uri.AbsolutePath, Is.EqualTo("/some-path/")); } - [AndThen] public void AndThenTheHeadersAreMapped() { Assert.That(_result.Headers.GetFirstValueIfExists(Constants.Headers.Alias) == "zenhub"); } - [AndThen] public void AndThenTheBlockClusterDetailsAreSet() { var expectedHost = new Uri(_baseUriString).Host; Assert.That(_result.Headers.GetFirstValueIfExists("host"), Is.EqualTo(expectedHost)); } - [AndThen] public void AndThenTheQueryStringValuesAreCorrect() { var query = HttpUtility.ParseQueryString(_result.Uri.Query); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/IisFallback.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/IisFallback.cs index 4769a15..6d6b13a 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/IisFallback.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/IisFallback.cs @@ -16,12 +16,10 @@ public class IisFallback private RouteInfo _result; - [Given] public void GivenAnOriginPathIsAnIisFallbackUri() { } - [When] public void WhenCreateIsInvoked() { _result = _sut.CreateForIisFallback( @@ -35,7 +33,6 @@ public void WhenCreateIsInvoked() })); } - [Then] public void ThenTheUriIsRewrittenCorrectly() { Assert.That(_result, Is.Not.Null); @@ -43,20 +40,17 @@ public void ThenTheUriIsRewrittenCorrectly() Assert.That(_result.Uri.AbsolutePath, Is.EqualTo("/news/today-is-the-day")); } - [AndThen] public void AndThenTheHeadersAreMapped() { Assert.That(_result.Headers.Values.Count, Is.EqualTo(2)); Assert.That(_result.Headers.GetFirstValueIfExists(Constants.Headers.Alias) == "zenhub"); } - [AndThen] public void AndThenTheHostHeaderIsSetToTheOriginHeader() { Assert.That(_result.Headers.GetFirstValueIfExists("host"), Is.EqualTo("www.mysite.com")); } - [AndThen] public void AndThenTheQueryStringValuesAreCorrect() { var query = HttpUtility.ParseQueryString(_result.Uri.Query); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/ProxyPath.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/ProxyPath.cs index f120134..e0ba911 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/ProxyPath.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/ProxyPath.cs @@ -16,13 +16,11 @@ public class ProxyPath private RouteInfo _result; private readonly Uri _baseUri = new("https://www.legacysite.com"); - [Given] public void GivenAnOriginPathIsAProxyPath() { // Empty } - [When] public void WhenCreateIsInvoked() { _result = _sut.Create( @@ -46,7 +44,6 @@ public void WhenCreateIsInvoked() }); } - [Then] public void ThenTheUriIsRewrittenCorrectly() { Assert.That(_result, Is.Not.Null); @@ -54,13 +51,11 @@ public void ThenTheUriIsRewrittenCorrectly() Assert.That(_result.Uri.AbsolutePath, Is.EqualTo("/news/woman-worlds-longest-nails")); } - [AndThen] public void AndThenTheHeadersAreMapped() { Assert.That(_result.Headers.GetFirstValueIfExists(Constants.Headers.Alias) == "zenhub"); } - [AndThen] public void AndThenTheQueryStringValuesAreCorrect() { var query = HttpUtility.ParseQueryString(_result.Uri.Query); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/StaticResourcePath.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/StaticResourcePath.cs index bf9f216..ed0f4af 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/StaticResourcePath.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteInfoFactorySpecs/StaticResourcePath.cs @@ -16,12 +16,10 @@ public class StaticResourcePath private RouteInfo _result; private readonly string _baseUriString = "http://my-block.contensis.com"; - [Given] public void GivenAStaticResourcePathContainsABlockIdPrefix() { } - [When] public void WhenCreateIsInvoked() { var blockGuid = Guid.NewGuid(); @@ -39,20 +37,17 @@ public void WhenCreateIsInvoked() new BlockVersionInfo(projectUuid, "", blockGuid, new Uri(_baseUriString), "main", false, null, 1)); } - [Then] public void ThenTheUriIsRewrittenCorrectly() { Assert.That(_result, Is.Not.Null); Assert.That(_result.Uri.ToString(), Is.EqualTo(_baseUriString + "/images/header.png?w=100&h=200")); } - [AndThen] public void AndThenTheHeadersAreMapped() { Assert.That(_result.Headers.GetFirstValueIfExists(Constants.Headers.Alias) == "zenhub"); } - [AndThen] public void AndThenTheQueryStringValuesAreCorrect() { var query = HttpUtility.ParseQueryString(_result.Uri.Query); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/NodeDoesNotExistAndRouteIsNotProxied.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/NodeDoesNotExistAndRouteIsNotProxied.cs index c947e61..57600ac 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/NodeDoesNotExistAndRouteIsNotProxied.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/NodeDoesNotExistAndRouteIsNotProxied.cs @@ -16,7 +16,6 @@ public class NodeDoesNotExistAndRouteIsNotProxied private INodeService _nodeService; private RouteInfo _result; - [Given] public void GivenARequestPathDoesNotExistsAsANode() { _nodeService = Substitute.For(); @@ -37,19 +36,16 @@ public void GivenARequestPathDoesNotExistsAsANode() logger); } - [When] public async Task WhenTheRouteIsRequested() { _result = await _sut.GetRouteForRequest(new Uri(Host + Path), new Headers()); } - [Then] public void ThenTheNodeIsLookedUp() { _nodeService.Received(1).GetByPath(Path); } - [AndThen] public void AndThenNoRouteIsReturned() { Assert.That(_result.FoundRoute, Is.EqualTo(false)); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/NodeExistsAndRendererDoesNotMatch.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/NodeExistsAndRendererDoesNotMatch.cs index 74d27ed..e27f4e6 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/NodeExistsAndRendererDoesNotMatch.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/NodeExistsAndRendererDoesNotMatch.cs @@ -16,7 +16,6 @@ public class NodeExistsAndRendererDoesNotMatch private INodeService _nodeService; private RouteInfo _result; - [Given] public void GivenARequestPathExistsAsANode() { var node = new Node @@ -45,24 +44,20 @@ public void GivenARequestPathExistsAsANode() logger); } - [AndGiven] public void AndGivenThereIsNoMatchingRendererForTheRequest() { } - [When] public async Task WhenTheRouteIsRequested() { _result = await _sut.GetRouteForRequest(new Uri(Host + Path), new Headers()); } - [Then] public void ThenTheNodeIsLookedUp() { _nodeService.Received(1).GetByPath(Path); } - [AndThen] public void AndThenNoRouteIsReturned() { Assert.That(_result.FoundRoute, Is.EqualTo(false)); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/NodeExistsAndRendererMatched.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/NodeExistsAndRendererMatched.cs index b54aaf0..1925817 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/NodeExistsAndRendererMatched.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/NodeExistsAndRendererMatched.cs @@ -21,7 +21,6 @@ public class NodeExistsAndRendererMatched private ILocalDevPublishingService _publishingService; private readonly Guid _projectUuid = Guid.NewGuid(); - [Given] public void GivenARequestPathExistsAsANode() { var requestContext = Substitute.For(); @@ -51,19 +50,16 @@ public void GivenARequestPathExistsAsANode() logger); } - [When] public async Task WhenTheRouteIsRequested() { _result = await _sut.GetRouteForRequest(new Uri(Host + Path), new Headers()); } - [Then] public void ThenTheCorrectNodeIsLookedUp() { _nodeService.Received(1).GetByPath(Path); } - [AndThen] public void AndThenTheCorrectRouteInfoIsReturned() { Assert.That(_result, Is.Not.Null); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/NodeExistsAndRendererMatchedWithFullUriRouting.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/NodeExistsAndRendererMatchedWithFullUriRouting.cs index 1a57d2d..5b80020 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/NodeExistsAndRendererMatchedWithFullUriRouting.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/NodeExistsAndRendererMatchedWithFullUriRouting.cs @@ -21,7 +21,6 @@ public class NodeExistsAndRendererMatchedWithFullUriRouting private ILocalDevPublishingService _publishingService; private readonly Guid _projectUuid = Guid.NewGuid(); - [Given] public void GivenARequestPathExistsAsANode() { var requestContext = Substitute.For(); @@ -51,19 +50,16 @@ public void GivenARequestPathExistsAsANode() logger); } - [When] public async Task WhenTheRouteIsRequested() { _result = await _sut.GetRouteForRequest(new Uri(Host + Path), new Headers()); } - [Then] public void ThenTheCorrectNodeIsLookedUp() { _nodeService.Received(1).GetByPath(Path); } - [AndThen] public void AndThenTheCorrectRouteInfoIsReturned() { Assert.That(_result, Is.Not.Null); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/PathIsProxiedApiCall.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/PathIsProxiedApiCall.cs index 86f2b73..ef2cd38 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/PathIsProxiedApiCall.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/PathIsProxiedApiCall.cs @@ -20,7 +20,6 @@ public class PathIsProxiedApiCall private INodeService _nodeService; private RouteInfo _result; - [Given] public void GivenARequestPathIsAnApiCall() { _nodeService = Substitute.For(); @@ -40,19 +39,16 @@ public void GivenARequestPathIsAnApiCall() logger); } - [When] public async Task WhenTheRouteIsRequested() { _result = await _sut.GetRouteForRequest(_originUri, _headers); } - [Then] public void ThenNoNodeLookupIsPerformed() { _nodeService.DidNotReceive().GetByPath(Path); } - [AndThen] public void AndThenTheProxiedUriIsInvoked() { Assert.That(_result.Uri.ToString(), Is.EqualTo(ApiUriString + Path)); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/PathIsRewrittenStaticResource.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/PathIsRewrittenStaticResource.cs index 3327940..e0c6304 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/PathIsRewrittenStaticResource.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/PathIsRewrittenStaticResource.cs @@ -16,7 +16,6 @@ public class PathIsRewrittenStaticResource private RouteInfo _result; private readonly Guid _projectUuid = Guid.NewGuid(); - [Given] public void GivenARequestPathIsARewrittenStaticResourcePath() { _nodeService = Substitute.For(); @@ -42,19 +41,16 @@ public void GivenARequestPathIsARewrittenStaticResourcePath() logger); } - [When] public async Task WhenTheRouteIsRequested() { _result = await _sut.GetRouteForRequest(new Uri("http://www.origin.com" + _requestPath), new Headers()); } - [Then] public void ThenNoNodeIsLookedUp() { _nodeService.DidNotReceive().GetByPath(_requestPath); } - [AndThen] public void AndThenARouteIsReturnedWithTheInternalResourceUri() { Assert.That(_result, Is.Not.Null); @@ -63,7 +59,6 @@ public void AndThenARouteIsReturnedWithTheInternalResourceUri() Is.EqualTo("http://website.com/static/images/header.png")); } - [AndThen] public void AndThenTheCorrectBlockVersionStaticPathsAreSet() { Assert.That(_result.BlockVersionInfo, Is.Not.Null); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/PathIsRewrittenStaticResourceWithQueryString.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/PathIsRewrittenStaticResourceWithQueryString.cs index 3407f71..af87d23 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/PathIsRewrittenStaticResourceWithQueryString.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/PathIsRewrittenStaticResourceWithQueryString.cs @@ -18,7 +18,6 @@ public class PathIsRewrittenStaticResourceWithQueryString private readonly Headers _headers = new(); private readonly Guid _projectUuid = Guid.NewGuid(); - [Given] public void GivenARequestPathIsARewrittenStaticResourcePathWithAQueryString() { _nodeService = Substitute.For(); @@ -44,19 +43,16 @@ public void GivenARequestPathIsARewrittenStaticResourcePathWithAQueryString() logger); } - [When] public async Task WhenTheRouteIsRequested() { _result = await _sut.GetRouteForRequest(_originUri, _headers); } - [Then] public void ThenNoNodeIsLookedUp() { _nodeService.DidNotReceive().GetByPath(_requestPath); } - [AndThen] public void AndThenARouteIsReturnedWithTheInternalResourceUri() { Assert.That(_result, Is.Not.Null); @@ -65,7 +61,6 @@ public void AndThenARouteIsReturnedWithTheInternalResourceUri() Is.EqualTo("http://website.com/static/images/header.png?foo=bar")); } - [AndThen] public void AndThenTheCorrectBlockVersionStaticPathsAreSet() { Assert.That(_result.BlockVersionInfo, Is.Not.Null); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/ShouldNotPerformNodeLookupIfExcludedPath.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/ShouldNotPerformNodeLookupIfExcludedPath.cs index f5e0935..e744876 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/ShouldNotPerformNodeLookupIfExcludedPath.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/ShouldNotPerformNodeLookupIfExcludedPath.cs @@ -13,7 +13,6 @@ public class ShouldNotPerformNodeLookupIfExcludedPath private INodeService _nodeService; private string _relativePathAndQuery; - [Given] public void GivenARequestPathIsAnExcludedPath() { _nodeService = Substitute.For(); @@ -33,13 +32,11 @@ public void GivenARequestPathIsAnExcludedPath() logger); } - [When] public async Task WhenTheRouteIsRequested() { await _sut.GetRouteForRequest(new Uri("http://www.mysite.com" + _relativePathAndQuery), new Headers()); } - [Then] public void ThenANodeLookupIsNotInvoked() { var indexOfStartOfQuery = _relativePathAndQuery.IndexOf("?", StringComparison.InvariantCultureIgnoreCase); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/ShouldPerformNodeLookup.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/ShouldPerformNodeLookup.cs index 0416df8..ce672ae 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/ShouldPerformNodeLookup.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/RouteServiceSpecs/ShouldPerformNodeLookup.cs @@ -14,7 +14,6 @@ public class ShouldPerformNodeLookup private string _requestPathAndQuery; private string _nodePathAndQuery; - [Given] public void GivenARequestPathIsAnExcludedPath() { _nodeService = Substitute.For(); @@ -34,13 +33,11 @@ public void GivenARequestPathIsAnExcludedPath() logger); } - [When] public async Task WhenTheRouteIsRequested() { await _sut.GetRouteForRequest(new Uri("http://www.mysite.com" + _requestPathAndQuery), new Headers()); } - [Then] public void ThenANodeLookupIsInvoked() { var indexOfStartOfQuery = _nodePathAndQuery.IndexOf("?", StringComparison.InvariantCultureIgnoreCase); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/ServerTypeResolverSpecs/ShouldResolveForInvalidData.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/ServerTypeResolverSpecs/ShouldResolveForInvalidData.cs index c75928a..f92c73c 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/ServerTypeResolverSpecs/ShouldResolveForInvalidData.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/ServerTypeResolverSpecs/ShouldResolveForInvalidData.cs @@ -10,19 +10,16 @@ public class ShouldResolveForInvalidData private ServerTypeResolver _sut; private ServerType _serverType; - [Given] public void GivenAServerTypeResolver() { _sut = new ServerTypeResolver(); } - [When] public void WhenTheServerTypeIsResolvedForInvalidData() { _serverType = _sut.GetServerType(); } - [Then] public void ThenTheServerTypeIsCorrect() { Assert.That(_serverType, Is.EqualTo(ServerType.Live)); diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/ServerTypeResolverSpecs/ShouldResolveForValidData.cs b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/ServerTypeResolverSpecs/ShouldResolveForValidData.cs index 3035bec..dae1453 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/ServerTypeResolverSpecs/ShouldResolveForValidData.cs +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/Services/ServerTypeResolverSpecs/ShouldResolveForValidData.cs @@ -11,19 +11,16 @@ public class ShouldResolveForValidData private ServerType _serverType; private ServerType _expectedServerType; - [Given] public void GivenAServerTypeResolver() { _sut = new ServerTypeResolver(); } - [When] public void WhenTheServerTypeIsResolvedForValidData() { _serverType = _sut.GetServerType(); } - [Then] public void ThenTheServerTypeIsCorrect() { Assert.That(_serverType, Is.EqualTo(_expectedServerType));