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

Fix typo

Browse Source
This commit is contained in:
René Pfeuffer
2019-06-13 10:38:15 +02:00
parent ffa4625e36
commit 67a78fd3b2
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java
View File

@@ -142,8 +142,8 @@ public class BootstrapContextListener implements ServletContextListener {
Throwable startupError = SCMContext.getContext().getStartupError();
if (startupError != null) {
contextListener = SingleView.error(startupError);
} else if (Versions.isToOld()) {
contextListener = SingleView.view("/templates/to-old.mustache", HttpServletResponse.SC_CONFLICT);
} else if (Versions.isTooOld()) {
contextListener = SingleView.view("/templates/too-old.mustache", HttpServletResponse.SC_CONFLICT);
} else {
createMigrationOrNormalContextListener();
Versions.writeNew();

6
scm-webapp/src/main/java/sonia/scm/boot/Versions.java
View File

@@ -29,7 +29,7 @@ class Versions {
}
@VisibleForTesting
boolean isPreviousVersionToOld() {
boolean isPreviousVersionTooOld() {
return readVersion().map(v -> v.isOlder(MIN_VERSION)).orElse(false);
}
@@ -66,8 +66,8 @@ class Versions {
}
}
static boolean isToOld() {
return new Versions(SCMContext.getContext()).isPreviousVersionToOld();
static boolean isTooOld() {
return new Versions(SCMContext.getContext()).isPreviousVersionTooOld();
}
static void writeNew() {

0
scm-webapp/src/main/resources/templates/to-old.mustache → scm-webapp/src/main/resources/templates/too-old.mustache
View File

14
scm-webapp/src/test/java/sonia/scm/boot/VersionsTest.java
View File

@@ -29,37 +29,37 @@ class VersionsTest {
@Test
void shouldReturnTrueForVersionsPreviousTo160(@TempDirectory.TempDir Path directory) throws IOException {
setVersion(directory, "1.59");
assertThat(versions.isPreviousVersionToOld()).isTrue();
assertThat(versions.isPreviousVersionTooOld()).isTrue();
setVersion(directory, "1.12");
assertThat(versions.isPreviousVersionToOld()).isTrue();
assertThat(versions.isPreviousVersionTooOld()).isTrue();
}
@Test
void shouldReturnFalseForVersion160(@TempDirectory.TempDir Path directory) throws IOException {
setVersion(directory, "1.60");
assertThat(versions.isPreviousVersionToOld()).isFalse();
assertThat(versions.isPreviousVersionTooOld()).isFalse();
}
@Test
void shouldNotFailIfVersionContainsLineBreak(@TempDirectory.TempDir Path directory) throws IOException {
setVersion(directory, "1.59\n");
assertThat(versions.isPreviousVersionToOld()).isTrue();
assertThat(versions.isPreviousVersionTooOld()).isTrue();
}
@Test
void shouldReturnFalseForVersionsNewerAs160(@TempDirectory.TempDir Path directory) throws IOException {
setVersion(directory, "1.61");
assertThat(versions.isPreviousVersionToOld()).isFalse();
assertThat(versions.isPreviousVersionTooOld()).isFalse();
setVersion(directory, "1.82");
assertThat(versions.isPreviousVersionToOld()).isFalse();
assertThat(versions.isPreviousVersionTooOld()).isFalse();
}
@Test
void shouldReturnFalseForNonExistingVersionFile(@TempDirectory.TempDir Path directory) {
setVersionFile(directory.resolve("version.txt"));
assertThat(versions.isPreviousVersionToOld()).isFalse();
assertThat(versions.isPreviousVersionTooOld()).isFalse();
}
@Test