Shady nagy/net6 (#614)
* udated to .net6 * used the .net6 version RC2 * added editconfig. * App core new Scoped Namespaces style. * BlazorAdmin new Scoped Namespaces style. * Blazor Shared new Scoped Namespaces style. * Infra new Scoped Namespaces style. * public api new Scoped Namespaces style. * web new Scoped Namespaces style. * FunctionalTests new Scoped Namespaces style. * Integrational tests new Scoped Namespaces style. * unit tests new Scoped Namespaces style. * update github action. * update github action. * change the global.
This commit is contained in:
Shady Nagy
GitHub
@@ -1,89 +1,88 @@
|
||||
using Microsoft.AspNetCore.Mvc.Testing;
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Net.Http;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Mvc.Testing;
|
||||
using Xunit;
|
||||
|
||||
namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers
|
||||
namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers;
|
||||
|
||||
[Collection("Sequential")]
|
||||
public class AccountControllerSignIn : IClassFixture<WebTestFixture>
|
||||
{
|
||||
[Collection("Sequential")]
|
||||
public class AccountControllerSignIn : IClassFixture<WebTestFixture>
|
||||
public AccountControllerSignIn(WebTestFixture factory)
|
||||
{
|
||||
public AccountControllerSignIn(WebTestFixture factory)
|
||||
Client = factory.CreateClient(new WebApplicationFactoryClientOptions
|
||||
{
|
||||
Client = factory.CreateClient(new WebApplicationFactoryClientOptions
|
||||
{
|
||||
AllowAutoRedirect = false
|
||||
});
|
||||
}
|
||||
AllowAutoRedirect = false
|
||||
});
|
||||
}
|
||||
|
||||
public HttpClient Client { get; }
|
||||
public HttpClient Client { get; }
|
||||
|
||||
[Fact]
|
||||
public async Task ReturnsSignInScreenOnGet()
|
||||
{
|
||||
var response = await Client.GetAsync("/identity/account/login");
|
||||
response.EnsureSuccessStatusCode();
|
||||
var stringResponse = await response.Content.ReadAsStringAsync();
|
||||
[Fact]
|
||||
public async Task ReturnsSignInScreenOnGet()
|
||||
{
|
||||
var response = await Client.GetAsync("/identity/account/login");
|
||||
response.EnsureSuccessStatusCode();
|
||||
var stringResponse = await response.Content.ReadAsStringAsync();
|
||||
|
||||
Assert.Contains("demouser@microsoft.com", stringResponse);
|
||||
}
|
||||
Assert.Contains("demouser@microsoft.com", stringResponse);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void RegexMatchesValidRequestVerificationToken()
|
||||
{
|
||||
// TODO: Move to a unit test
|
||||
// TODO: Move regex to a constant in test project
|
||||
var input = @"<input name=""__RequestVerificationToken"" type=""hidden"" value=""CfDJ8Obhlq65OzlDkoBvsSX0tgxFUkIZ_qDDSt49D_StnYwphIyXO4zxfjopCWsygfOkngsL6P0tPmS2HTB1oYW-p_JzE0_MCFb7tF9Ol_qoOg_IC_yTjBNChF0qRgoZPmKYOIJigg7e2rsBsmMZDTdbnGo"" /><input name=""RememberMe"" type=""hidden"" value=""false"" /></form>";
|
||||
string regexpression = @"name=""__RequestVerificationToken"" type=""hidden"" value=""([-A-Za-z0-9+=/\\_]+?)""";
|
||||
var regex = new Regex(regexpression);
|
||||
var match = regex.Match(input);
|
||||
var group = match.Groups.Values.LastOrDefault();
|
||||
Assert.NotNull(group);
|
||||
Assert.True(group.Value.Length > 50);
|
||||
}
|
||||
[Fact]
|
||||
public void RegexMatchesValidRequestVerificationToken()
|
||||
{
|
||||
// TODO: Move to a unit test
|
||||
// TODO: Move regex to a constant in test project
|
||||
var input = @"<input name=""__RequestVerificationToken"" type=""hidden"" value=""CfDJ8Obhlq65OzlDkoBvsSX0tgxFUkIZ_qDDSt49D_StnYwphIyXO4zxfjopCWsygfOkngsL6P0tPmS2HTB1oYW-p_JzE0_MCFb7tF9Ol_qoOg_IC_yTjBNChF0qRgoZPmKYOIJigg7e2rsBsmMZDTdbnGo"" /><input name=""RememberMe"" type=""hidden"" value=""false"" /></form>";
|
||||
string regexpression = @"name=""__RequestVerificationToken"" type=""hidden"" value=""([-A-Za-z0-9+=/\\_]+?)""";
|
||||
var regex = new Regex(regexpression);
|
||||
var match = regex.Match(input);
|
||||
var group = match.Groups.Values.LastOrDefault();
|
||||
Assert.NotNull(group);
|
||||
Assert.True(group.Value.Length > 50);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ReturnsFormWithRequestVerificationToken()
|
||||
{
|
||||
var response = await Client.GetAsync("/identity/account/login");
|
||||
response.EnsureSuccessStatusCode();
|
||||
var stringResponse = await response.Content.ReadAsStringAsync();
|
||||
[Fact]
|
||||
public async Task ReturnsFormWithRequestVerificationToken()
|
||||
{
|
||||
var response = await Client.GetAsync("/identity/account/login");
|
||||
response.EnsureSuccessStatusCode();
|
||||
var stringResponse = await response.Content.ReadAsStringAsync();
|
||||
|
||||
string token = GetRequestVerificationToken(stringResponse);
|
||||
Assert.True(token.Length > 50);
|
||||
}
|
||||
string token = GetRequestVerificationToken(stringResponse);
|
||||
Assert.True(token.Length > 50);
|
||||
}
|
||||
|
||||
private string GetRequestVerificationToken(string input)
|
||||
{
|
||||
string regexpression = @"name=""__RequestVerificationToken"" type=""hidden"" value=""([-A-Za-z0-9+=/\\_]+?)""";
|
||||
var regex = new Regex(regexpression);
|
||||
var match = regex.Match(input);
|
||||
return match.Groups.Values.LastOrDefault().Value;
|
||||
}
|
||||
private string GetRequestVerificationToken(string input)
|
||||
{
|
||||
string regexpression = @"name=""__RequestVerificationToken"" type=""hidden"" value=""([-A-Za-z0-9+=/\\_]+?)""";
|
||||
var regex = new Regex(regexpression);
|
||||
var match = regex.Match(input);
|
||||
return match.Groups.Values.LastOrDefault().Value;
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ReturnsSuccessfulSignInOnPostWithValidCredentials()
|
||||
{
|
||||
var getResponse = await Client.GetAsync("/identity/account/login");
|
||||
getResponse.EnsureSuccessStatusCode();
|
||||
var stringResponse1 = await getResponse.Content.ReadAsStringAsync();
|
||||
string token = GetRequestVerificationToken(stringResponse1);
|
||||
[Fact]
|
||||
public async Task ReturnsSuccessfulSignInOnPostWithValidCredentials()
|
||||
{
|
||||
var getResponse = await Client.GetAsync("/identity/account/login");
|
||||
getResponse.EnsureSuccessStatusCode();
|
||||
var stringResponse1 = await getResponse.Content.ReadAsStringAsync();
|
||||
string token = GetRequestVerificationToken(stringResponse1);
|
||||
|
||||
var keyValues = new List<KeyValuePair<string, string>>();
|
||||
keyValues.Add(new KeyValuePair<string, string>("Email", "demouser@microsoft.com"));
|
||||
keyValues.Add(new KeyValuePair<string, string>("Password", "Pass@word1"));
|
||||
var keyValues = new List<KeyValuePair<string, string>>();
|
||||
keyValues.Add(new KeyValuePair<string, string>("Email", "demouser@microsoft.com"));
|
||||
keyValues.Add(new KeyValuePair<string, string>("Password", "Pass@word1"));
|
||||
|
||||
keyValues.Add(new KeyValuePair<string, string>("__RequestVerificationToken", token));
|
||||
var formContent = new FormUrlEncodedContent(keyValues);
|
||||
keyValues.Add(new KeyValuePair<string, string>("__RequestVerificationToken", token));
|
||||
var formContent = new FormUrlEncodedContent(keyValues);
|
||||
|
||||
var postResponse = await Client.PostAsync("/identity/account/login", formContent);
|
||||
Assert.Equal(HttpStatusCode.Redirect, postResponse.StatusCode);
|
||||
Assert.Equal(new System.Uri("/", UriKind.Relative), postResponse.Headers.Location);
|
||||
}
|
||||
var postResponse = await Client.PostAsync("/identity/account/login", formContent);
|
||||
Assert.Equal(HttpStatusCode.Redirect, postResponse.StatusCode);
|
||||
Assert.Equal(new System.Uri("/", UriKind.Relative), postResponse.Headers.Location);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,28 +2,27 @@
|
||||
using System.Threading.Tasks;
|
||||
using Xunit;
|
||||
|
||||
namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers
|
||||
namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers;
|
||||
|
||||
[Collection("Sequential")]
|
||||
public class CatalogControllerIndex : IClassFixture<WebTestFixture>
|
||||
{
|
||||
[Collection("Sequential")]
|
||||
public class CatalogControllerIndex : IClassFixture<WebTestFixture>
|
||||
public CatalogControllerIndex(WebTestFixture factory)
|
||||
{
|
||||
public CatalogControllerIndex(WebTestFixture factory)
|
||||
{
|
||||
Client = factory.CreateClient();
|
||||
}
|
||||
Client = factory.CreateClient();
|
||||
}
|
||||
|
||||
public HttpClient Client { get; }
|
||||
public HttpClient Client { get; }
|
||||
|
||||
[Fact]
|
||||
public async Task ReturnsHomePageWithProductListing()
|
||||
{
|
||||
// Arrange & Act
|
||||
var response = await Client.GetAsync("/");
|
||||
response.EnsureSuccessStatusCode();
|
||||
var stringResponse = await response.Content.ReadAsStringAsync();
|
||||
[Fact]
|
||||
public async Task ReturnsHomePageWithProductListing()
|
||||
{
|
||||
// Arrange & Act
|
||||
var response = await Client.GetAsync("/");
|
||||
response.EnsureSuccessStatusCode();
|
||||
var stringResponse = await response.Content.ReadAsStringAsync();
|
||||
|
||||
// Assert
|
||||
Assert.Contains(".NET Bot Black Sweatshirt", stringResponse);
|
||||
}
|
||||
// Assert
|
||||
Assert.Contains(".NET Bot Black Sweatshirt", stringResponse);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,32 +1,31 @@
|
||||
using Microsoft.AspNetCore.Mvc.Testing;
|
||||
using System.Net;
|
||||
using System.Net;
|
||||
using System.Net.Http;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Mvc.Testing;
|
||||
using Xunit;
|
||||
|
||||
namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers
|
||||
namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers;
|
||||
|
||||
[Collection("Sequential")]
|
||||
public class OrderIndexOnGet : IClassFixture<WebTestFixture>
|
||||
{
|
||||
[Collection("Sequential")]
|
||||
public class OrderIndexOnGet : IClassFixture<WebTestFixture>
|
||||
public OrderIndexOnGet(WebTestFixture factory)
|
||||
{
|
||||
public OrderIndexOnGet(WebTestFixture factory)
|
||||
Client = factory.CreateClient(new WebApplicationFactoryClientOptions
|
||||
{
|
||||
Client = factory.CreateClient(new WebApplicationFactoryClientOptions
|
||||
{
|
||||
AllowAutoRedirect = false
|
||||
});
|
||||
}
|
||||
AllowAutoRedirect = false
|
||||
});
|
||||
}
|
||||
|
||||
public HttpClient Client { get; }
|
||||
public HttpClient Client { get; }
|
||||
|
||||
[Fact]
|
||||
public async Task ReturnsRedirectGivenAnonymousUser()
|
||||
{
|
||||
var response = await Client.GetAsync("/order/my-orders");
|
||||
var redirectLocation = response.Headers.Location.OriginalString;
|
||||
[Fact]
|
||||
public async Task ReturnsRedirectGivenAnonymousUser()
|
||||
{
|
||||
var response = await Client.GetAsync("/order/my-orders");
|
||||
var redirectLocation = response.Headers.Location.OriginalString;
|
||||
|
||||
Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
|
||||
Assert.Contains("/Account/Login", redirectLocation);
|
||||
}
|
||||
Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
|
||||
Assert.Contains("/Account/Login", redirectLocation);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user