From 148321f7b73ccc62efce1f23d9653725b50e1ef2 Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Mon, 1 Oct 2018 16:00:42 +0200 Subject: [PATCH] Make strategies class names more explicit --- app/models/product_import/entry_processor.rb | 4 ++-- .../{inventory_reset.rb => inventory_reset_strategy.rb} | 2 +- .../{products_reset.rb => products_reset_strategy.rb} | 2 +- spec/models/product_import/entry_processor_spec.rb | 8 ++++---- ...ory_reset_spec.rb => inventory_reset_strategy_spec.rb} | 2 +- ...ucts_reset_spec.rb => products_reset_strategy_spec.rb} | 2 +- spec/models/product_import/reset_absent_spec.rb | 8 ++++---- 7 files changed, 14 insertions(+), 14 deletions(-) rename app/models/product_import/{inventory_reset.rb => inventory_reset_strategy.rb} (94%) rename app/models/product_import/{products_reset.rb => products_reset_strategy.rb} (95%) rename spec/models/product_import/{inventory_reset_spec.rb => inventory_reset_strategy_spec.rb} (97%) rename spec/models/product_import/{products_reset_spec.rb => products_reset_strategy_spec.rb} (97%) diff --git a/app/models/product_import/entry_processor.rb b/app/models/product_import/entry_processor.rb index ae8e3de980..e8ed57339b 100644 --- a/app/models/product_import/entry_processor.rb +++ b/app/models/product_import/entry_processor.rb @@ -74,9 +74,9 @@ module ProductImport def reset_stock_strategy_factory if settings.importing_into_inventory? - InventoryReset + InventoryResetStrategy else - ProductsReset + ProductsResetStrategy end end diff --git a/app/models/product_import/inventory_reset.rb b/app/models/product_import/inventory_reset_strategy.rb similarity index 94% rename from app/models/product_import/inventory_reset.rb rename to app/models/product_import/inventory_reset_strategy.rb index 9aec385da4..f730b22376 100644 --- a/app/models/product_import/inventory_reset.rb +++ b/app/models/product_import/inventory_reset_strategy.rb @@ -1,5 +1,5 @@ module ProductImport - class InventoryReset + class InventoryResetStrategy attr_reader :supplier_ids def initialize(excluded_items_ids) diff --git a/app/models/product_import/products_reset.rb b/app/models/product_import/products_reset_strategy.rb similarity index 95% rename from app/models/product_import/products_reset.rb rename to app/models/product_import/products_reset_strategy.rb index ad15283283..369ff07ac0 100644 --- a/app/models/product_import/products_reset.rb +++ b/app/models/product_import/products_reset_strategy.rb @@ -1,5 +1,5 @@ module ProductImport - class ProductsReset + class ProductsResetStrategy attr_reader :supplier_ids def initialize(excluded_items_ids) diff --git a/spec/models/product_import/entry_processor_spec.rb b/spec/models/product_import/entry_processor_spec.rb index 1fbf9198d4..48c8a8054d 100644 --- a/spec/models/product_import/entry_processor_spec.rb +++ b/spec/models/product_import/entry_processor_spec.rb @@ -73,13 +73,13 @@ describe ProductImport::EntryProcessor do context 'when importing into inventory' do let(:reset_stock_strategy) do - instance_double(ProductImport::InventoryReset) + instance_double(ProductImport::InventoryResetStrategy) end before do allow(settings).to receive(:importing_into_inventory?) { true } - allow(ProductImport::InventoryReset) + allow(ProductImport::InventoryResetStrategy) .to receive(:new).with([1]) { reset_stock_strategy } end @@ -94,13 +94,13 @@ describe ProductImport::EntryProcessor do context 'when not importing into inventory' do let(:reset_stock_strategy) do - instance_double(ProductImport::ProductsReset) + instance_double(ProductImport::ProductsResetStrategy) end before do allow(settings).to receive(:importing_into_inventory?) { false } - allow(ProductImport::ProductsReset) + allow(ProductImport::ProductsResetStrategy) .to receive(:new).with([1]) { reset_stock_strategy } end diff --git a/spec/models/product_import/inventory_reset_spec.rb b/spec/models/product_import/inventory_reset_strategy_spec.rb similarity index 97% rename from spec/models/product_import/inventory_reset_spec.rb rename to spec/models/product_import/inventory_reset_strategy_spec.rb index 412739ae10..7a86390871 100644 --- a/spec/models/product_import/inventory_reset_spec.rb +++ b/spec/models/product_import/inventory_reset_strategy_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe ProductImport::InventoryReset do +describe ProductImport::InventoryResetStrategy do let(:inventory_reset) { described_class.new(excluded_items_ids) } describe '#<<' do diff --git a/spec/models/product_import/products_reset_spec.rb b/spec/models/product_import/products_reset_strategy_spec.rb similarity index 97% rename from spec/models/product_import/products_reset_spec.rb rename to spec/models/product_import/products_reset_strategy_spec.rb index f84820ad81..47c8fb393d 100644 --- a/spec/models/product_import/products_reset_spec.rb +++ b/spec/models/product_import/products_reset_strategy_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe ProductImport::ProductsReset do +describe ProductImport::ProductsResetStrategy do let(:products_reset) { described_class.new(excluded_items_ids) } describe '#<<' do diff --git a/spec/models/product_import/reset_absent_spec.rb b/spec/models/product_import/reset_absent_spec.rb index 4b04a4e052..14fab6de2c 100644 --- a/spec/models/product_import/reset_absent_spec.rb +++ b/spec/models/product_import/reset_absent_spec.rb @@ -18,7 +18,7 @@ module ProductImport end let(:reset_stock_strategy) do - instance_double(InventoryReset, supplier_ids: []) + instance_double(InventoryResetStrategy, supplier_ids: []) end it 'returns nil' do @@ -36,7 +36,7 @@ module ProductImport ) end - let(:reset_stock_strategy) { instance_double(ProductsReset) } + let(:reset_stock_strategy) { instance_double(ProductsResetStrategy) } before do allow(entry_processor) @@ -68,7 +68,7 @@ module ProductImport ) end - let(:reset_stock_strategy) { instance_double(InventoryReset) } + let(:reset_stock_strategy) { instance_double(InventoryResetStrategy) } before do allow(entry_processor) @@ -94,7 +94,7 @@ module ProductImport ) end - let(:reset_stock_strategy) { instance_double(InventoryReset) } + let(:reset_stock_strategy) { instance_double(InventoryResetStrategy) } before do allow(entry_processor)