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

Revert "Disable building and testing FSharpWebSite to unblock the mirror when using latest CLI" 

This reverts commit b28002a9e5.
This commit is contained in:
Kiran Challa 2017-05-23 13:20:36 -07:00
parent 39f1f5c933
commit 04f74edd85
2 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
test/Microsoft.AspNetCore.Mvc.FunctionalTests/FSharpWebSiteTest.cs
View File

@ -1,44 +1,44 @@
// // Copyright (c) .NET Foundation. All rights reserved.
// // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
// using System.Net;
// using System.Net.Http;
// using System.Threading.Tasks;
// using Xunit;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using Xunit;
// namespace Microsoft.AspNetCore.Mvc.FunctionalTests
// {
// public class FSharpWebSiteTest : IClassFixture<MvcTestFixture<FSharpWebSite.Startup>>
// {
// public FSharpWebSiteTest(MvcTestFixture<FSharpWebSite.Startup> fixture)
// {
// Client = fixture.Client;
// }
namespace Microsoft.AspNetCore.Mvc.FunctionalTests
{
public class FSharpWebSiteTest : IClassFixture<MvcTestFixture<FSharpWebSite.Startup>>
{
public FSharpWebSiteTest(MvcTestFixture<FSharpWebSite.Startup> fixture)
{
Client = fixture.Client;
}
// public HttpClient Client { get; }
public HttpClient Client { get; }
// [Fact]
// public async Task HomeIndex_ReturnsHtml()
// {
// // Act
// var response = await Client.GetAsync("http://localhost/");
// var responseBody = await response.Content.ReadAsStringAsync();
[Fact]
public async Task HomeIndex_ReturnsHtml()
{
// Act
var response = await Client.GetAsync("http://localhost/");
var responseBody = await response.Content.ReadAsStringAsync();
// // Assert
// Assert.Equal(HttpStatusCode.OK, response.StatusCode);
// Assert.Contains("<h1>Hello from FSharpWebSite</h1>", responseBody);
// }
// Assert
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
Assert.Contains("<h1>Hello from FSharpWebSite</h1>", responseBody);
}
// [Fact]
// public async Task HomeAsyncAction_ReturnsContentAsynchronously()
// {
// // Act
// var response = await Client.GetAsync("http://localhost/home/asyncaction");
// var responseBody = await response.Content.ReadAsStringAsync();
[Fact]
public async Task HomeAsyncAction_ReturnsContentAsynchronously()
{
// Act
var response = await Client.GetAsync("http://localhost/home/asyncaction");
var responseBody = await response.Content.ReadAsStringAsync();
// // Assert
// Assert.Equal(HttpStatusCode.OK, response.StatusCode);
// Assert.Contains("Action completed asynchronously", responseBody);
// }
// }
// }
// Assert
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
Assert.Contains("Action completed asynchronously", responseBody);
}
}
}

2
test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
View File

@ -31,7 +31,7 @@
<ProjectReference Include="..\WebSites\FilesWebSite\FilesWebSite.csproj" />
<ProjectReference Include="..\WebSites\FiltersWebSite\FiltersWebSite.csproj" />
<ProjectReference Include="..\WebSites\FormatterWebSite\FormatterWebSite.csproj" />
<!--<ProjectReference Include="..\WebSites\FSharpWebSite\FSharpWebSite.fsproj" />-->
<ProjectReference Include="..\WebSites\FSharpWebSite\FSharpWebSite.fsproj" />
<ProjectReference Include="..\WebSites\HtmlGenerationWebSite\HtmlGenerationWebSite.csproj" />
<ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
<ProjectReference Include="..\..\samples\MvcSandbox\MvcSandbox.csproj" />