diff options
Diffstat (limited to 'qa/qa/specs/features/api/3_create/merge_request')
4 files changed, 5 insertions, 5 deletions
diff --git a/qa/qa/specs/features/api/3_create/merge_request/push_options_mwps_spec.rb b/qa/qa/specs/features/api/3_create/merge_request/push_options_mwps_spec.rb index dde4708874d..157a9e92817 100644 --- a/qa/qa/specs/features/api/3_create/merge_request/push_options_mwps_spec.rb +++ b/qa/qa/specs/features/api/3_create/merge_request/push_options_mwps_spec.rb @@ -64,7 +64,7 @@ module QA merge_request = Resource::MergeRequest.fabricate_via_api! do |mr| mr.project = project - mr.id = merge_request[:iid] + mr.iid = merge_request[:iid] end expect(merge_request.state).to eq('opened') @@ -109,7 +109,7 @@ module QA merge_request = Support::Waiter.wait_until(sleep_interval: 5) do mr = Resource::MergeRequest.fabricate_via_api! do |mr| mr.project = project - mr.id = merge_request[:iid] + mr.iid = merge_request[:iid] end next unless mr.state == 'merged' diff --git a/qa/qa/specs/features/api/3_create/merge_request/push_options_remove_source_branch_spec.rb b/qa/qa/specs/features/api/3_create/merge_request/push_options_remove_source_branch_spec.rb index bf2ecfdb513..eb93f4cd5cb 100644 --- a/qa/qa/specs/features/api/3_create/merge_request/push_options_remove_source_branch_spec.rb +++ b/qa/qa/specs/features/api/3_create/merge_request/push_options_remove_source_branch_spec.rb @@ -34,7 +34,7 @@ module QA merge_request = Resource::MergeRequest.fabricate_via_api! do |mr| mr.project = project - mr.id = merge_request[:iid] + mr.iid = merge_request[:iid] end.merge_via_api! expect(merge_request[:state]).to eq('merged') diff --git a/qa/qa/specs/features/api/3_create/merge_request/push_options_target_branch_spec.rb b/qa/qa/specs/features/api/3_create/merge_request/push_options_target_branch_spec.rb index e02d32bc4c7..799efc243d4 100644 --- a/qa/qa/specs/features/api/3_create/merge_request/push_options_target_branch_spec.rb +++ b/qa/qa/specs/features/api/3_create/merge_request/push_options_target_branch_spec.rb @@ -55,7 +55,7 @@ module QA merge_request = Resource::MergeRequest.fabricate_via_api! do |mr| mr.project = project - mr.id = merge_request[:iid] + mr.iid = merge_request[:iid] end.merge_via_api! expect(merge_request[:state]).to eq('merged') diff --git a/qa/qa/specs/features/api/3_create/merge_request/push_options_title_description_spec.rb b/qa/qa/specs/features/api/3_create/merge_request/push_options_title_description_spec.rb index f49a8a229dc..62e6290183f 100644 --- a/qa/qa/specs/features/api/3_create/merge_request/push_options_title_description_spec.rb +++ b/qa/qa/specs/features/api/3_create/merge_request/push_options_title_description_spec.rb @@ -39,7 +39,7 @@ module QA merge_request = Resource::MergeRequest.fabricate_via_api! do |mr| mr.project = project - mr.id = merge_request[:iid] + mr.iid = merge_request[:iid] end.merge_via_api! expect(merge_request[:state]).to eq('merged') |