diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-21 14:07:46 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-21 14:07:46 +0300 |
commit | b98193c55edc94b3ecf1ff143ac85fa9e9d8f029 (patch) | |
tree | 1318c8c4d5ce2b590de7d1c3d686787a244203ac /spec/models/project_services | |
parent | 53714ddf2bcc56659236d87647d8b8e8412592f3 (diff) | |
parent | d399e1ae2b92bc399962a286fddc59eaa09670a7 (diff) |
Merge branch 'issue_5541' into 'master'
Allow to block JIRA events for commits and merge requests
implements #5541
See merge request !7469
Diffstat (limited to 'spec/models/project_services')
-rw-r--r-- | spec/models/project_services/jira_service_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/models/project_services/jira_service_spec.rb b/spec/models/project_services/jira_service_spec.rb index d8c47322220..f5da967cd14 100644 --- a/spec/models/project_services/jira_service_spec.rb +++ b/spec/models/project_services/jira_service_spec.rb @@ -83,7 +83,8 @@ describe JiraService, models: true do url: 'http://jira.example.com', username: 'gitlab_jira_username', password: 'gitlab_jira_password', - project_key: 'GitLabProject' + project_key: 'GitLabProject', + jira_issue_transition_id: "custom-id" ) # These stubs are needed to test JiraService#close_issue. @@ -177,11 +178,10 @@ describe JiraService, models: true do end it "calls the api with jira_issue_transition_id" do - @jira_service.jira_issue_transition_id = 'this-is-a-custom-id' @jira_service.execute(merge_request, ExternalIssue.new("JIRA-123", project)) expect(WebMock).to have_requested(:post, @transitions_url).with( - body: /this-is-a-custom-id/ + body: /custom-id/ ).once end |