Range overlapping does not consider the reange itself for the edition case

Fixed infinity buttons acceptance tests that were trying to create overlapping ranges

Range overlapping does not consider the reange itself for the edition case
Fixed infinity buttons acceptance tests that were trying to create overlapping ranges
Rafael Manzo · Diego Camarinha
1 parent 494f50ba
Showing 3 changed files with 6 additions and 6 deletions Show diff stats
app/models/validators/range_overlapping_validator.rb
features/mezuro_range/create.feature
spec/models/validators/range_overlapping_validator_spec.rb
 class RangeOverlappingValidator < ActiveModel::Validator
   def validate(record)
     record.class.ranges_of(record.metric_configuration_id).each do |mezuro_range|
-      if overlaps?(mezuro_range,record)
+      if mezuro_range.id != record.id && overlaps?(mezuro_range,record)
         record.errors[:beginning] << "There's already a #{record.class} within these boundaries! Please, choose another ones."
         break
       end
@@ -150,7 +150,6 @@ Feature: Create range
     And I own a sample reading group
     And I have a sample metric configuration within the given mezuro configuration
     And I have a sample reading within the sample reading group labeled "My Reading"
-    And I have a sample range within the sample metric configuration with beginning "2"
     And I am at the New Range page
     And I click the -∞ link
     And I click the ∞ link
@@ -12,10 +12,10 @@ describe RangeOverlappingValidator, :type =&gt; :model do
       end
       context 'not overlapping' do
-        let!(:not_overlapping_range) { FactoryGirl.build(:mezuro_range, beginning: 0.0, end: 'INF', metric_configuration_id: metric_configuration.id) }
+        let!(:not_overlapping_range) { FactoryGirl.build(:mezuro_range, id: 31, beginning: 0.0, end: 'INF', metric_configuration_id: metric_configuration.id) }
         before :each do
-          MezuroRange.expects(:ranges_of).with(metric_configuration.id).returns([not_overlapping_range])
+          MezuroRange.expects(:ranges_of).with(metric_configuration.id).returns([range, not_overlapping_range])
         end
         it 'is expected to not return errors' do
@@ -24,11 +24,12 @@ describe RangeOverlappingValidator, :type =&gt; :model do
         end
       end
+
       context 'overlapping' do
-        let!(:overlapping_range) { FactoryGirl.build(:mezuro_range, beginning: -2.0, end: -1.0, metric_configuration_id: metric_configuration.id) }
+        let!(:overlapping_range) { FactoryGirl.build(:mezuro_range, id: 31, beginning: '-INF', end: 'INF', metric_configuration_id: metric_configuration.id) }
         before :each do
-          MezuroRange.expects(:ranges_of).with(metric_configuration.id).returns([overlapping_range])
+          MezuroRange.expects(:ranges_of).with(metric_configuration.id).returns([range, overlapping_range])
         end
         it 'is expected to return errors' do
1	class RangeOverlappingValidator < ActiveModel::Validator	1	class RangeOverlappingValidator < ActiveModel::Validator
2	def validate(record)	2	def validate(record)
3	record.class.ranges_of(record.metric_configuration_id).each do \|mezuro_range\|	3	record.class.ranges_of(record.metric_configuration_id).each do \|mezuro_range\|
4	- if overlaps?(mezuro_range,record)	4	+ if mezuro_range.id != record.id && overlaps?(mezuro_range,record)
5	record.errors[:beginning] << "There's already a #{record.class} within these boundaries! Please, choose another ones."	5	record.errors[:beginning] << "There's already a #{record.class} within these boundaries! Please, choose another ones."
6	break	6	break
7	end	7	end