Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 37 insertions, 0 deletions

diff --git a/spec/validators/ip_address_validator_spec.rb b/spec/validators/ip_address_validator_spec.rb
new file mode 100644
index 00000000000..382250378c2
--- /dev/null
+++ b/spec/validators/ip_address_validator_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe IpAddressValidator do
+  let(:model) do
+    Class.new do
+      include ActiveModel::Model
+      include ActiveModel::Validations
+
+      attr_accessor :ip_address
+      alias_method :ip_address_before_type_cast, :ip_address
+
+      validates :ip_address, ip_address: true
+    end.new
+  end
+
+  using RSpec::Parameterized::TableSyntax
+
+  where(:ip_address, :validity, :errors) do
+    'invalid IP'                     | false | { ip_address: ['must be a valid IPv4 or IPv6 address'] }
+    '192.168.17.43'                  | true  | {}
+    '2001:0db8:85a3::8a2e:0370:7334' | true  | {}
+    nil                              | true  | {}
+    ''                               | true  | {}
+  end
+
+  with_them do
+    before do
+      model.ip_address = ip_address
+      model.validate
+    end
+
+    it { expect(model.valid?).to eq(validity) }
+    it { expect(model.errors.messages).to eq(errors) }
+  end
+end