diff options
author | Toon Claes <toon@gitlab.com> | 2017-03-05 07:58:29 +0100 |
---|---|---|
committer | Toon Claes <toon@gitlab.com> | 2017-03-05 07:58:29 +0100 |
commit | 996797d8b3b89717f375b3e75628203aca442c77 (patch) | |
tree | ebd7d26ce8e51a419a788375fbea7fafe0e32b3d | |
parent | 9ec1c8158d74425a20435da4d52a4f796e54b94f (diff) | |
download | gitlab-ce-996797d8b3b89717f375b3e75628203aca442c77.tar.gz |
WIP: Make it all green
-rw-r--r-- | spec/requests/api/groups_spec.rb | 5 | ||||
-rw-r--r-- | spec/requests/api/project_hooks_spec.rb | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb index 858eb6a9635..2545da7b1db 100644 --- a/spec/requests/api/groups_spec.rb +++ b/spec/requests/api/groups_spec.rb @@ -77,8 +77,7 @@ describe API::Groups, api: true do build_artifacts_size: 345, }.stringify_keys exposed_attributes = attributes.dup - exposed_attributes['job_artifacts_size'] = exposed_attributes['build_artifacts_size'] - exposed_attributes.delete('build_artifacts_size') + exposed_attributes['job_artifacts_size'] = exposed_attributes.delete('build_artifacts_size') project1.statistics.update!(attributes) @@ -88,7 +87,7 @@ describe API::Groups, api: true do expect(response).to include_pagination_headers expect(json_response).to be_an Array expect(json_response) - .to satisfy_one { |group| group['statistics'] == attributes } + .to satisfy_one { |group| group['statistics'] == exposed_attributes } end end diff --git a/spec/requests/api/project_hooks_spec.rb b/spec/requests/api/project_hooks_spec.rb index 90cfe61409b..b1f8c249092 100644 --- a/spec/requests/api/project_hooks_spec.rb +++ b/spec/requests/api/project_hooks_spec.rb @@ -59,7 +59,7 @@ describe API::ProjectHooks, 'ProjectHooks', api: true do expect(json_response['merge_requests_events']).to eq(hook.merge_requests_events) expect(json_response['tag_push_events']).to eq(hook.tag_push_events) expect(json_response['note_events']).to eq(hook.note_events) - expect(json_response['job_events']).to eq(hook.job_events) + expect(json_response['job_events']).to eq(hook.build_events) expect(json_response['pipeline_events']).to eq(hook.pipeline_events) expect(json_response['wiki_page_events']).to eq(hook.wiki_page_events) expect(json_response['enable_ssl_verification']).to eq(hook.enable_ssl_verification) |