Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
minerva
core
Commits
a5130eb1
Commit
a5130eb1
authored
Oct 08, 2021
by
Piotr Gawron
Browse files
Merge branch 'node-issue' into 'devel_16.0.x'
nodejs 9 is not supported anymore See merge request
!1360
parents
aae8fee0
0f9233dd
Pipeline
#48868
passed with stage
in 25 minutes and 18 seconds
Changes
2
Pipelines
23
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
a5130eb1
...
...
@@ -19,6 +19,8 @@ before_script:
#by default we configure postgres database
-
mkdir /etc/minerva/
-
cp test-postgres-db-ci.properties /etc/minerva/db.properties
-
echo '-k' > ~/.curlrc
-
touch /etc/apt/apt.conf.d/99verify-peer.conf && echo >>/etc/apt/apt.conf.d/99verify-peer.conf "Acquire { https::Verify-Peer
false
}"
test:frontend:
stage
:
test
...
...
@@ -151,7 +153,7 @@ test:frontend:
script
:
&test_backend_web_definition
-
apt-get update
-
DEBIAN_FRONTEND=noninteractive apt-get install -y curl gnupg git ant
-
curl -sL https://deb.nodesource.com/setup_
9
.x | bash -
-
curl -sL https://deb.nodesource.com/setup_
12
.x | bash -
-
DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs
-
mvn -DskipTests=true clean install -pl web -am
-
mvn test -pl web
...
...
@@ -327,7 +329,7 @@ build_war:
-
apt-get update
-
DEBIAN_FRONTEND=noninteractive apt-get install -y curl gnupg git ant
-
curl -sL https://deb.nodesource.com/setup_
9
.x | bash -
-
curl -sL https://deb.nodesource.com/setup_
12
.x | bash -
-
DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs
-
ant maven-build-with-doc
-
cp web/target/*.war minerva.war
...
...
@@ -338,7 +340,7 @@ test:dependency_conflict:
script
:
-
apt-get update
-
DEBIAN_FRONTEND=noninteractive apt-get install -y curl gnupg git ant
-
curl -sL https://deb.nodesource.com/setup_
9
.x | bash -
-
curl -sL https://deb.nodesource.com/setup_
12
.x | bash -
-
DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs
-
mvn clean install -DskipTests=true
...
...
annotation/src/test/java/lcsb/mapviewer/annotation/services/annotators/ReconAnnotatorTest.java
View file @
a5130eb1
...
...
@@ -149,11 +149,11 @@ public class ReconAnnotatorTest extends AnnotationTestFunctions {
@Test
public
void
testAnnotatingForOxygen
()
throws
Exception
{
SimpleMolecule
molecule
=
new
SimpleMolecule
(
"id"
);
molecule
.
setName
(
"o
2
"
);
molecule
.
setName
(
"
h2
o"
);
reconAnnotator
.
annotateElement
(
molecule
);
assertTrue
(
molecule
.
getMiriamData
().
size
()
>
0
);
assertEquals
(
0
,
getWarnings
().
size
());
assertEquals
(
"O
2
"
,
molecule
.
getFormula
());
assertEquals
(
"
H2
O"
,
molecule
.
getFormula
());
}
@Test
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment