diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-03-09 15:38:07 +0100 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-03-09 17:10:43 +0100 |
commit | 53719ecb80b757a2096e55cd3da995ac9db8d3b8 (patch) | |
tree | ea587bb790f42bab84ecf007f947e4cf72a52b82 | |
parent | 96d35c5975fe8c5ff0a6306b8da5a623cfcb47b6 (diff) | |
download | gitlab-ce-53719ecb80b757a2096e55cd3da995ac9db8d3b8.tar.gz |
Handle permissions for ExternalIssue instancesfix-git-push-service-specs
This fixes the remainder of the GitPushService specs.
-rw-r--r-- | app/models/ability.rb | 5 | ||||
-rw-r--r-- | spec/services/git_push_service_spec.rb | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index f34554d557c..fe9e0aab717 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -9,6 +9,7 @@ class Ability when CommitStatus then commit_status_abilities(user, subject) when Project then project_abilities(user, subject) when Issue then issue_abilities(user, subject) + when ExternalIssue then external_issue_abilities(user, subject) when Note then note_abilities(user, subject) when ProjectSnippet then project_snippet_abilities(user, subject) when PersonalSnippet then personal_snippet_abilities(user, subject) @@ -424,6 +425,10 @@ class Ability end end + def external_issue_abilities(user, subject) + project_abilities(user, subject.project) + end + private def named_abilities(name) diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb index 7fee16a0586..82813cee227 100644 --- a/spec/services/git_push_service_spec.rb +++ b/spec/services/git_push_service_spec.rb @@ -367,7 +367,7 @@ describe GitPushService, services: true do } }.to_json - execute_service(project, user, @oldrev, @newrev, @ref ) + execute_service(project, commit_author, @oldrev, @newrev, @ref ) expect(WebMock).to have_requested(:post, jira_api_transition_url).with( body: transition_body ).once @@ -378,7 +378,7 @@ describe GitPushService, services: true do body: "Issue solved with [#{closing_commit.id}|http://localhost/#{project.path_with_namespace}/commit/#{closing_commit.id}]." }.to_json - execute_service(project, user, @oldrev, @newrev, @ref ) + execute_service(project, commit_author, @oldrev, @newrev, @ref ) expect(WebMock).to have_requested(:post, jira_api_comment_url).with( body: comment_body ).once |