Nell/eShopOnWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed SCSS variables reference issue (#218)

Browse Source 
Fixed tests relying on /sign-in renamed to /login
This commit is contained in:
Steve Smith
2019-02-22 12:58:36 -05:00
committed by GitHub
parent 55efad912f
commit f5a17ec635
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Web/wwwroot/css/basket/basket-status/basket-status.component.css
View File

@@ -40,4 +40,3 @@
background-color: transparent; background-color: transparent;
color: #75b918; color: #75b918;
transition: all 0.35s; } transition: all 0.35s; }

2
src/Web/wwwroot/css/basket/basket-status/basket-status.component.min.css vendored
View File

@@ -1 +1 @@
.esh-basketstatus{cursor:pointer;display:inline-block;float:right;position:relative;transition:all .35s;}.esh-basketstatus.is-disabled{opacity:.5;pointer-events:none;}.esh-basketstatus-image{height:100px;margin-top:.5rem;}.esh-basketstatus-badge{background-color:#83d01b;border-radius:50%;color:#fff;display:block;height:1.5rem;left:50%;position:absolute;text-align:center;top:0;transform:translateX(-38%);transition:all .35s;width:1.5rem;}.esh-basketstatus-badge-inoperative{background-color:#f00;border-radius:50%;color:#fff;display:block;height:1.5rem;left:50%;position:absolute;text-align:center;top:0;transform:translateX(-38%);transition:all .35s;width:1.5rem;}.esh-basketstatus:hover .esh-basketstatus-badge{background-color:transparent;color:#75b918;transition:all .35s;} .esh-basketstatus{cursor:pointer;display:inline-block;float:right;position:relative;transition:all .35s;}.esh-basketstatus.is-disabled{opacity:.5;pointer-events:none;}.esh-basketstatus-image{height:36px;margin-top:.5rem;}.esh-basketstatus-badge{background-color:#83d01b;border-radius:50%;color:#fff;display:block;height:1.5rem;left:50%;position:absolute;text-align:center;top:0;transform:translateX(-38%);transition:all .35s;width:1.5rem;}.esh-basketstatus-badge-inoperative{background-color:#f00;border-radius:50%;color:#fff;display:block;height:1.5rem;left:50%;position:absolute;text-align:center;top:0;transform:translateX(-38%);transition:all .35s;width:1.5rem;}.esh-basketstatus:hover .esh-basketstatus-badge{background-color:transparent;color:#75b918;transition:all .35s;}

2
src/Web/wwwroot/css/basket/basket-status/basket-status.component.scss
View File

@@ -1,4 +1,4 @@
@import '../../variables'; @import '../../_variables.scss';
.esh-basketstatus { .esh-basketstatus {
cursor: pointer; cursor: pointer;

6
tests/FunctionalTests/Web/Controllers/AccountControllerSignIn.cs
View File

@@ -26,7 +26,7 @@ namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers
[Fact] [Fact]
public async Task ReturnsSignInScreenOnGet() public async Task ReturnsSignInScreenOnGet()
{ {
var response = await Client.GetAsync("/account/sign-in"); var response = await Client.GetAsync("/identity/account/login");
response.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
var stringResponse = await response.Content.ReadAsStringAsync(); var stringResponse = await response.Content.ReadAsStringAsync();
@@ -50,7 +50,7 @@ namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers
[Fact] [Fact]
public async Task ReturnsFormWithRequestVerificationToken() public async Task ReturnsFormWithRequestVerificationToken()
{ {
var response = await Client.GetAsync("/account/sign-in"); var response = await Client.GetAsync("/identity/account/login");
response.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
var stringResponse = await response.Content.ReadAsStringAsync(); var stringResponse = await response.Content.ReadAsStringAsync();
@@ -69,7 +69,7 @@ namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers
[Fact] [Fact]
public async Task ReturnsSuccessfulSignInOnPostWithValidCredentials() public async Task ReturnsSuccessfulSignInOnPostWithValidCredentials()
{ {
var getResponse = await Client.GetAsync("/account/sign-in"); var getResponse = await Client.GetAsync("/identity/account/login");
getResponse.EnsureSuccessStatusCode(); getResponse.EnsureSuccessStatusCode();
var stringResponse1 = await getResponse.Content.ReadAsStringAsync(); var stringResponse1 = await getResponse.Content.ReadAsStringAsync();
string token = GetRequestVerificationToken(stringResponse1); string token = GetRequestVerificationToken(stringResponse1);

2
tests/FunctionalTests/Web/Controllers/OrderControllerIndex.cs
View File

@@ -26,7 +26,7 @@ namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers
var redirectLocation = response.Headers.Location.OriginalString; var redirectLocation = response.Headers.Location.OriginalString;
Assert.Equal(HttpStatusCode.Redirect, response.StatusCode); Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
Assert.Contains("Account/Signin", redirectLocation); Assert.Contains("/Account/Login", redirectLocation);
} }
} }
} }