From fa63d6e3d51ccc0b3a38616747fcd91b5fdfbba5 Mon Sep 17 00:00:00 2001 From: Alban Peignier Date: Sun, 7 Jan 2018 22:58:55 +0100 Subject: Change Chouette::AreaType.find to return nil if specified code is nil. Refs #5488 --- app/models/chouette/area_type.rb | 2 ++ spec/models/chouette/area_type_spec.rb | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/app/models/chouette/area_type.rb b/app/models/chouette/area_type.rb index 43d96b391..4703ea646 100644 --- a/app/models/chouette/area_type.rb +++ b/app/models/chouette/area_type.rb @@ -13,6 +13,8 @@ class Chouette::AreaType @@instances = {} def self.find(code) + return unless code + code = code.to_sym @@instances[code] ||= new(code) if ALL.include? code end diff --git a/spec/models/chouette/area_type_spec.rb b/spec/models/chouette/area_type_spec.rb index 82c3f96bc..67d218df8 100644 --- a/spec/models/chouette/area_type_spec.rb +++ b/spec/models/chouette/area_type_spec.rb @@ -9,6 +9,10 @@ RSpec.describe Chouette::AreaType do end describe ".find" do + it "returns nil if the given code is nil" do + expect(Chouette::AreaType.find(nil)).to be_nil + end + it "returns nil if the given code is unknown" do expect(Chouette::AreaType.find('dummy')).to be_nil end -- cgit v1.2.3