diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2017-02-22 17:32:41 +0000 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2017-02-22 17:32:41 +0000 |
| commit | 931db7963ee9fa145d8fe2fb5eea209215227db7 (patch) | |
| tree | a85ddfcf479ea09237c54a6ce9b0557925f583ff /spec/requests/ci | |
| parent | 0b402e11e355dc8d834fbc139f4bca810a9f766e (diff) | |
| parent | 33e4294fc884c7bd2a7fb86baf4731daf87db7bb (diff) | |
| download | gitlab-ce-api-notes-entity-fields.tar.gz | |
Merge branch 'master' into 'api-notes-entity-fields'api-notes-entity-fields
# Conflicts:
# doc/api/v3_to_v4.md
Diffstat (limited to 'spec/requests/ci')
| -rw-r--r-- | spec/requests/ci/api/triggers_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/requests/ci/api/triggers_spec.rb b/spec/requests/ci/api/triggers_spec.rb index a30be767119..5321f8b134f 100644 --- a/spec/requests/ci/api/triggers_spec.rb +++ b/spec/requests/ci/api/triggers_spec.rb @@ -60,7 +60,8 @@ describe Ci::API::Triggers do it 'validates variables to be a hash' do post ci_api("/projects/#{project.ci_id}/refs/master/trigger"), options.merge(variables: 'value') expect(response).to have_http_status(400) - expect(json_response['message']).to eq('variables needs to be a hash') + + expect(json_response['error']).to eq('variables is invalid') end it 'validates variables needs to be a map of key-valued strings' do |