Skip to content
Snippets Groups Projects
Commit a905e305 authored by Moritz Langenstein's avatar Moritz Langenstein
Browse files

Merge branch 'master' of gitlab.doc.ic.ac.uk:sweng-group-15/drawing-app

parents 32c195c2 cc50d1ce
No related branches found
No related tags found
No related merge requests found
......@@ -2,16 +2,17 @@ module.exports = {
env: {
browser: true,
es6: true,
node: true
node: true,
jest: true,
},
extends: "eslint:recommended",
globals: {
Atomics: "readonly",
SharedArrayBuffer: "readonly"
SharedArrayBuffer: "readonly",
},
parserOptions: {
ecmaVersion: 2018,
sourceType: "module"
sourceType: "module",
},
rules: {}
};
rules: {},
}
const sum = (a, b) => a + b
describe("number adding", () => {
describe("number summation", () => {
it("adds 1 + 2 to equal 3", () => {
expect(sum(1, 2)).toBe(3)
})
})
})
Source diff could not be displayed: it is too large. Options to address this: view the blob.
......@@ -5,7 +5,8 @@
"main": "index.js",
"scripts": {
"build": "webpack src/app.js -o public/js/app.js",
"start": "http-server -c-1 -p 12345 public"
"start": "http-server -c-1 -p 12345 public",
"test": "jest"
},
"dependencies": {
"http-server": "^0.11.1",
......@@ -18,6 +19,7 @@
"yjs": "^12.3.3"
},
"devDependencies": {
"jest": "^24.9.0",
"webpack": "^4.41.0",
"webpack-cli": "^3.3.9"
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment