fix build error / fix Tests

This commit is contained in:
Eduard Heimbuch
2019-07-08 16:08:08 +02:00
parent dffe0d07f2
commit 9b1867862f
2 changed files with 14 additions and 22 deletions

View File

@@ -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

View File

@@ -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: {