ensure_length_of -> validate_length_of

6 files changed, 11 insertions, 11 deletions

diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index 557c71b4d2c..86c395a8e8e 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -16,7 +16,7 @@ describe Issue, "Issuable" do
     it { is_expected.to validate_presence_of(:iid) }
     it { is_expected.to validate_presence_of(:author) }
     it { is_expected.to validate_presence_of(:title) }
-    it { is_expected.to ensure_length_of(:title).is_at_least(0).is_at_most(255) }
+    it { is_expected.to validate_length_of(:title).is_at_least(0).is_at_most(255) }
   end
 
   describe "Scope" do
diff --git a/spec/models/key_spec.rb b/spec/models/key_spec.rb
index 6eb1208a7f2..fbb9e162952 100644
--- a/spec/models/key_spec.rb
+++ b/spec/models/key_spec.rb
@@ -26,8 +26,8 @@ describe Key do
   describe "Validation" do
     it { is_expected.to validate_presence_of(:title) }
     it { is_expected.to validate_presence_of(:key) }
-    it { is_expected.to ensure_length_of(:title).is_within(0..255) }
-    it { is_expected.to ensure_length_of(:key).is_within(0..5000) }
+    it { is_expected.to validate_length_of(:title).is_within(0..255) }
+    it { is_expected.to validate_length_of(:key).is_within(0..5000) }
   end
 
   describe "Methods" do
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 48568e2a3ff..87c67fa32c3 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -69,14 +69,14 @@ describe Project do
 
     it { is_expected.to validate_presence_of(:name) }
     it { is_expected.to validate_uniqueness_of(:name).scoped_to(:namespace_id) }
-    it { is_expected.to ensure_length_of(:name).is_within(0..255) }
+    it { is_expected.to validate_length_of(:name).is_within(0..255) }
 
     it { is_expected.to validate_presence_of(:path) }
     it { is_expected.to validate_uniqueness_of(:path).scoped_to(:namespace_id) }
-    it { is_expected.to ensure_length_of(:path).is_within(0..255) }
-    it { is_expected.to ensure_length_of(:description).is_within(0..2000) }
+    it { is_expected.to validate_length_of(:path).is_within(0..255) }
+    it { is_expected.to validate_length_of(:description).is_within(0..2000) }
     it { is_expected.to validate_presence_of(:creator) }
-    it { is_expected.to ensure_length_of(:issues_tracker_id).is_within(0..255) }
+    it { is_expected.to validate_length_of(:issues_tracker_id).is_within(0..255) }
     it { is_expected.to validate_presence_of(:namespace) }
 
     it 'should not allow new projects beyond user limits' do
diff --git a/spec/models/snippet_spec.rb b/spec/models/snippet_spec.rb
index c81dd36ef4b..c786d0bf103 100644
--- a/spec/models/snippet_spec.rb
+++ b/spec/models/snippet_spec.rb
@@ -38,10 +38,10 @@ describe Snippet do
     it { is_expected.to validate_presence_of(:author) }
 
     it { is_expected.to validate_presence_of(:title) }
-    it { is_expected.to ensure_length_of(:title).is_within(0..255) }
+    it { is_expected.to validate_length_of(:title).is_within(0..255) }
 
     it { is_expected.to validate_presence_of(:file_name) }
-    it { is_expected.to ensure_length_of(:file_name).is_within(0..255) }
+    it { is_expected.to validate_length_of(:file_name).is_within(0..255) }
 
     it { is_expected.to validate_presence_of(:content) }
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index be0b70395d6..f1b8afa5854 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -96,7 +96,7 @@ describe User do
     it { is_expected.to allow_value(0).for(:projects_limit) }
     it { is_expected.not_to allow_value(-1).for(:projects_limit) }
 
-    it { is_expected.to ensure_length_of(:bio).is_within(0..255) }
+    it { is_expected.to validate_length_of(:bio).is_within(0..255) }
 
     describe 'email' do
       it 'accepts info@example.com' do
diff --git a/spec/support/matchers.rb b/spec/support/matchers.rb
index 52b11bd6323..f8cce2ea5a3 100644
--- a/spec/support/matchers.rb
+++ b/spec/support/matchers.rb
@@ -70,7 +70,7 @@ end
 
 # Extend shoulda-matchers
 module Shoulda::Matchers::ActiveModel
-  class EnsureLengthOfMatcher
+  class ValidateLengthOfMatcher
     # Shortcut for is_at_least and is_at_most
     def is_within(range)
       is_at_least(range.min) && is_at_most(range.max)