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

React to aspnet/Razor#485

This commit is contained in:
Ajay Bhargav Baaskaran 2015-09-10 17:17:44 -07:00
parent 0350f6ed48
commit 14bdaf2db6
28 changed files with 17 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/Microsoft.AspNet.Mvc.FunctionalTests/CompilationOptionsTests.cs
View File

@ -25,12 +25,10 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
#if DNX451
var expected =
@"This method is running from DNX451
This method is only defined in DNX451";
#elif DNXCORE50
var expected =
@"This method is running from DNXCORE50
This method is only defined in DNXCORE50";
#endif
var server = TestHelper.CreateServer(_app, SiteName, _configureServices);

6
test/Microsoft.AspNet.Mvc.FunctionalTests/FlushPointTest.cs
View File

@ -75,8 +75,8 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
// Assert - 4
Assert.Equal(
@"After flush inside partial
<form action=""/FlushPoint/PageWithoutLayout"" method=""post""><input id=""Name1"" name=""Name1"" type=""text"" value="""" />",
@"After flush inside partial<form action=""/FlushPoint/PageWithoutLayout"" method=""post"">" +
@"<input id=""Name1"" name=""Name1"" type=""text"" value="""" />",
GetTrimmedString(stream),
ignoreLineEndingDifferences: true);
waitService.WaitForServer();
@ -107,7 +107,6 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
// Assert - 1
Assert.Equal(
$@"<title>{ title }</title>
RenderBody content",
GetTrimmedString(stream),
ignoreLineEndingDifferences: true);
@ -152,7 +151,6 @@ More content from layout",
// Assert - 1
Assert.Equal(
@"Inside Nested Layout
<title>Nested Page With Layout</title>",
GetTrimmedString(stream),
ignoreLineEndingDifferences: true);

1
test/Microsoft.AspNet.Mvc.FunctionalTests/HtmlHelperOptionsTest.cs
View File

@ -65,7 +65,6 @@ False";
<div class=""editor-field""><input class=""text-box single-line"" data-val=""true"" data-val-required=""The MyDate field is required."" id=""MyDate"" name=""MyDate"" type=""datetime"" value=""02/01/2000 03:04:05 &#x2B;00:00"" /> <ValidationInView class=""field-validation-valid"" data-valmsg-for=""MyDate"" data-valmsg-replace=""true""></ValidationInView></div>
True
<div class=""validation-summary-errors""><ValidationSummaryInPartialView>MySummary</ValidationSummaryInPartialView>
<ul><li style=""display:none""></li>
</ul></div>

9
test/Microsoft.AspNet.Mvc.FunctionalTests/LocalizationTest.cs
View File

@ -30,8 +30,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
get
{
var expected1 =
@"<language-layout>
en-gb-index
@"<language-layout>en-gb-index
partial
mypartial
</language-layout>";
@ -39,8 +38,7 @@ mypartial
yield return new[] { "en-GB", expected1 };
var expected2 =
@"<fr-language-layout>
fr-index
@"<fr-language-layout>fr-index
fr-partial
mypartial
</fr-language-layout>";
@ -50,8 +48,7 @@ mypartial
{
// https://github.com/aspnet/Mvc/issues/2759
var expected3 =
@"<language-layout>
index
@"<language-layout>index
partial
mypartial
</language-layout>";

11
test/Microsoft.AspNet.Mvc.FunctionalTests/RazorPageExecutionInstrumentationTest.cs
View File

@ -23,7 +23,6 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
{
var expected = @"<div>
2147483647
viewstart-content
<p class=""Hello world"">
page-content
@ -32,7 +31,6 @@ page-content
var expectedLineMappings = new[]
{
Tuple.Create(90, 1, true),
Tuple.Create(92, 16, false),
Tuple.Create(108, 1, true),
Tuple.Create(0, 2, true),
@ -52,30 +50,26 @@ page-content
var expected2 = @"<div>
2147483647
viewstart-content
view-with-partial-content
<p class=""class"">partial-content</p>
<p class=""class"">partial-content</p>
</div>";
var expectedLineMappings2 = new[]
{
Tuple.Create(90, 1, true),
Tuple.Create(92, 16, false),
Tuple.Create(108, 1, true),
Tuple.Create(0, 26, true),
Tuple.Create(27, 39, false),
// Html.PartialAsync()
Tuple.Create(27, 3, true),
Tuple.Create(28, 2, true),
Tuple.Create(30, 8, true),
Tuple.Create(38, 4, false),
Tuple.Create(42, 1, true),
Tuple.Create(43, 20, true),
Tuple.Create(66, 1, true),
// Html.RenderPartial()
Tuple.Create(27, 3, true),
Tuple.Create(28, 2, true),
Tuple.Create(30, 8, true),
Tuple.Create(38, 4, false),
Tuple.Create(42, 1, true),
@ -179,7 +173,6 @@ view-with-partial-content
// Arrange - 1
var expectedLineMappings = new[]
{
Tuple.Create(90, 1, true),
Tuple.Create(92, 16, false),
Tuple.Create(108, 1, true),
Tuple.Create(0, 2, true),

7
test/Microsoft.AspNet.Mvc.FunctionalTests/RazorViewLocationSpecificationTest.cs
View File

@ -46,8 +46,7 @@ _ViewStart that specifies partial Layout
public async Task PartialLayoutPaths_SpecifiedInPage_GetResolvedByViewEngine(string actionName)
{
var expected =
@"<non-shared>
Layout specified in page
@"<non-shared>Layout specified in page
</non-shared>";
var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
var client = server.CreateClient();
@ -65,8 +64,7 @@ Layout specified in page
public async Task NonPartialLayoutPaths_GetResolvedByViewEngine(string actionName)
{
var expected =
@"<non-shared>
Page With Non Partial Layout
@"<non-shared>Page With Non Partial Layout
</non-shared>";
var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
var client = server.CreateClient();
@ -86,7 +84,6 @@ Page With Non Partial Layout
{
var expected =
@"<layout>
Non Shared Partial
</layout>";

12
test/Microsoft.AspNet.Mvc.FunctionalTests/TagHelpersTest.cs
View File

@ -108,46 +108,34 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
{
"ViewWithLayoutAndNestedTagHelper",
@"layout:<root>root-content</root>
<nested>nested-content</nested>"
},
{
"ViewWithInheritedRemoveTagHelper",
@"layout:<root>root-content</root>
page:<root/>
<nested>nested-content</nested>"
},
{
"ViewWithInheritedTagHelperPrefix",
@"layout:<root>root-content</root>
page:<root>root-content</root>"
},
{
"ViewWithOverriddenTagHelperPrefix",
@"layout:<root>root-content</root>
page:<root>root-content</root>"
},
{
"ViewWithNestedInheritedTagHelperPrefix",
@"layout:<root>root-content</root>
page:<root>root-content</root>"
},
{
"ViewWithNestedOverriddenTagHelperPrefix",
@"layout:<root>root-content</root>
page:<root>root-content</root>"
},
};

32
test/Microsoft.AspNet.Mvc.FunctionalTests/ViewEngineTests.cs
View File

@ -31,7 +31,6 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
{
"ViewWithLayout",
@"<layout>
ViewWithLayout-Content
</layout>"
};
@ -39,7 +38,6 @@ ViewWithLayout-Content
{
"ViewWithFullPath",
@"<layout>
ViewWithFullPath-content
</layout>"
};
@ -47,10 +45,8 @@ ViewWithFullPath-content
{
"ViewWithNestedLayout",
@"<layout>
<nested-layout>
/ViewEngine/ViewWithNestedLayout
ViewWithNestedLayout-Content
</nested-layout>
</layout>"
@ -119,9 +115,7 @@ test-value";
{
var expected =
@"<title>Page title</title>
partial-content
component-content";
partial-contentcomponent-content";
var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
var client = server.CreateClient();
@ -212,7 +206,6 @@ expander-partial";
{
"PartialViewWithNamePassedIn",
@"<layout>
ViewWithLayout-Content
</layout>"
};
@ -220,7 +213,6 @@ ViewWithLayout-Content
{
"ViewWithFullPath",
@"<layout>
ViewWithFullPath-content
</layout>"
};
@ -228,10 +220,8 @@ ViewWithFullPath-content
{
"ViewWithNestedLayout",
@"<layout>
<nested-layout>
/PartialViewEngine/ViewWithNestedLayout
ViewWithNestedLayout-Content
</nested-layout>
</layout>"
@ -270,7 +260,6 @@ ViewWithNestedLayout-Content
{
// Arrange
var expected = @"<title>viewstart-value</title>
~/Views/NestedViewStarts/NestedViewStarts/Layout.cshtml
index-content";
var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
@ -288,8 +277,7 @@ index-content";
get
{
var expected1 =
@"<language-layout>
View With Layout
@"<language-layout>View With Layout
</language-layout>";
yield return new[] { "en-GB", expected1 };
@ -301,8 +289,7 @@ View With Layout
}
var expected2 =
@"<fr-language-layout>
View With Layout
@"<fr-language-layout>View With Layout
</fr-language-layout>";
yield return new[] { "fr", expected2 };
@ -352,11 +339,9 @@ View With Layout
// Arrange
var expected =
@"<title>View With Component With Layout</title>
Page Content
<component-title>ViewComponent With Title</component-title>
<component-body>
Component With Layout</component-body>";
<component-body>Component With Layout</component-body>";
var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
var client = server.CreateClient();
@ -402,10 +387,8 @@ Component With Layout</component-body>";
{
// Arrange
var expected =
@"<layout-for-viewstart-with-layout><layout-for-viewstart-with-layout>
Partial that specifies Layout
</layout-for-viewstart-with-layout>Partial that does not specify Layout
</layout-for-viewstart-with-layout>";
@"<layout-for-viewstart-with-layout><layout-for-viewstart-with-layout>Partial that specifies Layout
</layout-for-viewstart-with-layout>Partial that does not specify Layout</layout-for-viewstart-with-layout>";
var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
var client = server.CreateClient();
@ -421,8 +404,7 @@ Partial that specifies Layout
{
// Arrange
var expected =
@"<layout-for-viewstart-with-layout><layout-for-viewstart-with-layout>
Partial that specifies Layout
@"<layout-for-viewstart-with-layout><layout-for-viewstart-with-layout>Partial that specifies Layout
</layout-for-viewstart-with-layout>
Partial that does not specify Layout
</layout-for-viewstart-with-layout>";

1
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.Index.html
View File

@ -21,7 +21,6 @@
</div>
<div>
<div>
<h1>ASP.NET vNext</h1>
</div>

1
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ViewWithPrefixedAttributeValue.html
View File

@ -1,5 +1,4 @@
<span foo=" abc" />
<span bar=" Baz" />
<span baz=" Baz Baz" />

1
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.Encoded.html
View File

@ -30,7 +30,6 @@ HtmlEncode[[Address_1]]</textarea>;
</div>
<div>
<label for="HtmlEncode[[Employee_OfficeNumber]]">HtmlEncode[[OfficeNumber]]</label>
<select id="HtmlEncode[[Employee_OfficeNumber]]" name="HtmlEncode[[Employee.OfficeNumber]]"><option>HtmlEncode[[1001]]</option>
<option>HtmlEncode[[1002]]</option>
</select>

1
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.html
View File

@ -30,7 +30,6 @@ Address_1</textarea>;
</div>
<div>
<label for="Employee_OfficeNumber">OfficeNumber</label>
<select id="Employee_OfficeNumber" name="Employee.OfficeNumber"><option>1001</option>
<option>1002</option>
</select>

6
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EmployeeList.html
View File

@ -16,7 +16,6 @@ EmployeeName_0</textarea>
<input type="tel" id="z0__PhoneNumber" name="[0].PhoneNumber" value="" />
</div>
<div>
<label class="employee" for="z0__Gender">Gender</label>
<input data-val="true" data-val-required="The Gender field is required." disabled="disabled" id="z0__Gender" name="[0].Gender" readonly="readonly" type="radio" value="Female" />
<select id="z0__Gender" name="[0].Gender"><option selected="selected">Male</option>
@ -29,7 +28,6 @@ EmployeeName_0</textarea>
</div>
<div>
<label class="employee" for="z0__OfficeNumber">OfficeNumber</label>
<select id="z0__OfficeNumber" name="[0].OfficeNumber"><option>1001</option>
<option>1002</option>
</select>
@ -49,7 +47,6 @@ EmployeeName_1</textarea>
<input type="tel" id="z1__PhoneNumber" name="[1].PhoneNumber" value="" />
</div>
<div>
<label class="employee" for="z1__Gender">Gender</label>
<input checked="checked" data-val="true" data-val-required="The Gender field is required." disabled="disabled" id="z1__Gender" name="[1].Gender" readonly="readonly" type="radio" value="Female" />
<select id="z1__Gender" name="[1].Gender"><option>Male</option>
@ -62,7 +59,6 @@ EmployeeName_1</textarea>
</div>
<div>
<label class="employee" for="z1__OfficeNumber">OfficeNumber</label>
<select id="z1__OfficeNumber" name="[1].OfficeNumber"><option>1001</option>
<option selected="selected">1002</option>
</select>
@ -82,7 +78,6 @@ EmployeeName_2</textarea>
<input type="tel" id="z2__PhoneNumber" name="[2].PhoneNumber" value="" />
</div>
<div>
<label class="employee" for="z2__Gender">Gender</label>
<input data-val="true" data-val-required="The Gender field is required." disabled="disabled" id="z2__Gender" name="[2].Gender" readonly="readonly" type="radio" value="Female" />
<select id="z2__Gender" name="[2].Gender"><option selected="selected">Male</option>
@ -95,7 +90,6 @@ EmployeeName_2</textarea>
</div>
<div>
<label class="employee" for="z2__OfficeNumber">OfficeNumber</label>
<select id="z2__OfficeNumber" name="[2].OfficeNumber"><option>1001</option>
<option>1002</option>
</select>

1
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.Encoded.html
View File

@ -15,7 +15,6 @@
</div>
<div>
<label class="order" for="HtmlEncode[[Products]]">HtmlEncode[[Products]]</label>
<select multiple="HtmlEncode[[multiple]]" id="HtmlEncode[[Products]]" name="HtmlEncode[[Products]]"><option selected="HtmlEncode[[selected]]" value="HtmlEncode[[0]]">HtmlEncode[[Product_0]]</option>
<option selected="HtmlEncode[[selected]]" value="HtmlEncode[[1]]">HtmlEncode[[Product_1]]</option>
<option value="HtmlEncode[[2]]">HtmlEncode[[Product_2]]</option>

1
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.html
View File

@ -15,7 +15,6 @@
</div>
<div>
<label class="order" for="Products">Products</label>
<select multiple="multiple" id="Products" name="Products"><option selected="selected" value="0">Product_0</option>
<option selected="selected" value="1">Product_1</option>
<option value="2">Product_2</option>

1
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.Encoded.html
View File

@ -15,7 +15,6 @@
</div>
<div>
<label class="HtmlEncode[[order]]" for="HtmlEncode[[Products]]">HtmlEncode[[Products]]</label>
<select id="HtmlEncode[[Products]]" multiple="HtmlEncode[[multiple]]" name="HtmlEncode[[Products]]"><option selected="HtmlEncode[[selected]]" value="HtmlEncode[[0]]">HtmlEncode[[Product_0]]</option>
<option selected="HtmlEncode[[selected]]" value="HtmlEncode[[1]]">HtmlEncode[[Product_1]]</option>
<option value="HtmlEncode[[2]]">HtmlEncode[[Product_2]]</option>

1
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.html
View File

@ -15,7 +15,6 @@
</div>
<div>
<label class="order" for="Products">Products</label>
<select id="Products" multiple="multiple" name="Products"><option selected="selected" value="0">Product_0</option>
<option selected="selected" value="1">Product_1</option>
<option value="2">Product_2</option>

2
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.Invalid.html
View File

@ -1,7 +1,5 @@
<!DOCTYPE html>

2
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.html
View File

@ -1,7 +1,5 @@
<!DOCTYPE html>

2
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Details.AfterCreate.html
View File

@ -1,6 +1,4 @@
<!DOCTYPE html>
<html>

2
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.About.html
View File

@ -18,8 +18,6 @@
<div>
<p>Hello, you've reached the about page.</p>

2
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Help.html
View File

@ -17,8 +17,6 @@
<div>
<div>
<p>Hello, you've reached the help page. If you're having troubles try visiting our <a href="/?approved=true">My Approved Home Page</a></p>
</div>

5
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Index.html
View File

@ -27,8 +27,6 @@
<div>
<p>This website has <em><strong style="font-size: 1.25em;text-decoration: underline;">not</strong></em> been approved yet. Visit <strong><a target="_blank" href="http://www.contoso.com">www.contoso.com</a></strong> for <strong>more</strong> information.</p>
</div>
@ -39,8 +37,7 @@
<h3 style="font-family: cursive;">Current Tag Cloud from ViewComponentHelper:</h3>
<section><b>["Lorem","ipsum","dolor","sit","amet","consectetur","adipisicing","elit","sed","do","eiusmod","tempor","incididunt","ut","labore"]</b></section>
<br /><p><em>Rendering Template:</em></p>
<div><h3 style="font-family: cursive;">Tag Cloud from Template: </h3>["Lorem","ipsum","dolor","sit","amet","consectetur","adipisicing","elit","sed","do","eiusmod","tempor","incididunt","ut","labore","et","dolore","magna","aliquaUt","enim"]</div>
</div>
<div><h3 style="font-family: cursive;">Tag Cloud from Template: </h3>["Lorem","ipsum","dolor","sit","amet","consectetur","adipisicing","elit","sed","do","eiusmod","tempor","incididunt","ut","labore","et","dolore","magna","aliquaUt","enim"]</div></div>
<hr />

2
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.Encoded.html
View File

@ -1,6 +1,4 @@
<input checked="HtmlEncode[[checked]]" processed />
<input checked="HtmlEncode[[checked]]" processed />
<input processed />

2
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.html
View File

@ -1,6 +1,4 @@
<input checked="checked" processed />
<input checked="checked" processed />
<input processed />

1
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/ValidationWebSite.Aria.RemoteAttribute_Home.Create.html
View File

@ -23,7 +23,6 @@
<div>
<h2>Create in Aria area.</h2>
<form action="/Aria/RemoteAttribute_Home/Create" method="post"> <div class="form-horizontal">
<h4>Person</h4>

1
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/ValidationWebSite.Root.RemoteAttribute_Home.Create.html
View File

@ -23,7 +23,6 @@
<div>
<h2>Create in root area.</h2>
<form action="/RemoteAttribute_Home/Create" method="post"> <div class="form-horizontal">
<h4>Person</h4>

1
test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/ViewEngineController.ViewWithPaths.txt
View File

@ -2,7 +2,6 @@
/Views/ViewWithPaths/_Layout.cshtml
/Views/ViewWithPaths/Index.cshtml
</Layout>
<ViewStart>
Views\ViewWithPaths\_ViewStart.cshtml
/Views/ViewWithPaths/Index.cshtml