Propose some improvements on CustomFields

2 files changed, 24 insertions, 3 deletions

diff --git a/spec/factories/custom_fields.rb b/spec/factories/custom_fields.rb
index 2f5fae555..7c43a6147 100644
--- a/spec/factories/custom_fields.rb
+++ b/spec/factories/custom_fields.rb
@@ -4,6 +4,6 @@ FactoryGirl.define do
     resource_type "VehicleJourney"
     sequence(:name){|n| "custom field ##{n}"}
     field_type "list"
-    options( { "capacity" => "0" } )
+    options( { capacity: "0" } )
   end
 end
diff --git a/spec/models/custom_field_spec.rb b/spec/models/custom_field_spec.rb
index 51128b0a2..d1c6d803a 100644
--- a/spec/models/custom_field_spec.rb
+++ b/spec/models/custom_field_spec.rb
@@ -16,7 +16,6 @@ RSpec.describe CustomField, type: :model do
     end
   end
 
-
   context "custom fields for a resource" do
     let!( :fields ){ [create(:custom_field), create(:custom_field, code: :energy)] }
     let!( :instance_fields ){
@@ -26,10 +25,32 @@ RSpec.describe CustomField, type: :model do
       }
     }
     it { expect(Chouette::VehicleJourney.custom_fields).to eq(fields) }
-    it { expect(vj.custom_fields).to eq(instance_fields) }
+    it {
+      instance_fields.each do |code, cf|
+        cf.each do |k, v|
+          expect(vj.custom_fields[code].send(k)).to eq(v)
+        end
+      end
+    }
   end
 
   context "custom field_values for a resource" do
     it { expect(vj.custom_field_value("energy")).to eq(99) }
   end
+
+  context "with an 'integer' field_type" do
+    let!(:field){ [create(:custom_field, code: :energy, options: {field_type: 'integer'})] }
+    let!( :vj ){ create :vehicle_journey, custom_field_values: {energy: "99"} }
+    it "should cast the value" do
+      expect(vj.custom_fields[:energy].value).to eq 99
+    end
+  end
+
+  context "with a 'string' field_type" do
+    let!(:field){ [create(:custom_field, code: :energy, options: {field_type: 'string'})] }
+    let!( :vj ){ create :vehicle_journey, custom_field_values: {energy: 99} }
+    it "should cast the value" do
+      expect(vj.custom_fields[:energy].value).to eq '99'
+    end
+  end
 end