From f5a17ec635a20180302412081be980d9a9cc35dc Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Fri, 22 Feb 2019 12:58:36 -0500 Subject: [PATCH] Fixed SCSS variables reference issue (#218) Fixed tests relying on /sign-in renamed to /login --- .../css/basket/basket-status/basket-status.component.css | 1 - .../basket/basket-status/basket-status.component.min.css | 2 +- .../css/basket/basket-status/basket-status.component.scss | 2 +- .../Web/Controllers/AccountControllerSignIn.cs | 6 +++--- .../FunctionalTests/Web/Controllers/OrderControllerIndex.cs | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Web/wwwroot/css/basket/basket-status/basket-status.component.css b/src/Web/wwwroot/css/basket/basket-status/basket-status.component.css index 8597d36..382ee09 100644 --- a/src/Web/wwwroot/css/basket/basket-status/basket-status.component.css +++ b/src/Web/wwwroot/css/basket/basket-status/basket-status.component.css @@ -40,4 +40,3 @@ background-color: transparent; color: #75b918; transition: all 0.35s; } - diff --git a/src/Web/wwwroot/css/basket/basket-status/basket-status.component.min.css b/src/Web/wwwroot/css/basket/basket-status/basket-status.component.min.css index 19be16b..cc34f15 100644 --- a/src/Web/wwwroot/css/basket/basket-status/basket-status.component.min.css +++ b/src/Web/wwwroot/css/basket/basket-status/basket-status.component.min.css @@ -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;} \ No newline at end of file +.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;} \ No newline at end of file diff --git a/src/Web/wwwroot/css/basket/basket-status/basket-status.component.scss b/src/Web/wwwroot/css/basket/basket-status/basket-status.component.scss index 5dd28de..2872e7f 100644 --- a/src/Web/wwwroot/css/basket/basket-status/basket-status.component.scss +++ b/src/Web/wwwroot/css/basket/basket-status/basket-status.component.scss @@ -1,4 +1,4 @@ -@import '../../variables'; +@import '../../_variables.scss'; .esh-basketstatus { cursor: pointer; diff --git a/tests/FunctionalTests/Web/Controllers/AccountControllerSignIn.cs b/tests/FunctionalTests/Web/Controllers/AccountControllerSignIn.cs index 28697c4..83e19e5 100644 --- a/tests/FunctionalTests/Web/Controllers/AccountControllerSignIn.cs +++ b/tests/FunctionalTests/Web/Controllers/AccountControllerSignIn.cs @@ -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); diff --git a/tests/FunctionalTests/Web/Controllers/OrderControllerIndex.cs b/tests/FunctionalTests/Web/Controllers/OrderControllerIndex.cs index 3e04b26..ca43800 100644 --- a/tests/FunctionalTests/Web/Controllers/OrderControllerIndex.cs +++ b/tests/FunctionalTests/Web/Controllers/OrderControllerIndex.cs @@ -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); } } }