From 7b45ab206566100b075e68f015cb6b85e18f6c32 Mon Sep 17 00:00:00 2001 From: Praburaj Date: Fri, 13 Feb 2015 16:58:53 -0800 Subject: [PATCH] Fixing test Using a non-redirecting handler while sending logout request to shield from external changes. --- .../Implementation/OpenIdConnectLoginScenarios.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test/E2ETests/Implementation/OpenIdConnectLoginScenarios.cs b/test/E2ETests/Implementation/OpenIdConnectLoginScenarios.cs index 9221b6f5c9..543bbd38e2 100644 --- a/test/E2ETests/Implementation/OpenIdConnectLoginScenarios.cs +++ b/test/E2ETests/Implementation/OpenIdConnectLoginScenarios.cs @@ -94,12 +94,17 @@ namespace E2ETests }; content = new FormUrlEncodedContent(formParameters.ToArray()); + // Need a non-redirecting handler + var handler = new HttpClientHandler() { AllowAutoRedirect = false }; + handler.CookieContainer.Add(_httpClientHandler.CookieContainer.GetCookies(new Uri(_applicationBaseUrl))); + _httpClient = new HttpClient(handler) { BaseAddress = new Uri(_applicationBaseUrl) }; + response = _httpClient.PostAsync("Account/LogOff", content).Result; - Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_applicationBaseUrl)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.Application")); + Assert.Null(handler.CookieContainer.GetCookies(new Uri(_applicationBaseUrl)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.Application")); Assert.Equal( "https://login.windows.net/4afbc689-805b-48cf-a24c-d4aa3248a248/oauth2/logout", - response.RequestMessage.RequestUri.AbsoluteUri.Replace(response.RequestMessage.RequestUri.Query, string.Empty)); - queryItems = new ReadableStringCollection(QueryHelpers.ParseQuery(response.RequestMessage.RequestUri.Query)); + response.Headers.Location.AbsoluteUri.Replace(response.Headers.Location.Query, string.Empty)); + queryItems = new ReadableStringCollection(QueryHelpers.ParseQuery(response.Headers.Location.Query)); Assert.Equal(_applicationBaseUrl + "Account/Login", queryItems["post_logout_redirect_uri"]); } }