diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 00:08:53 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 00:08:53 +0000 |
| commit | d65442b1d9621da6749d59ea1a544a2ea39b3a79 (patch) | |
| tree | 0aa6fb67b70c38cdd949a2b4002ceb459860fa82 /spec/requests/api/graphql | |
| parent | b6ec12ceca58b12d974d46d0579742f4d3cdb9d7 (diff) | |
| download | gitlab-ce-d65442b1d9621da6749d59ea1a544a2ea39b3a79.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/requests/api/graphql')
| -rw-r--r-- | spec/requests/api/graphql/project/merge_request_spec.rb | 2 | ||||
| -rw-r--r-- | spec/requests/api/graphql/tasks/task_completion_status_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/api/graphql/project/merge_request_spec.rb b/spec/requests/api/graphql/project/merge_request_spec.rb index 70c21666799..e1fe6470881 100644 --- a/spec/requests/api/graphql/project/merge_request_spec.rb +++ b/spec/requests/api/graphql/project/merge_request_spec.rb @@ -14,7 +14,7 @@ describe 'getting merge request information nested in a project' do graphql_query_for( 'project', { 'fullPath' => project.full_path }, - query_graphql_field('mergeRequest', iid: merge_request.iid) + query_graphql_field('mergeRequest', iid: merge_request.iid.to_s) ) end diff --git a/spec/requests/api/graphql/tasks/task_completion_status_spec.rb b/spec/requests/api/graphql/tasks/task_completion_status_spec.rb index c457a6d7c25..566d0fe636a 100644 --- a/spec/requests/api/graphql/tasks/task_completion_status_spec.rb +++ b/spec/requests/api/graphql/tasks/task_completion_status_spec.rb @@ -25,7 +25,7 @@ describe 'getting task completion status information' do graphql_query_for( 'project', { 'fullPath' => project.full_path }, - query_graphql_field(type, { iid: iid }, fields) + query_graphql_field(type, { iid: iid.to_s }, fields) ) end |