diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.service.ts b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.service.ts index 434246a8e..920fb5817 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.service.ts +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.service.ts @@ -12,6 +12,7 @@ import { Observable } from 'rxjs/Observable'; import 'rxjs/add/observable/throw'; import { Observer } from 'rxjs/Observer'; import 'rxjs/add/operator/map'; +import 'rxjs/add/operator/catch'; @Injectable() export class BasketService { @@ -51,8 +52,7 @@ export class BasketService { } dropBasket() { - return this.service.delete(this.basketUrl + '/' + this.basket.buyerId).map((response: Response) => { - return true; - }); + console.log('drop basket!'); + this.service.delete(this.basketUrl + '/' + this.basket.buyerId); } } \ No newline at end of file diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-new/orders-new.component.ts b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-new/orders-new.component.ts index e94a1d890..04fea604b 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-new/orders-new.component.ts +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-new/orders-new.component.ts @@ -47,7 +47,6 @@ export class OrdersNewComponent implements OnInit { this.service.postOrder(this.order).subscribe(res => { //this will emit an observable. Basket service is subscribed to this observable, and will react deleting the basket for the current user. this.basketEvents.orderCreated(); - this.router.navigate(['orders']); }); diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/services/data.service.ts b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/services/data.service.ts index a7bd76fc5..064e024e1 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/services/data.service.ts +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/services/data.service.ts @@ -50,8 +50,11 @@ export class DataService { options.headers.append("Authorization", "Bearer " + this.securityService.GetToken()); } + console.log('data.service deleting'); return this.http.delete(url, options).map( (res: Response) => { + console.log('response from server in delete operation'); + console.log(res); return res; }).catch(this.handleError); } diff --git a/test/Services/UnitTests__/UnitTests/Ordering/OrderControllerTest.cs b/test/Services/UnitTests__/UnitTests/Ordering/OrderControllerTest.cs deleted file mode 100644 index 17dcbdc55..000000000 --- a/test/Services/UnitTests__/UnitTests/Ordering/OrderControllerTest.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Xunit; -using System.Threading.Tasks; -using Moq; -using MediatR; - -namespace UnitTests -{ - public class OrderControllerTest - { - private readonly Mock _mock; - - public OrderControllerTest() - { - //config mock; - _mock = new Mock(); - - - } - - [Fact] - public async Task AddOrder_ReturnsBadRequestResult_WhenPersitenceOperationFails() - { - //Add order: - var orderRequest = new object() as IAsyncRequest; - _mock.Setup(mediator => mediator.SendAsync(orderRequest)) - .Returns(Task.FromResult(false)); - - // Arrange - var controller = new OrdersController(mockRepo.Object); - controller.ModelState.AddModelError("SessionName", "Required"); - var newSession = new HomeController.NewSessionModel(); - - // Act - var result = await controller.Index(newSession); - - // Assert - var badRequestResult = Assert.IsType(result); - Assert.IsType(badRequestResult.Value); - } - - - // Implement Fake method for mock. - private MediatorMockForAddOrder() - { - - } - } -} diff --git a/test/Services/UnitTests__/UnitTests/Properties/AssemblyInfo.cs b/test/Services/UnitTests__/UnitTests/Properties/AssemblyInfo.cs deleted file mode 100644 index 78acac4b0..000000000 --- a/test/Services/UnitTests__/UnitTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("UnitTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("UnitTests")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("ecbb8dc1-22ea-42d2-a45a-4ae800c73356")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/test/Services/UnitTests__/UnitTests/UnitTests.csproj b/test/Services/UnitTests__/UnitTests/UnitTests.csproj deleted file mode 100644 index b7b2e5e47..000000000 --- a/test/Services/UnitTests__/UnitTests/UnitTests.csproj +++ /dev/null @@ -1,117 +0,0 @@ - - - - Debug - AnyCPU - {ECBB8DC1-22EA-42D2-A45A-4AE800C73356} - Library - Properties - UnitTests - UnitTests - v4.5.2 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll - True - - - ..\..\..\..\packages\MediatR.2.1.0\lib\net45\MediatR.dll - True - - - ..\..\..\..\packages\Moq.4.6.38-alpha\lib\net45\Moq.dll - True - - - - ..\..\..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll - True - - - ..\..\..\..\packages\xunit.assert.2.2.0-beta4-build3444\lib\netstandard1.0\xunit.assert.dll - True - - - ..\..\..\..\packages\xunit.extensibility.core.2.2.0-beta4-build3444\lib\net45\xunit.core.dll - True - - - ..\..\..\..\packages\xunit.extensibility.execution.2.2.0-beta4-build3444\lib\net45\xunit.execution.desktop.dll - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - - - False - - - False - - - False - - - - - - - - \ No newline at end of file diff --git a/test/Services/UnitTests__/UnitTests/packages.config b/test/Services/UnitTests__/UnitTests/packages.config deleted file mode 100644 index ee7e708c6..000000000 --- a/test/Services/UnitTests__/UnitTests/packages.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file