Add latest changes from gitlab-org/gitlab@master

1 files changed, 32 insertions, 0 deletions

diff --git a/spec/lib/api/helpers/custom_validators_spec.rb b/spec/lib/api/helpers/custom_validators_spec.rb
index 10505210e65..66b86d0a055 100644
--- a/spec/lib/api/helpers/custom_validators_spec.rb
+++ b/spec/lib/api/helpers/custom_validators_spec.rb
@@ -29,6 +29,38 @@ describe API::Helpers::CustomValidators do
     end
   end
 
+  describe API::Helpers::CustomValidators::GitSha do
+    let(:sha) { RepoHelpers.sample_commit.id }
+    let(:short_sha) { sha[0, Gitlab::Git::Commit::MIN_SHA_LENGTH] }
+    let(:too_short_sha) { sha[0, Gitlab::Git::Commit::MIN_SHA_LENGTH - 1] }
+
+    subject do
+      described_class.new(['test'], {}, false, scope.new)
+    end
+
+    context 'valid sha' do
+      it 'does not raise a validation error' do
+        expect_no_validation_error('test' => sha)
+        expect_no_validation_error('test' => short_sha)
+      end
+    end
+
+    context 'empty params' do
+      it 'raises a validation error' do
+        expect_validation_error('test' => nil)
+        expect_validation_error('test' => '')
+      end
+    end
+
+    context 'invalid sha' do
+      it 'raises a validation error' do
+        expect_validation_error('test' => "#{sha}2") # Sha length > 40
+        expect_validation_error('test' => 'somestring')
+        expect_validation_error('test' => too_short_sha) # sha length < MIN_SHA_LENGTH (7)
+      end
+    end
+  end
+
   describe API::Helpers::CustomValidators::FilePath do
     subject do
       described_class.new(['test'], {}, false, scope.new)