Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-15 09:46:16 +01:00
Code Issues Packages Projects Releases Activity

Rename method and check permission

Browse Source
This commit is contained in:
Rene Pfeuffer
2019-09-27 11:46:14 +02:00
parent 2519c415bf
commit 3b34cb5278
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-core/src/main/java/sonia/scm/plugin/PluginManager.java
View File

@@ -94,5 +94,5 @@ public interface PluginManager {
*/ */
void executePendingAndRestart(); void executePendingAndRestart();
void cancelInstallations(); void cancelPending();
} }

3
scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java
View File

@@ -274,7 +274,8 @@ public class DefaultPluginManager implements PluginManager {
} }
@Override @Override
public void cancelInstallations() { public void cancelPending() {
PluginPermissions.manage().check();
pendingUninstallQueue.forEach(PendingPluginUninstallation::cancel); pendingUninstallQueue.forEach(PendingPluginUninstallation::cancel);
pendingInstallQueue.forEach(PendingPluginInstallation::cancel); pendingInstallQueue.forEach(PendingPluginInstallation::cancel);
} }

6
scm-webapp/src/test/java/sonia/scm/plugin/DefaultPluginManagerTest.java
View File

@@ -467,7 +467,7 @@ class DefaultPluginManagerTest {
manager.install("scm-git-plugin", false); manager.install("scm-git-plugin", false);
manager.uninstall("scm-ssh-plugin", false); manager.uninstall("scm-ssh-plugin", false);
manager.cancelInstallations(); manager.cancelPending();
assertThat(mailPluginPath.resolve("uninstall")).doesNotExist(); assertThat(mailPluginPath.resolve("uninstall")).doesNotExist();
verify(gitPendingPluginInformation).cancel(); verify(gitPendingPluginInformation).cancel();
@@ -529,5 +529,9 @@ class DefaultPluginManagerTest {
assertThrows(AuthorizationException.class, () -> manager.executePendingAndRestart()); assertThrows(AuthorizationException.class, () -> manager.executePendingAndRestart());
} }
@Test
void shouldThrowAuthorizationExceptionsForCancelPending() {
assertThrows(AuthorizationException.class, () -> manager.cancelPending());
}
} }
} }