From c955e151b7c9e44fff0fa69d373201118c91376b Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Mon, 24 Sep 2018 17:53:51 +0200 Subject: [PATCH] Pass enterprise ids as strs as current code does --- app/models/product_import/reset_absent.rb | 4 ++-- spec/models/product_import/reset_absent_spec.rb | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/models/product_import/reset_absent.rb b/app/models/product_import/reset_absent.rb index e4df27cedc..01e9b7f1d9 100644 --- a/app/models/product_import/reset_absent.rb +++ b/app/models/product_import/reset_absent.rb @@ -25,11 +25,11 @@ module ProductImport next unless reset_all_absent? && permission_by_id?(enterprise_id) if !importing_into_inventory? - @suppliers_to_reset_products.push(Integer(enterprise_id)) + @suppliers_to_reset_products << enterprise_id.to_i end if importing_into_inventory? - @suppliers_to_reset_inventories.push(Integer(enterprise_id)) + @suppliers_to_reset_inventories << enterprise_id.to_i end end diff --git a/spec/models/product_import/reset_absent_spec.rb b/spec/models/product_import/reset_absent_spec.rb index 046accf848..b34e1ae4fa 100644 --- a/spec/models/product_import/reset_absent_spec.rb +++ b/spec/models/product_import/reset_absent_spec.rb @@ -75,13 +75,13 @@ describe ProductImport::ResetAbsent do ProductImport::Settings, settings: { 'reset_all_absent' => true }, updated_ids: [0], - enterprises_to_reset: [enterprise.id] + enterprises_to_reset: [enterprise.id.to_s] ) end before do allow(entry_processor) - .to receive(:permission_by_id?).with(enterprise.id) { true } + .to receive(:permission_by_id?).with(enterprise.id.to_s) { true } end context 'and not importing into inventory' do @@ -109,7 +109,7 @@ describe ProductImport::ResetAbsent do variant_override allow(entry_processor) - .to receive(:permission_by_id?).with(enterprise.id) { true } + .to receive(:permission_by_id?).with(enterprise.id.to_s) { true } end before do @@ -129,7 +129,7 @@ describe ProductImport::ResetAbsent do ProductImport::Settings, settings: { 'reset_all_absent' => false }, updated_ids: [0], - enterprises_to_reset: [1] + enterprises_to_reset: ['1'] ) end @@ -152,13 +152,13 @@ describe ProductImport::ResetAbsent do ProductImport::Settings, settings: { 'reset_all_absent' => true }, updated_ids: [0], - enterprises_to_reset: [1] + enterprises_to_reset: ['1'] ) end before do allow(entry_processor) - .to receive(:permission_by_id?).with(1) { false } + .to receive(:permission_by_id?).with('1') { false } end it 'does not reset anything' do @@ -181,7 +181,7 @@ describe ProductImport::ResetAbsent do before do allow(entry_processor) - .to receive(:permission_by_id?).with(enterprise_id) { true } + .to receive(:permission_by_id?).with(enterprise_id.to_s) { true } allow(entry_processor) .to receive(:importing_into_inventory?) { false } @@ -192,7 +192,7 @@ describe ProductImport::ResetAbsent do ProductImport::Settings, settings: { 'reset_all_absent' => true }, updated_ids: [0], - enterprises_to_reset: [enterprise_id] + enterprises_to_reset: [enterprise_id.to_s] ) end