Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into update-template-name-via-sentence-case

# Conflicts:
#	.gitlab/issue_templates/Feature proposal.md

1 files changed, 16 insertions, 0 deletions

diff --git a/spec/graphql/types/project_type_spec.rb b/spec/graphql/types/project_type_spec.rb
new file mode 100644
index 00000000000..7b5bc335511
--- /dev/null
+++ b/spec/graphql/types/project_type_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe GitlabSchema.types['Project'] do
+  it { expect(described_class).to expose_permissions_using(Types::PermissionTypes::Project) }
+
+  it { expect(described_class.graphql_name).to eq('Project') }
+
+  describe 'nested merge request' do
+    it { expect(described_class).to have_graphql_field(:merge_request) }
+
+    it 'authorizes the merge request' do
+      expect(described_class.fields['mergeRequest'])
+        .to  require_graphql_authorizations(:read_merge_request)
+    end
+  end
+end