diff options
| author | Robert Dober | 2017-11-20 09:51:11 +0100 |
|---|---|---|
| committer | GitHub | 2017-11-20 09:51:11 +0100 |
| commit | acb37189bea8e0bd2c36d9b02042a8e3ee5bb238 (patch) | |
| tree | ec2aa98fc555f48055f4e2540f02af04b3b9d365 | |
| parent | 021b3ede34b9f17a3cd6ad27f9bde55b01ef2012 (diff) | |
| parent | fbb667fd728aea64f58b6f4e68e180afa169cb2b (diff) | |
| download | chouette-core-acb37189bea8e0bd2c36d9b02042a8e3ee5bb238.tar.bz2 | |
Merge pull request #121 from af83/4991-netex-import--check-that-associated-referential-exists-before-trying-to-destroy-it
NetexImport: Don't destroy non-existent Referentials
| -rw-r--r-- | app/models/netex_import.rb | 2 | ||||
| -rw-r--r-- | spec/models/netex_import_spec.rb | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/app/models/netex_import.rb b/app/models/netex_import.rb index 535ca58f3..a7a5bb9b8 100644 --- a/app/models/netex_import.rb +++ b/app/models/netex_import.rb @@ -17,7 +17,7 @@ class NetexImport < Import private def destroy_non_ready_referential - unless referential.ready + if referential && !referential.ready referential.destroy end end diff --git a/spec/models/netex_import_spec.rb b/spec/models/netex_import_spec.rb index d52d475cc..c6051a869 100644 --- a/spec/models/netex_import_spec.rb +++ b/spec/models/netex_import_spec.rb @@ -24,5 +24,16 @@ RSpec.describe NetexImport, type: :model do Referential.where(id: referential_ready_true.id).exists? ).to be true end + + it "doesn't try to destroy nil referentials" do + workbench_import = create(:workbench_import) + create( + :netex_import, + parent: workbench_import, + referential: nil + ) + + expect { workbench_import.destroy }.not_to raise_error + end end end |
