Skip to content

Commit 74deb91

Browse files
mgesingmgesing
committed
Merge conflicts
1 parent 954e512 commit 74deb91

3 files changed

Lines changed: 0 additions & 7 deletions

File tree

‎src/Tests/SmartStore.Services.Tests/Catalog/PriceCalculationServiceTests.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public class PriceCalculationServiceTests : ServiceTest
2727
IPriceCalculationService _priceCalcService;
2828
ShoppingCartSettings _shoppingCartSettings;
2929
CatalogSettings _catalogSettings;
30-
IProductAttributeService _productAttributeService;
3130

3231
Store _store;
3332

@@ -51,8 +50,6 @@ public class PriceCalculationServiceTests : ServiceTest
5150
_shoppingCartSettings = new ShoppingCartSettings();
5251
_catalogSettings = new CatalogSettings();
5352

54-
_productAttributeService = MockRepository.GenerateMock<IProductAttributeService>();
55-
5653
_priceCalcService = new PriceCalculationService(_workContext, _storeContext, _discountService,
5754
_categoryService, _productAttributeParser, _productService, _shoppingCartSettings, _catalogSettings, _productAttributeService);
5855
}

‎src/Tests/SmartStore.Services.Tests/Orders/OrderProcessingServiceTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ public class OrderProcessingServiceTests : ServiceTest
8686
IAffiliateService _affiliateService;
8787
ISettingService _settingService;
8888
IGeoCountryLookup _geoCountryLookup;
89-
IProductAttributeService _productAttributeService;
9089

9190
Store _store;
9291

‎src/Tests/SmartStore.Services.Tests/Orders/OrderTotalCalculationServiceTests.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ public class OrderTotalCalculationServiceTests : ServiceTest
6060
ISettingService _settingService;
6161
IGeoCountryLookup _geoCountryLookup;
6262
Store _store;
63-
IProductAttributeService _productAttributeService;
6463

6564
[SetUp]
6665
public new void SetUp()
@@ -85,8 +84,6 @@ public class OrderTotalCalculationServiceTests : ServiceTest
8584
_shoppingCartSettings = new ShoppingCartSettings();
8685
_catalogSettings = new CatalogSettings();
8786

88-
_productAttributeService = MockRepository.GenerateMock<IProductAttributeService>();
89-
9087
_priceCalcService = new PriceCalculationService(_workContext, _storeContext,
9188
_discountService, _categoryService, _productAttributeParser, _productService, _shoppingCartSettings, _catalogSettings, _productAttributeService);
9289

0 commit comments

Comments
 (0)