diff --git a/spec/shared/features/mappable.rb b/spec/shared/features/mappable.rb index d3fa4fc70..ca9ece6e7 100644 --- a/spec/shared/features/mappable.rb +++ b/spec/shared/features/mappable.rb @@ -252,7 +252,6 @@ def submit_proposal_form end end - def validate_latitude_longitude(mappable_factory_name) expect(find("##{mappable_factory_name}_map_location_attributes_latitude", visible: false).value).to eq "51.48" expect(find("##{mappable_factory_name}_map_location_attributes_longitude", visible: false).value).to eq "0.0" diff --git a/spec/shared/models/map_validations.rb b/spec/shared/models/map_validations.rb index 2ce1af79c..d53eafc7b 100644 --- a/spec/shared/models/map_validations.rb +++ b/spec/shared/models/map_validations.rb @@ -1,54 +1,55 @@ shared_examples "map validations" do - let(:mappable) { build(model_name(described_class)) } + let(:mappable) { build(model_name(described_class)) } describe "validations" do - before(:each) do - Setting["feature.map"] = true - end + before(:each) do + Setting["feature.map"] = true + end - after(:each) do - Setting["feature.map"] = nil - end + after(:each) do + Setting["feature.map"] = nil + end - it "should be valid with a map location" do - mappable.map_location = build(:map_location) - mappable.skip_map = nil + it "should be valid with a map location" do + mappable.map_location = build(:map_location) + mappable.skip_map = nil - expect(mappable).to be_valid - end + expect(mappable).to be_valid + end - it "should be valid accepting that the mappable has no map" do - mappable.skip_map = "1" - mappable.map_location = nil + it "should be valid accepting that the mappable has no map" do + mappable.skip_map = "1" + mappable.map_location = nil - expect(mappable).to be_valid - end + expect(mappable).to be_valid + end - it "should be valid when the feature map is deactivated" do - Setting["feature.map"] = nil + it "should be valid when the feature map is deactivated" do + Setting["feature.map"] = nil - mappable.map_location = nil - mappable.skip_map = nil + mappable.map_location = nil + mappable.skip_map = nil - expect(mappable).to be_valid - end + expect(mappable).to be_valid + end - it "should not be valid without a map location" do - mappable.map_location = nil - mappable.skip_map = nil + it "should not be valid without a map location" do + mappable.map_location = nil + mappable.skip_map = nil - expect(mappable).to_not be_valid - end + expect(mappable).to_not be_valid + end - it "should not be valid without accepting that the mappable has no map" do - mappable.skip_map = nil + it "should not be valid without accepting that the mappable has no map" do + mappable.skip_map = nil - expect(mappable).to_not be_valid - end + expect(mappable).to_not be_valid + end + + end - end describe "cache" do it "should expire cache when the map is updated" do @@ -57,9 +58,9 @@ shared_examples "map validations" do mappable.save expect { map_location.update(latitude: 12.34) } - .to change { mappable.reload.updated_at } + .to change { mappable.reload.updated_at } end end -end \ No newline at end of file +end