Fixed errors on tests

nopSolutions · Feb 16, 2018 · f89d639 · f89d639
1 parent bddf077
commit f89d639
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Presentation/Nop.Web/Areas/Admin/Infrastructure/Mapper/AdminMapperConfiguration.cs b/src/Presentation/Nop.Web/Areas/Admin/Infrastructure/Mapper/AdminMapperConfiguration.cs
@@ -263,7 +263,8 @@ public AdminMapperConfiguration()
                 .ForMember(dest => dest.Locales, mo => mo.Ignore())
                 .ForMember(dest => dest.SeName, mo => mo.MapFrom(src => src.GetSeName(0, true, false)))
                 .ForMember(dest => dest.CustomProperties, mo => mo.Ignore())
-                .ForMember(dest => dest.Form, mo => mo.Ignore());
+                .ForMember(dest => dest.Form, mo => mo.Ignore())
+                .ForMember(dest => dest.VendorAttributes, mo => mo.Ignore());
             CreateMap<VendorModel, Vendor>()
                 .ForMember(dest => dest.VendorNotes, mo => mo.Ignore())
                 .ForMember(dest => dest.Deleted, mo => mo.Ignore());

diff --git a/src/Tests/Nop.Services.Tests/Catalog/PriceCalculationServiceTests.cs b/src/Tests/Nop.Services.Tests/Catalog/PriceCalculationServiceTests.cs
@@ -12,6 +12,7 @@
 using Nop.Core.Domain.Stores;
 using Nop.Core.Infrastructure;
 using Nop.Services.Catalog;
+using Nop.Services.Directory;
 using Nop.Services.Discounts;
 using Nop.Tests;
 using NUnit.Framework;
@@ -74,6 +75,12 @@ public new void SetUp()
             var httpContextAccessor = MockRepository.GenerateMock<IHttpContextAccessor>();
             serviceProvider.Expect(x => x.GetRequiredService(typeof(IHttpContextAccessor))).Return(httpContextAccessor);
             serviceProvider.Expect(x => x.GetRequiredService(typeof(IWorkContext))).Return(_workContext);
+
+            serviceProvider.Expect(x => x.GetRequiredService(typeof(CurrencySettings))).Return(new CurrencySettings{PrimaryStoreCurrencyId = 1});
+            var currencyService = MockRepository.GenerateMock<ICurrencyService>();
+            currencyService.Expect(x => x.GetCurrencyById(1)).Return(new Currency {Id = 1, RoundingTypeId = 0});
+            serviceProvider.Expect(x => x.GetRequiredService(typeof(ICurrencyService))).Return(currencyService);
+
             nopEngine.Expect(x => x.ServiceProvider).Return(serviceProvider);
             EngineContext.Replace(nopEngine);
         }