Add latest changes from gitlab-org/gitlab@master

2 files changed, 47 insertions, 1 deletions

diff --git a/spec/graphql/resolvers/last_commit_resolver_spec.rb b/spec/graphql/resolvers/last_commit_resolver_spec.rb
new file mode 100644
index 00000000000..15b09b77a10
--- /dev/null
+++ b/spec/graphql/resolvers/last_commit_resolver_spec.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Resolvers::LastCommitResolver do
+  include GraphqlHelpers
+
+  let(:repository) { create(:project, :repository).repository }
+  let(:tree) { repository.tree(ref, path) }
+
+  let(:commit) { resolve(described_class, obj: tree) }
+
+  describe '#resolve' do
+    context 'last commit is a merge commit' do
+      let(:ref) { 'master' }
+      let(:path) { '/' }
+
+      it 'resolves to the merge commit' do
+        expect(commit).to eq(repository.commits(ref, limit: 1).last)
+      end
+    end
+
+    context 'last commit for a different branch and path' do
+      let(:ref) { 'fix' }
+      let(:path) { 'files' }
+
+      it 'resolves commit' do
+        expect(commit).to eq(repository.commits(ref, path: path, limit: 1).last)
+      end
+    end
+
+    context 'last commit does not exist' do
+      let(:ref) { 'master' }
+      let(:path) { 'does-not-exist' }
+
+      it 'returns nil' do
+        expect(commit).to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/graphql/types/commit_type_spec.rb b/spec/graphql/types/commit_type_spec.rb
index 5d8edcf254c..1ff1c97f8db 100644
--- a/spec/graphql/types/commit_type_spec.rb
+++ b/spec/graphql/types/commit_type_spec.rb
@@ -7,5 +7,10 @@ describe GitlabSchema.types['Commit'] do
 
   it { expect(described_class).to require_graphql_authorizations(:download_code) }
 
-  it { expect(described_class).to have_graphql_fields(:id, :sha, :title, :description, :message, :authored_date, :author, :web_url, :latest_pipeline) }
+  it 'contains attributes related to commit' do
+    expect(described_class).to have_graphql_fields(
+      :id, :sha, :title, :description, :message, :authored_date,
+      :author, :web_url, :latest_pipeline, :signature_html
+    )
+  end
 end