raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-04-03 06:59:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass enterprise ids as strs as current code does

Browse Source
This commit is contained in:
Pau Perez
2018-09-24 17:53:51 +02:00
parent e04162415a
commit c955e151b7
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/product_import/reset_absent.rb
View File

@@ -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

16
spec/models/product_import/reset_absent_spec.rb
View File

@@ -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