opendev/gerrit
Code Issues Proposed changes

Remove backend support for HTML UI plugins

Browse Source 
Frontend support was removed in change 299364. So there is no point for
the backend to send HTML plugins to be loaded to the frontend. :-)

Change-Id: I44cc0d15910937de7e1f9b9780a799d4b85b0673
This commit is contained in:
Ben Rohlfs
2021-04-08 17:21:51 +02:00
parent 45039e3177
commit ee2e12bf29
6 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
javatests/com/google/gerrit/acceptance/api/plugin/PluginIT.java
View File

@@ -48,18 +48,14 @@ import org.junit.Test;
@NoHttpd
public class PluginIT extends AbstractDaemonTest {
private static final String JS_PLUGIN = "Gerrit.install(function(self){});\n";
private static final String HTML_PLUGIN =
String.format("<dom-module id=\"test\"><script>%s</script></dom-module>", JS_PLUGIN);
private static final RawInput JS_PLUGIN_CONTENT = RawInputUtil.create(JS_PLUGIN.getBytes(UTF_8));
private static final RawInput HTML_PLUGIN_CONTENT =
RawInputUtil.create(HTML_PLUGIN.getBytes(UTF_8));
private static final ImmutableList<String> PLUGINS =
ImmutableList.of(
"plugin-a.js",
"plugin-b.html",
"plugin-b.js",
"plugin-c.js",
"plugin-d.html",
"plugin-d.js",
"plugin-normal.jar",
"plugin-empty.jar",
"plugin-unset.jar",
@@ -97,7 +93,7 @@ public class PluginIT extends AbstractDaemonTest {
assertPlugins(list().start(1).limit(2).get(), PLUGINS.subList(1, 3));
// With prefix
assertPlugins(list().prefix("plugin-b").get(), ImmutableList.of("plugin-b.html"));
assertPlugins(list().prefix("plugin-b").get(), ImmutableList.of("plugin-b.js"));
assertPlugins(list().prefix("PLUGIN-").get(), ImmutableList.of());
// With substring
@@ -105,7 +101,7 @@ public class PluginIT extends AbstractDaemonTest {
assertPlugins(list().substring("lugin-").start(1).limit(2).get(), PLUGINS.subList(1, 3));
// With regex
assertPlugins(list().regex(".*in-b").get(), ImmutableList.of("plugin-b.html"));
assertPlugins(list().regex(".*in-b").get(), ImmutableList.of("plugin-b.js"));
assertPlugins(list().regex("plugin-.*").get(), PLUGINS.subList(0, PLUGINS.size() - 1));
assertPlugins(list().regex("plugin-.*").start(1).limit(2).get(), PLUGINS.subList(1, 3));
@@ -147,7 +143,7 @@ public class PluginIT extends AbstractDaemonTest {
com.google.gerrit.extensions.common.InstallPluginInput input =
new com.google.gerrit.extensions.common.InstallPluginInput();
input.raw = JS_PLUGIN_CONTENT;
gApi.plugins().install("legacy.html", input);
gApi.plugins().install("legacy.js", input);
gApi.plugins().name("legacy").get();
}
@@ -198,9 +194,6 @@ public class PluginIT extends AbstractDaemonTest {
if (plugin.endsWith(".js")) {
return JS_PLUGIN_CONTENT;
}
if (plugin.endsWith(".html")) {
return HTML_PLUGIN_CONTENT;
}
assertThat(plugin).endsWith(".jar");
return pluginJarContent(plugin);
}