Browse Source
Fixed SCSS variables reference issue (#218)
Fixed tests relying on /sign-in renamed to /login
main
Steve Smith
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
6 additions and
7 deletions
-
src/Web/wwwroot/css/basket/basket-status/basket-status.component.css
-
src/Web/wwwroot/css/basket/basket-status/basket-status.component.min.css
-
src/Web/wwwroot/css/basket/basket-status/basket-status.component.scss
-
tests/FunctionalTests/Web/Controllers/AccountControllerSignIn.cs
-
tests/FunctionalTests/Web/Controllers/OrderControllerIndex.cs
|
|
|
@ -40,4 +40,3 @@ |
|
|
|
background-color: transparent; |
|
|
|
color: #75b918; |
|
|
|
transition: all 0.35s; } |
|
|
|
|
|
|
|
|
|
|
|
@ -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;} |
|
|
|
@ -1,4 +1,4 @@ |
|
|
|
@import '../../variables'; |
|
|
|
@import '../../_variables.scss'; |
|
|
|
|
|
|
|
.esh-basketstatus { |
|
|
|
cursor: pointer; |
|
|
|
|
|
|
|
@ -26,7 +26,7 @@ namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers |
|
|
|
[Fact] |
|
|
|
public async Task ReturnsSignInScreenOnGet() |
|
|
|
{ |
|
|
|
var response = await Client.GetAsync("/account/sign-in"); |
|
|
|
var response = await Client.GetAsync("/identity/account/login"); |
|
|
|
response.EnsureSuccessStatusCode(); |
|
|
|
var stringResponse = await response.Content.ReadAsStringAsync(); |
|
|
|
|
|
|
|
@ -50,7 +50,7 @@ namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers |
|
|
|
[Fact] |
|
|
|
public async Task ReturnsFormWithRequestVerificationToken() |
|
|
|
{ |
|
|
|
var response = await Client.GetAsync("/account/sign-in"); |
|
|
|
var response = await Client.GetAsync("/identity/account/login"); |
|
|
|
response.EnsureSuccessStatusCode(); |
|
|
|
var stringResponse = await response.Content.ReadAsStringAsync(); |
|
|
|
|
|
|
|
@ -69,7 +69,7 @@ namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers |
|
|
|
[Fact] |
|
|
|
public async Task ReturnsSuccessfulSignInOnPostWithValidCredentials() |
|
|
|
{ |
|
|
|
var getResponse = await Client.GetAsync("/account/sign-in"); |
|
|
|
var getResponse = await Client.GetAsync("/identity/account/login"); |
|
|
|
getResponse.EnsureSuccessStatusCode(); |
|
|
|
var stringResponse1 = await getResponse.Content.ReadAsStringAsync(); |
|
|
|
string token = GetRequestVerificationToken(stringResponse1); |
|
|
|
|
|
|
|
@ -26,7 +26,7 @@ namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers |
|
|
|
var redirectLocation = response.Headers.Location.OriginalString; |
|
|
|
|
|
|
|
Assert.Equal(HttpStatusCode.Redirect, response.StatusCode); |
|
|
|
Assert.Contains("Account/Signin", redirectLocation); |
|
|
|
Assert.Contains("/Account/Login", redirectLocation); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|