Commit 20f39958 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch 'node-issue' into 'devel_15.1.x'

nodejs 9 is not supported anymore

See merge request !1359
parents 3bd995fe 4115740b
Pipeline #48184 failed with stage
in 40 minutes and 11 seconds
......@@ -145,8 +145,10 @@ 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 -
- DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs
- 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 }"
- curl -sL https://deb.nodesource.com/setup_12.x | bash -
- DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-unauthenticated nodejs
- mkdir /etc/minerva/
- cp test-db-ci.properties /etc/minerva/db.properties
- mvn -DskipTests=true clean install -pl web -am
......@@ -297,8 +299,10 @@ build_war:
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 -
- DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs
- 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 }"
- curl -sL https://deb.nodesource.com/setup_12.x | bash -
- DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-unauthenticated nodejs
- ant maven-build
- cp web/target/web-1.0.war minerva.war
......@@ -308,8 +312,10 @@ 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 -
- DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs
- 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 }"
- curl -sL https://deb.nodesource.com/setup_12.x | bash -
- DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-unauthenticated nodejs
- mvn clean install -DskipTests=true
- set +e
......
......@@ -149,11 +149,11 @@ public class ReconAnnotatorTest extends AnnotationTestFunctions {
@Test
public void testAnnotatingForOxygen() throws Exception {
SimpleMolecule molecule = new SimpleMolecule("id");
molecule.setName("o2");
molecule.setName("h2o");
reconAnnotator.annotateElement(molecule);
assertTrue(molecule.getMiriamData().size() > 0);
assertEquals(0, getWarnings().size());
assertEquals("O2", molecule.getFormula());
assertEquals("H2O", molecule.getFormula());
}
@Test
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment