From 76d981b50245680ee3c26ea37a29b95b419e8837 Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreira <oswaldo@gitlab.com> Date: Fri, 22 Sep 2017 20:23:15 -0300 Subject: [PATCH] Send valid project path as name for Jira dev panel --- .../send-valid-project-path-as-name-for-jira.yml | 5 +++++ lib/api/github/entities.rb | 2 +- spec/requests/api/v3/github_spec.rb | 16 ++++++++++++---- 3 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 changelogs/unreleased-ee/send-valid-project-path-as-name-for-jira.yml diff --git a/changelogs/unreleased-ee/send-valid-project-path-as-name-for-jira.yml b/changelogs/unreleased-ee/send-valid-project-path-as-name-for-jira.yml new file mode 100644 index 0000000000000000..061a6218fd871e62 --- /dev/null +++ b/changelogs/unreleased-ee/send-valid-project-path-as-name-for-jira.yml @@ -0,0 +1,5 @@ +--- +title: Send valid project path as name for Jira dev panel +merge_request: +author: +type: fixed diff --git a/lib/api/github/entities.rb b/lib/api/github/entities.rb index 076d9ddefb7a47a6..f225d5e962fa8be3 100644 --- a/lib/api/github/entities.rb +++ b/lib/api/github/entities.rb @@ -11,7 +11,7 @@ class Namespace < Grape::Entity class Repository < Grape::Entity expose :id expose :namespace, as: :owner, using: Namespace - expose :name + expose :path, as: :name end class BranchCommit < Grape::Entity diff --git a/spec/requests/api/v3/github_spec.rb b/spec/requests/api/v3/github_spec.rb index aa7e4c5c778daa53..b98ed44542ca70aa 100644 --- a/spec/requests/api/v3/github_spec.rb +++ b/spec/requests/api/v3/github_spec.rb @@ -40,15 +40,17 @@ describe 'GET /users/:namespace/repos' do context 'authenticated' do - it 'returns an array of projects with github format' do - stub_licensed_features(jira_dev_panel_integration: true) + let(:group) { create(:group) } + let!(:group_project) { create(:project, group: group) } - group = create(:group) - create(:project, group: group) + before do + stub_licensed_features(jira_dev_panel_integration: true) group.add_master(user) get v3_api('/users/foo/repos', user) + end + it 'returns an array of projects with github format' do expect(response).to have_http_status(200) expect(response).to include_pagination_headers expect(json_response).to be_an(Array) @@ -56,6 +58,12 @@ expect(response).to match_response_schema('entities/github/repositories') end + + it 'returns valid project path as name' do + project_names = json_response.map { |r| r['name'] } + + expect(project_names).to include(project.path, group_project.path) + end end context 'unauthenticated' do -- GitLab