Skip to content

Fix Issue-171 by adding a validation to check for querystring paramet… #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 10, 2020
Merged

Fix Issue-171 by adding a validation to check for querystring paramet… #185

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c3268c
Fix Issue-171 by adding a validation to check for querystring paramet…
Jun 8, 2020
d9377c8
issue-171 - Add unit tests
Jun 9, 2020
39d67e9
Update tests/Geta.404Handler.Tests/CustomRedirectCollectionTests.cs
marisks Jun 9, 2020
5fef2a7
issue-171 - Change if statement to ternary operator
Jun 9, 2020
4b6d7af
Merge branch 'bugfix/issue-171-fix-trailingslash-with-parameters' of …
Jun 9, 2020
9358e2c
Update src/Geta.404Handler/Core/CustomRedirects/CustomRedirectCollect…
marisks Jun 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Geta.404Handler/Core/CustomRedirects/CustomRedirectCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ string RemoveSlash(string s)
}

var redirCopy = new CustomRedirect(cr);
var newUrl = AppendSlash(redirCopy.NewUrl);
var newUrl = (url.IndexOf("?", StringComparison.Ordinal) > 0) ? redirCopy.NewUrl : AppendSlash(redirCopy.NewUrl);
var appendSegment = RemoveSlash(url.Substring(oldUrl.Length));
redirCopy.NewUrl = $"{newUrl}{appendSegment}";
return redirCopy;
Expand Down
64 changes: 62 additions & 2 deletions tests/Geta.404Handler.Tests/CustomRedirectCollectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Web;
using BVNetwork.NotFound.Core;
Expand Down Expand Up @@ -276,5 +276,65 @@ public void Find_gives_nullreferenceexception_with_partial_deleted_hit()

Assert.NotNull(actual);
}

/// <summary>
/// https://github.com/Geta/404handler/issues/171
/// </summary>
[Fact]
public void Find_does_not_add_slash_when_querystring_parameter()
{
var collection = new CustomRedirectCollection
{
new CustomRedirect("/content/file", "/legacy"),
new CustomRedirect("/content/file/", "/legacy/")
};

var urlToFind = "/content/file?doc=filename";
var expected = "/legacy?doc=filename";

var actual = collection.Find(urlToFind.ToUri());

Assert.Equal(expected, actual.NewUrl);
}

/// <summary>
/// https://github.com/Geta/404handler/issues/171
/// </summary>
[Fact]
public void Find_does_keep_slash_when_querystring_parameter()
{
var collection = new CustomRedirectCollection
{
new CustomRedirect("/content/file", "/legacy"),
new CustomRedirect("/content/file/", "/legacy/")
};

var urlToFind = "/content/file/?doc=filename";
var expected = "/legacy/?doc=filename";

var actual = collection.Find(urlToFind.ToUri());

Assert.Equal(expected, actual.NewUrl);
}

/// <summary>
/// https://github.com/Geta/404handler/issues/171
/// </summary>
[Fact]
public void Find_does_not_add_slash_when_querystring_parameters()
{
var collection = new CustomRedirectCollection
{
new CustomRedirect("/content/file", "/legacy"),
new CustomRedirect("/content/file/", "/legacy/")
};

var urlToFind = "/content/file?doc=filename&param2=value";
var expected = "/legacy?doc=filename&param2=value";

var actual = collection.Find(urlToFind.ToUri());

Assert.Equal(expected, actual.NewUrl);
}
}
}
}