etomas
8 years ago
15 changed files with 279 additions and 34 deletions
Split View
Diff Options
-
+51 -0eShopOnContainers-ServicesAndWebApps.sln
-
+3 -3src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs
-
+2 -2src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs
-
+6 -6src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs
-
+3 -3src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/MainViewModel.cs
-
+5 -5src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/ProfileViewModel.cs
-
+2 -2src/Services/Identity/Identity.API/Configuration/Config.cs
-
+0 -8test/Services/FunctionalTests/Class1.cs
-
+20 -1test/Services/FunctionalTests/FunctionalTests.csproj
-
+26 -0test/Services/FunctionalTests/Middleware/AutoAuthorizeMiddleware.cs
-
+73 -0test/Services/FunctionalTests/Services/Ordering/OrderingScenarios.cs
-
+36 -0test/Services/FunctionalTests/Services/Ordering/OrderingScenariosBase.cs
-
+29 -0test/Services/FunctionalTests/Services/Ordering/OrderingTestsStartup.cs
-
+5 -0test/Services/FunctionalTests/settings.json
-
+18 -4test/Services/IntegrationTests/Services/Basket/RedisBasketRepositoryTests.cs
+ 51
- 0
eShopOnContainers-ServicesAndWebApps.sln
View File
+ 3
- 3
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs
View File
+ 2
- 2
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs
View File
+ 6
- 6
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs
View File
+ 3
- 3
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/MainViewModel.cs
View File
+ 5
- 5
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/ProfileViewModel.cs
View File
+ 2
- 2
src/Services/Identity/Identity.API/Configuration/Config.cs
View File
+ 0
- 8
test/Services/FunctionalTests/Class1.cs
View File
| @ -1,8 +0,0 @@ | |||
| using System; | |||
| namespace FunctionalTests | |||
| { | |||
| public class Class1 | |||
| { | |||
| } | |||
| } | |||
+ 20
- 1
test/Services/FunctionalTests/FunctionalTests.csproj
View File
| @ -1,7 +1,26 @@ | |||
| <Project Sdk="Microsoft.NET.Sdk"> | |||
| <Project Sdk="Microsoft.NET.Sdk"> | |||
| <PropertyGroup> | |||
| <TargetFramework>netcoreapp1.1</TargetFramework> | |||
| </PropertyGroup> | |||
| <ItemGroup> | |||
| <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" /> | |||
| <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" /> | |||
| <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="1.1.0" /> | |||
| <PackageReference Include="xunit" Version="2.2.0-beta5-build3474" /> | |||
| <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <ProjectReference Include="..\..\..\src\Services\Ordering\Ordering.API\Ordering.API.csproj" /> | |||
| <ProjectReference Include="..\..\..\src\Web\WebMVC\WebMVC.csproj" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <None Update="settings.json"> | |||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | |||
| </None> | |||
| </ItemGroup> | |||
| </Project> | |||
+ 26
- 0
test/Services/FunctionalTests/Middleware/AutoAuthorizeMiddleware.cs
View File
| @ -0,0 +1,26 @@ | |||
| using Microsoft.AspNetCore.Http; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Security.Claims; | |||
| using System.Text; | |||
| using System.Threading.Tasks; | |||
| namespace FunctionalTests.Middleware | |||
| { | |||
| class AutoAuthorizeMiddleware | |||
| { | |||
| private readonly RequestDelegate _next; | |||
| public AutoAuthorizeMiddleware(RequestDelegate rd) | |||
| { | |||
| _next = rd; | |||
| } | |||
| public async Task Invoke(HttpContext httpContext) | |||
| { | |||
| var identity = new ClaimsIdentity(); | |||
| identity.AddClaim(new Claim("sub", "1234")); | |||
| httpContext.User.AddIdentity(identity); | |||
| await _next.Invoke(httpContext); | |||
| } | |||
| } | |||
| } | |||
+ 73
- 0
test/Services/FunctionalTests/Services/Ordering/OrderingScenarios.cs
View File
| @ -0,0 +1,73 @@ | |||
| using Microsoft.AspNetCore.TestHost; | |||
| using Microsoft.eShopOnContainers.Services.Ordering.API.Application.Commands; | |||
| using Microsoft.eShopOnContainers.WebMVC.ViewModels; | |||
| using Newtonsoft.Json; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Data.SqlClient; | |||
| using System.Net.Http; | |||
| using System.Text; | |||
| using System.Threading.Tasks; | |||
| using Xunit; | |||
| using static Microsoft.eShopOnContainers.Services.Ordering.API.Application.Commands.CreateOrderCommand; | |||
| namespace FunctionalTests.Services.Ordering | |||
| { | |||
| public class OrderingScenarios : OrderingScenariosBase | |||
| { | |||
| [Fact] | |||
| public async Task Create_order_and_return_the_order_by_id() | |||
| { | |||
| using (var server = CreateServer()) | |||
| { | |||
| var client = server.CreateClient(); | |||
| //Arrange | |||
| await client.PostAsync(Post.AddNewOrder, new StringContent(BuildOrder(), UTF8Encoding.UTF8, "application/json")); | |||
| var ordersResponse = await client.GetAsync(Get.Orders); | |||
| var responseBody = await ordersResponse.Content.ReadAsStringAsync(); | |||
| dynamic orders = JsonConvert.DeserializeObject(responseBody); | |||
| string orderId = orders[0].ordernumber; | |||
| //Act | |||
| var order= await client.GetAsync(Get.OrderBy(int.Parse(orderId))); | |||
| var orderBody = await order.Content.ReadAsStringAsync(); | |||
| var result = JsonConvert.DeserializeObject<Order>(orderBody); | |||
| //Assert | |||
| Assert.Equal(orderId, result.OrderNumber); | |||
| Assert.Equal("inprocess", result.Status); | |||
| Assert.Equal(1, result.OrderItems.Count); | |||
| Assert.Equal(10, result.OrderItems[0].UnitPrice); | |||
| } | |||
| } | |||
| string BuildOrder() | |||
| { | |||
| var order = new CreateOrderCommand( | |||
| cardExpiration: DateTime.UtcNow.AddYears(1), | |||
| cardNumber: "5145-555-5555", | |||
| cardHolderName: "Jhon Senna", | |||
| cardSecurityNumber: "232", | |||
| cardTypeId: 1, | |||
| city: "Redmon", | |||
| country: "USA", | |||
| state: "WA", | |||
| street: "One way", | |||
| zipcode: "zipcode" | |||
| ); | |||
| order.AddOrderItem(new OrderItemDTO() | |||
| { | |||
| ProductId = 1, | |||
| Discount = 10M, | |||
| UnitPrice = 10, | |||
| Units = 1, | |||
| ProductName = "Some name" | |||
| }); | |||
| return JsonConvert.SerializeObject(order); | |||
| } | |||
| } | |||
| } | |||
+ 36
- 0
test/Services/FunctionalTests/Services/Ordering/OrderingScenariosBase.cs
View File
| @ -0,0 +1,36 @@ | |||
| using Microsoft.AspNetCore.Hosting; | |||
| using Microsoft.AspNetCore.TestHost; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.IO; | |||
| using System.Text; | |||
| namespace FunctionalTests.Services.Ordering | |||
| { | |||
| public class OrderingScenariosBase | |||
| { | |||
| public TestServer CreateServer() | |||
| { | |||
| var webHostBuilder = new WebHostBuilder(); | |||
| webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory()); | |||
| webHostBuilder.UseStartup<OrderingTestsStartup>(); | |||
| return new TestServer(webHostBuilder); | |||
| } | |||
| public static class Get | |||
| { | |||
| public static string Orders = "api/v1/orders"; | |||
| public static string OrderBy(int id) | |||
| { | |||
| return $"api/v1/orders/{id}"; | |||
| } | |||
| } | |||
| public static class Post | |||
| { | |||
| public static string AddNewOrder = "api/v1/orders/new"; | |||
| } | |||
| } | |||
| } | |||
+ 29
- 0
test/Services/FunctionalTests/Services/Ordering/OrderingTestsStartup.cs
View File
| @ -0,0 +1,29 @@ | |||
| using FunctionalTests.Middleware; | |||
| using Microsoft.AspNetCore.Builder; | |||
| using Microsoft.AspNetCore.Hosting; | |||
| using Microsoft.eShopOnContainers.Services.Ordering.API; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| namespace FunctionalTests.Services.Ordering | |||
| { | |||
| public class OrderingTestsStartup : Startup | |||
| { | |||
| public OrderingTestsStartup(IHostingEnvironment env) : base(env) | |||
| { | |||
| } | |||
| protected override void ConfigureAuth(IApplicationBuilder app) | |||
| { | |||
| if (Configuration["isTest"] == bool.TrueString.ToLowerInvariant()) | |||
| { | |||
| app.UseMiddleware<AutoAuthorizeMiddleware>(); | |||
| } | |||
| else | |||
| { | |||
| base.ConfigureAuth(app); | |||
| } | |||
| } | |||
| } | |||
| } | |||
+ 5
- 0
test/Services/FunctionalTests/settings.json
View File
| @ -0,0 +1,5 @@ | |||
| { | |||
| "ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;", | |||
| "IdentityUrl": "http://localhost:5105", | |||
| "isTest": "true" | |||
| } | |||