Fix the v4 CLI tests (id/iid)

Gauvain Pocentek · Gauvain Pocentek · commit b0af94676742 · 2017-08-20T21:43:14.000+02:00
diff --git a/tools/cli_test_v4.sh b/tools/cli_test_v4.sh
@@ -60,11 +60,11 @@ testcase "issue creation" '
     OUTPUT=$(GITLAB project-issue create --project-id "$PROJECT_ID" \
         --title "my issue" --description "my issue description")
 '
-ISSUE_ID=$(pecho "${OUTPUT}" | grep ^id: | cut -d' ' -f2)
+ISSUE_ID=$(pecho "${OUTPUT}" | grep ^iid: | cut -d' ' -f2)
 
 testcase "note creation" '
     GITLAB project-issue-note create --project-id "$PROJECT_ID" \
-        --issue-id "$ISSUE_ID" --body "the body" >/dev/null 2>&1
+        --issue-iid "$ISSUE_ID" --body "the body" >/dev/null 2>&1
 '
 
 testcase "branch creation" '
@@ -82,11 +82,11 @@ testcase "merge request creation" '
         --source-branch branch1 --target-branch master \
         --title "Update README")
 '
-MR_ID=$(pecho "${OUTPUT}" | grep ^id: | cut -d' ' -f2)
+MR_ID=$(pecho "${OUTPUT}" | grep ^iid: | cut -d' ' -f2)
 
 testcase "merge request validation" '
     GITLAB project-merge-request merge --project-id "$PROJECT_ID" \
-        --id "$MR_ID" >/dev/null 2>&1
+        --iid "$MR_ID" >/dev/null 2>&1
 '
 
 testcase "branch deletion" '

Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,11 @@ testcase "issue creation" '`
`60`	`60`	`OUTPUT=$(GITLAB project-issue create --project-id "$PROJECT_ID" \`
`61`	`61`	`--title "my issue" --description "my issue description")`
`62`	`62`	`'`
`63`		`-ISSUE_ID=$(pecho "${OUTPUT}" \| grep ^id: \| cut -d' ' -f2)`
	`63`	`+ISSUE_ID=$(pecho "${OUTPUT}" \| grep ^iid: \| cut -d' ' -f2)`
`64`	`64`
`65`	`65`	`testcase "note creation" '`
`66`	`66`	`GITLAB project-issue-note create --project-id "$PROJECT_ID" \`
`67`		`- --issue-id "$ISSUE_ID" --body "the body" >/dev/null 2>&1`
	`67`	`+ --issue-iid "$ISSUE_ID" --body "the body" >/dev/null 2>&1`
`68`	`68`	`'`
`69`	`69`
`70`	`70`	`testcase "branch creation" '`
`@@ -82,11 +82,11 @@ testcase "merge request creation" '`
`82`	`82`	`--source-branch branch1 --target-branch master \`
`83`	`83`	`--title "Update README")`
`84`	`84`	`'`
`85`		`-MR_ID=$(pecho "${OUTPUT}" \| grep ^id: \| cut -d' ' -f2)`
	`85`	`+MR_ID=$(pecho "${OUTPUT}" \| grep ^iid: \| cut -d' ' -f2)`
`86`	`86`
`87`	`87`	`testcase "merge request validation" '`
`88`	`88`	`GITLAB project-merge-request merge --project-id "$PROJECT_ID" \`
`89`		`- --id "$MR_ID" >/dev/null 2>&1`
	`89`	`+ --iid "$MR_ID" >/dev/null 2>&1`
`90`	`90`	`'`
`91`	`91`
`92`	`92`	`testcase "branch deletion" '`