diff --git a/.aspell-api-exceptions.pws b/.aspell-api-exceptions.pws index 1181f134bb867d25f32f470a621aedbf52084723..3774ce750b814ddd68d5d042f5302fb1c7cf47c8 100644 --- a/.aspell-api-exceptions.pws +++ b/.aspell-api-exceptions.pws @@ -10,21 +10,26 @@ gui HMDB INTERPRO ISOFORM +inputFormat inputType +isDefault +isPublic lastActive ldapAccountAvailable maxColor minColor MGD neutralColor -OMIM objectId +OMIM +outputFormat PDB privilegeType REFSEQ requestResetPassword sbgn simpleColor +taxonomyId termsOfUseConsent updatePreferences updatePrivileges diff --git a/.aspell.en.pws b/.aspell.en.pws index 79ed76c0f3ec30e8a8268cba4d6cb1cb711ac366..d9bbca3f356b37e20054c60f14235e43d098d57c 100644 --- a/.aspell.en.pws +++ b/.aspell.en.pws @@ -258,6 +258,7 @@ MGED MicrosporidiaDB MimoDB minerva +MINERVA’s MIPModDB mirEX miriam diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 656c7f847a137105246de431aed533f02301dac3..2d6c98f81d2b348d7e8238bd651b45b144ab543f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -596,4 +596,4 @@ changelog_spelling: script: - apt-get update - apt-get install -y aspell aspell-en - - sh test_spelling.sh + - ./test_spelling.sh diff --git a/test_spelling.sh b/test_spelling.sh old mode 100644 new mode 100755 index 1cea036c8659d01c8fc3561c7ac16583ea1e739d..5ecbd2f27d8c91b53a0860fb04ec99cc815d88f8 --- a/test_spelling.sh +++ b/test_spelling.sh @@ -1,5 +1,7 @@ #!/bin/bash -ls web/target/generated-docs/*.html CHANGELOG -c1 | while read filename +result=0 + +while read filename do html='' case $filename in *.html) @@ -11,7 +13,8 @@ do echo "[$filename] Unknown words:" echo cat $filename | aspell --lang=en $html --encoding=utf-8 --add-extra-dicts=./.aspell.en.pws --add-extra-dicts=./.aspell-api-exceptions.pws list |sort |uniq - exit 1 + result=1 fi -done +done <<< "$(ls web/target/generated-docs/*.html CHANGELOG -c1)" +exit $result diff --git a/web/src/test/java/lcsb/mapviewer/web/PluginControllerIntegrationTest.java b/web/src/test/java/lcsb/mapviewer/web/PluginControllerIntegrationTest.java index b3dc9a3b3770ced2f84367f0e0e1e47d3815889e..1f5352d5813971b05bea3183aab1ed13115d8907 100644 --- a/web/src/test/java/lcsb/mapviewer/web/PluginControllerIntegrationTest.java +++ b/web/src/test/java/lcsb/mapviewer/web/PluginControllerIntegrationTest.java @@ -132,7 +132,7 @@ public class PluginControllerIntegrationTest extends ControllerIntegrationTest { .description("version"), parameterWithName("isDefault") .optional() - .description("should be opened automatically whem map is browsed"), + .description("should be opened automatically when map is browsed"), parameterWithName("isPublic") .description("should the plugin be visible by all users"), parameterWithName("url") @@ -171,7 +171,7 @@ public class PluginControllerIntegrationTest extends ControllerIntegrationTest { .description("md5 checksum of the source file") .type("string"), fieldWithPath("isDefault") - .description("should be opened automatically whem map is browsed") + .description("should be opened automatically when map is browsed") .type("boolean"), fieldWithPath("isPublic") .description("should be visible on plugin list to all users")