diff --git a/scm-core/src/main/java/sonia/scm/plugin/Plugin.java b/scm-core/src/main/java/sonia/scm/plugin/Plugin.java index add995a21a..e8fd166e78 100644 --- a/scm-core/src/main/java/sonia/scm/plugin/Plugin.java +++ b/scm-core/src/main/java/sonia/scm/plugin/Plugin.java @@ -35,7 +35,6 @@ package sonia.scm.plugin; //~--- non-JDK imports -------------------------------------------------------- -import com.github.sdorra.ssp.StaticPermissions; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; @@ -53,7 +52,6 @@ import java.util.Set; * * @author Sebastian Sdorra */ -@StaticPermissions( value = "plugin", globalPermissions = {"install", "remove"}, permissions = {} ) @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) public final class Plugin extends ScmModule diff --git a/scm-ui/src/admin/plugins/modules/plugins.test.js b/scm-ui/src/admin/plugins/modules/plugins.test.js index dba52af04b..20b7c10590 100644 --- a/scm-ui/src/admin/plugins/modules/plugins.test.js +++ b/scm-ui/src/admin/plugins/modules/plugins.test.js @@ -21,13 +21,11 @@ import reducer, { fetchPluginSuccess, getPlugin, isFetchPluginPending, - getFetchPluginFailure, - getPermissionsLink + getFetchPluginFailure } from "./plugins"; import type { Plugin, - PluginCollection, - PluginGroup + PluginCollection } from "@scm-manager/ui-types"; const groupManagerPlugin: Plugin = { @@ -75,6 +73,17 @@ const branchwpPlugin: Plugin = { } }; +const pluginCollectionWithNames: PluginCollection = { + _links: { + self: { + href: "http://localhost:8081/api/v2/ui/plugins" + } + }, + _embedded: { + plugins: [groupManagerPlugin.name, scriptPlugin.name, branchwpPlugin.name] + } +}; + const pluginCollection: PluginCollection = { _links: { self: { @@ -267,7 +276,7 @@ describe("plugins selectors", () => { it("should return the plugins collection", () => { const state = { plugins: { - list: pluginCollection, + list: pluginCollectionWithNames, byNames: { "scm-groupmanager-plugin": groupManagerPlugin, "scm-script-plugin": scriptPlugin, @@ -319,21 +328,6 @@ describe("plugins selectors", () => { expect(plugin).toEqual(groupManagerPlugin); }); - it("should return permissions link", () => { - const state = { - plugins: { - byNames: { - "scm-groupmanager-plugin": groupManagerPlugin - } - } - }; - - const link = getPermissionsLink(state, "scm-groupmanager-plugin"); - expect(link).toEqual( - "http://localhost:8081/api/v2/ui/plugins/scm-groupmanager-plugin/permissions/" - ); - }); - it("should return true, when fetch plugin is pending", () => { const state = { pending: {