diff options
| author | Edouard Maffert | 2016-09-21 12:09:56 +0200 |
|---|---|---|
| committer | Edouard Maffert | 2016-09-21 12:12:10 +0200 |
| commit | d3d7d4aea6672beae5baa3bc184303d5de109a61 (patch) | |
| tree | 5933cccaae112f89d65b1054ff4926da1deeb97d | |
| parent | 1c6ca2a39a5f1899e55a9362fc9e0d07eeb524a9 (diff) | |
| download | chouette-core-d3d7d4aea6672beae5baa3bc184303d5de109a61.tar.bz2 | |
validate presence of network and companies for lines
| -rw-r--r-- | app/models/chouette/line.rb | 5 | ||||
| -rw-r--r-- | spec/models/chouette/line_spec.rb | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb index 4a4115cc2..14c9c73ba 100644 --- a/app/models/chouette/line.rb +++ b/app/models/chouette/line.rb @@ -21,9 +21,8 @@ class Chouette::Line < Chouette::ActiveRecord attr_reader :group_of_line_tokens attr_accessor :transport_mode - # FIXME #825 - #validates_presence_of :network - #validates_presence_of :company + validates_presence_of :network + validates_presence_of :company validates_format_of :registration_number, :with => %r{\A[\d\w_\-]+\Z}, :allow_nil => true, :allow_blank => true validates_format_of :stable_id, :with => %r{\A[\d\w_\-]+\Z}, :allow_nil => true, :allow_blank => true diff --git a/spec/models/chouette/line_spec.rb b/spec/models/chouette/line_spec.rb index 4b22a911d..c38d0591b 100644 --- a/spec/models/chouette/line_spec.rb +++ b/spec/models/chouette/line_spec.rb @@ -4,9 +4,8 @@ describe Chouette::Line, :type => :model do subject { create(:line) } - # FIXME #825 - # it { is_expected.to validate_presence_of :network } - # it { is_expected.to validate_presence_of :company } + it { is_expected.to validate_presence_of :network } + it { is_expected.to validate_presence_of :company } it { is_expected.to validate_presence_of :name } |