Merge branch 'stable-3.1' into stable-3.2 * stable-3.1: Add helper method to query select all dom elements Remove obsolete GWT change-related screenshot e2e-tests: Add rename-project to the plugins list Decode group id before using it to add [cc-]reviewers Bump Bazel version to 3.5.0 Update git submodules e2e-tests: Support optional parent in CreateProject Change-Id: I6f6194bb5e6ce979a26bbb56c2c33f024e471aba
diff --git a/.bazelversion b/.bazelversion index 47b322c..1545d96 100644 --- a/.bazelversion +++ b/.bazelversion
@@ -1 +1 @@ -3.4.1 +3.5.0
diff --git a/Documentation/dev-e2e-tests.txt b/Documentation/dev-e2e-tests.txt index 206d509..c5b3bfc 100644 --- a/Documentation/dev-e2e-tests.txt +++ b/Documentation/dev-e2e-tests.txt
@@ -182,10 +182,11 @@ Plugin or otherwise non-core scenarios may do so just as well. The core java package `com.google.gerrit.scenarios` from the example above has to be replaced with the one under which those scenario classes are. Such extending scenarios can also add extension-specific properties. -Early examples of this can be found in the Gerrit -`link:https://gerrit.googlesource.com/plugins/high-availability[high-availability,role=external,window=_blank]` -and `link:https://gerrit.googlesource.com/plugins/multi-site[multi-site,role=external,window=_blank]` -plugins test code. +Examples of this can be found in these Gerrit plugins test code: + +* `link:https://gerrit.googlesource.com/plugins/high-availability[high-availability,role=external,window=_blank]` +* `link:https://gerrit.googlesource.com/plugins/multi-site[multi-site,role=external,window=_blank]` +* `link:https://gerrit.googlesource.com/plugins/rename-project[rename-project,role=external,window=_blank]` Further above, the `_PROJECT` keyword is prefixed with an underscore, which means that its value gets automatically generated by the scenario. Any property setting for it is therefore not
diff --git a/Documentation/images/inline-edit-create-change-project-screen-dialog.png b/Documentation/images/inline-edit-create-change-project-screen-dialog.png deleted file mode 100644 index ea5daa9..0000000 --- a/Documentation/images/inline-edit-create-change-project-screen-dialog.png +++ /dev/null Binary files differ
diff --git a/Documentation/images/inline-edit-create-change-project-screen.png b/Documentation/images/inline-edit-create-change-project-screen.png deleted file mode 100644 index e9c7033..0000000 --- a/Documentation/images/inline-edit-create-change-project-screen.png +++ /dev/null Binary files differ
diff --git a/Documentation/images/inline-edit-create-follow-up-change.png b/Documentation/images/inline-edit-create-follow-up-change.png deleted file mode 100644 index 3e81eee..0000000 --- a/Documentation/images/inline-edit-create-follow-up-change.png +++ /dev/null Binary files differ
diff --git a/Documentation/images/inline-edit-edit-in-diff-screen-patch-list.png b/Documentation/images/inline-edit-edit-in-diff-screen-patch-list.png deleted file mode 100644 index bdbc59d..0000000 --- a/Documentation/images/inline-edit-edit-in-diff-screen-patch-list.png +++ /dev/null Binary files differ
diff --git a/Documentation/images/inline-edit-edit-in-patch-list.png b/Documentation/images/inline-edit-edit-in-patch-list.png deleted file mode 100644 index 9a31e02..0000000 --- a/Documentation/images/inline-edit-edit-in-patch-list.png +++ /dev/null Binary files differ
diff --git a/e2e-tests/src/test/resources/data/com/google/gerrit/scenarios/CreateProject-body.json b/e2e-tests/src/test/resources/data/com/google/gerrit/scenarios/CreateProject-body.json index bcf4708..282ac99 100644 --- a/e2e-tests/src/test/resources/data/com/google/gerrit/scenarios/CreateProject-body.json +++ b/e2e-tests/src/test/resources/data/com/google/gerrit/scenarios/CreateProject-body.json
@@ -1,3 +1,4 @@ { - "create_empty_commit": "true" + "create_empty_commit": "true", + "parent": "${parent}" }
diff --git a/e2e-tests/src/test/resources/data/com/google/gerrit/scenarios/CreateProject.json b/e2e-tests/src/test/resources/data/com/google/gerrit/scenarios/CreateProject.json index cd90739..c141bb8 100644 --- a/e2e-tests/src/test/resources/data/com/google/gerrit/scenarios/CreateProject.json +++ b/e2e-tests/src/test/resources/data/com/google/gerrit/scenarios/CreateProject.json
@@ -1,5 +1,6 @@ [ { - "url": "HTTP_SCHEME://HOSTNAME:HTTP_PORT/a/projects/PROJECT" + "url": "HTTP_SCHEME://HOSTNAME:HTTP_PORT/a/projects/PROJECT", + "parent": "PARENT" } ]
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateProject.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateProject.scala index d631292..f2b3d12 100644 --- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateProject.scala +++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateProject.scala
@@ -28,7 +28,7 @@ val test: ScenarioBuilder = scenario(unique) .feed(data) - .exec(httpRequest.body(RawFileBody(body)).asJson) + .exec(httpRequest.body(ElFileBody(body)).asJson) setUp( test.inject(
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala index 4832392..679320d 100644 --- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala +++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala
@@ -67,6 +67,8 @@ case ("number", number) => val precedes = replaceKeyWith("_number", 0, number.toString) replaceProperty("number", 1, precedes) + case ("parent", parent) => + replaceProperty("parent", "All-Projects", parent.toString) case ("project", project) => var precedes = replaceKeyWith("_project", name, project.toString) precedes = replaceOverride(precedes)
diff --git a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.js b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.js index 419e95b..749f0ba 100644 --- a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.js +++ b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.js
@@ -470,7 +470,7 @@ if (reviewer.account) { reviewerId = reviewer.account._account_id || reviewer.account.email; } else if (reviewer.group) { - reviewerId = reviewer.group.id; + reviewerId = decodeURIComponent(reviewer.group.id); confirmed = reviewer.group.confirmed; } return {reviewer: reviewerId, confirmed};
