Skip to content
Snippets Groups Projects
Commit 53e0267c authored by Rafael Dias's avatar Rafael Dias
Browse files

Issue #78: Add yarn


Signed-off-by: default avatarRafael <rpd17@inf.ufpr.br>
parent 30658b05
No related branches found
No related tags found
No related merge requests found
Pipeline #
......@@ -23,12 +23,12 @@ stages:
run_tests:
stage: test
before_script:
- npm install --silent
- yarn install
script:
- mv config/ci_test.yaml.example config/test.yaml
- mv config/ci_test.env.example config/test.env
- npm test
- npm run lint
- yarn test
- yarn run lint
tags:
- node
- postgres
......
......@@ -25,7 +25,7 @@ RUN \
USER node
WORKDIR $WORKSPACE
RUN npm install
RUN yarn install
# Bundle app source
# COPY copy files as root so chown must be used
......
......@@ -215,28 +215,29 @@ enumTypes:
-
name: "enumtype:0"
values:
- "test:0"
- "test:1"
- "test:2"
- "test:3"
- "male"
- "female"
- "binary"
- "undecided"
-
name: "enumtype:1"
values:
- "test:4"
- "test:5"
- "test:6"
- "test_4"
- "test_5"
- "test_6"
- "string"
-
name: "enumtype:2"
values:
- "test:7"
- "test:8"
- "test_7"
- "test_8"
-
name: "enumtype:3"
values:
- "test:9"
- "test_9"
sources:
-
name: "source:0"
name: "source_0"
description: "source with 3 entries"
fields:
-
......@@ -252,30 +253,56 @@ sources:
description: "third entry"
dataType: "string"
-
name: "source:1"
name: "source_1"
description: "source with 2 entries"
fields:
-
name: "fields:0"
description: "first entry"
dataType: "string"
dataType: "enumtype:0"
-
name: "fields:1"
description: "second entry"
dataType: "string"
-
name: "source:2"
description: "source with one entry"
name: "source_2"
description: "source with one entry and undefined dataType"
fields:
-
name: "fields:0"
description: "first entry"
dataType: "string"
dataType: "notValid"
-
name: "source:3"
name: "source_3"
description: "source with one entry and without description"
fields:
-
name: "fields:3"
name: "fields:0"
dataType: "string"
-
name: "source_4"
description: "source with all core types from blendb"
fields:
-
name: "fields:0"
description: "first entry"
dataType: "integer"
-
name: "fields:1"
description: "second entry"
dataType: "float"
-
name: "fields:2"
description: "third entry"
dataType: "string"
-
name: "fields:3"
description: "fourth entry"
dataType: "boolean"
-
name: "fields:4"
description: "fifth entry"
dataType: "date"
\ No newline at end of file
......@@ -43,7 +43,7 @@ describe("API engine controller", () => {
.expect((res: any) => {
let result = res.body;
expect(result).to.be.an("array");
expect(result).to.have.length(4);
expect(result).to.have.length(5);
})
.end(done);
});
......
......@@ -105,7 +105,7 @@ export class ConfigParser {
public static parse(configPath: string): ParsedConfig {
let config: ConfigSchema = yaml.safeLoad(fs.readFileSync(configPath, {
encoding: "utf-8"
}));
})) as ConfigSchema;
let connection: Connection = {
user: process.env.BLENDB_DB_USER,
......
yarn.lock 0 → 100644
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment