huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reacting to Localization CookieName change

This commit is contained in:
Pranav K 2016-03-04 10:30:35 -08:00
parent 3aa3799494
commit 7bd7b32fcb
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Mvc.Localization/ViewLocalizer.cs
View File

@ -8,7 +8,7 @@ using System.Globalization;
using System.IO; using System.IO;
using System.Text; using System.Text;
using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.Extensions.Localization; using Microsoft.Extensions.Localization;
using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.PlatformAbstractions;

7
test/Microsoft.AspNetCore.Mvc.FunctionalTests/LocalizationSampleTest.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net.Http; using System.Net.Http;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Localization;
using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing;
using Microsoft.Net.Http.Headers; using Microsoft.Net.Http.Headers;
using Xunit; using Xunit;
@ -61,7 +62,7 @@ mypartial
var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/"); var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/");
request.Headers.Add( request.Headers.Add(
"Cookie", "Cookie",
new CookieHeaderValue("ASPNET_CULTURE", cultureCookie).ToString()); new CookieHeaderValue(CookieRequestCultureProvider.DefaultCookieName, cultureCookie).ToString());
// Act // Act
var response = await Client.SendAsync(request); var response = await Client.SendAsync(request);
@ -99,7 +100,7 @@ mypartial
var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/Home/Locpage"); var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/Home/Locpage");
request.Headers.Add( request.Headers.Add(
"Cookie", "Cookie",
new CookieHeaderValue("ASPNET_CULTURE", cultureCookie).ToString()); new CookieHeaderValue(CookieRequestCultureProvider.DefaultCookieName, cultureCookie).ToString());
// Act // Act
var response = await Client.SendAsync(request); var response = await Client.SendAsync(request);
@ -126,7 +127,7 @@ mypartial
var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/Home/GetInvalidUser"); var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/Home/GetInvalidUser");
request.Headers.Add( request.Headers.Add(
"Cookie", "Cookie",
new CookieHeaderValue("ASPNET_CULTURE", cultureCookie).ToString()); new CookieHeaderValue(CookieRequestCultureProvider.DefaultCookieName, cultureCookie).ToString());
// Act // Act
var response = await Client.SendAsync(request); var response = await Client.SendAsync(request);

7
test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs
View File

@ -5,6 +5,7 @@ using System.Collections.Generic;
using System.Net.Http; using System.Net.Http;
using System.Reflection; using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Localization;
using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing;
using Microsoft.Net.Http.Headers; using Microsoft.Net.Http.Headers;
using Xunit; using Xunit;
@ -148,7 +149,8 @@ expander-partial";
// Arrange // Arrange
var cultureCookie = "c=" + value + "|uic=" + value; var cultureCookie = "c=" + value + "|uic=" + value;
var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/TemplateExpander"); var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/TemplateExpander");
request.Headers.Add("Cookie", new CookieHeaderValue("ASPNET_CULTURE", cultureCookie).ToString()); request.Headers.Add("Cookie",
new CookieHeaderValue(CookieRequestCultureProvider.DefaultCookieName, cultureCookie).ToString());
// Act // Act
var response = await Client.SendAsync(request); var response = await Client.SendAsync(request);
@ -289,7 +291,8 @@ index-content";
// Arrange // Arrange
var cultureCookie = "c=" + value + "|uic=" + value; var cultureCookie = "c=" + value + "|uic=" + value;
var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/TemplateExpander/ViewWithLayout"); var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/TemplateExpander/ViewWithLayout");
request.Headers.Add("Cookie", new CookieHeaderValue("ASPNET_CULTURE", cultureCookie).ToString()); request.Headers.Add("Cookie",
new CookieHeaderValue(CookieRequestCultureProvider.DefaultCookieName, cultureCookie).ToString());
// Act // Act
var response = await Client.SendAsync(request); var response = await Client.SendAsync(request);

1
test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs
View File

@ -319,7 +319,6 @@ namespace Microsoft.AspNetCore.Mvc.Razor
} }
} }
private class MyService : IViewContextAware
private class HasIncorrectViewDataPropertyType : RazorPage<MyModel> private class HasIncorrectViewDataPropertyType : RazorPage<MyModel>
{ {
[RazorInject] [RazorInject]