[CodeForPoznan#121] Tests

package.json

@@ -21,7 +21,7 @@
     "electron:dev": "MODE=dev electron .",
     "start": "concurrently \"cross-env BROWSER=none npm run webpack:dev\" \"wait-on http://localhost:9000 && npm run electron:dev\"",
     "build": "webpack --mode production && electron-builder --windows --linux",
-    "test": "jest",
+    "test": "MODE=dev jest",
     "rebuild": "electron-rebuild -f -w sqlite3",
     "apply_school_types": "node src/test/fixtures/apply_school_types.js",
     "apply_schools": "node src/test/fixtures/apply_schools.js",

src/db/api.js

@@ -12,15 +12,15 @@ const getSchoolTypeList = () => {
   return SchoolType.findAll();
 };
 
-const createSchool = ({ name, city, postCode, street, type, postOffice }) => {
+const createSchool = ({ name, city, postCode, street, SchoolTypeName, postOffice }) => {
   School.sync({ force: true }).then(() =>
     School.create({
-      name: name,
-      city: city,
-      postCode: postCode,
-      street: street,
-      SchoolTypeName: type,
-      postOffice: postOffice,
+      name,
+      city,
+      postCode,
+      street,
+      SchoolTypeName,
+      postOffice
     })
   );
 };

src/db/models/index.js

@@ -0,0 +1,7 @@
+const SchoolType = require("./school_type");
+const School = require("./school");
+
+module.exports = {
+    SchoolType,
+    School
+}

src/db/models/school.js

@@ -0,0 +1,55 @@
+const Sequelize = require("sequelize");
+const { DataTypes } = require("sequelize");
+
+const sequelize = require("../db_config").sequelize;
+
+const School = sequelize.define(
+    "School",
+    {
+      id: {
+        type: Sequelize.INTEGER,
+        unique: true,
+        autoIncrement: true,
+        primaryKey: true
+      },
+      name: {
+        type: Sequelize.STRING(80),
+        allowNull: false
+      },
+      city: {
+        type: Sequelize.STRING(80),
+        allowNull: false
+      },
+      postCode: {
+        type: Sequelize.STRING(6),
+        allowNull: false
+      },
+      postOffice: {
+        type: Sequelize.STRING(80),
+        allowNull: false
+      },
+      street: {
+        type: Sequelize.STRING(80),
+        allowNull: false
+      },
+      address: {
+        type: Sequelize.VIRTUAL(DataTypes.STRING, ["city", "street"]),
+        get() {
+          return `${this.getDataValue("city")}, ${this.getDataValue("street")}`;
+        }
+      },
+      post: {
+        type: Sequelize.VIRTUAL(DataTypes.STRING, ["postCode", "postOffice"]),
+        get() {
+          const { postOffice, city, postCode } = this;
+          const postLocation = postOffice === city ? city : postOffice;
+          return `${postCode} ${postLocation}`;
+        }
+      }
+    },
+    {
+      // options
+    }
+  );
+
+module.exports = School;

src/db/models/school_type.js

@@ -0,0 +1,22 @@
+const Sequelize = require("sequelize");
+const sequelize = require("../db_config").sequelize;
+const School = require("./school");
+
+const SchoolType = sequelize.define(
+  "SchoolType",
+  {
+    name: {
+      type: Sequelize.STRING(80),
+      allowNull: false,
+      unique: true,
+      primaryKey: true
+    }
+  },
+  {
+    // options
+  }
+);
+
+SchoolType.hasMany(School, { foreignKey: { allowNull: false } });
+
+module.exports = SchoolType;

src/test/factories/schoolFactory.js

@@ -1,12 +1,12 @@
-const { School } = require("../../db/models");
+const School = require("../../db/models/school");
 const schoolTypeList = require("../../db/school_types");
 const faker = require("faker/locale/pl");
 
 const schoolData = type => {
   const schoolType = type || faker.random.arrayElement(schoolTypeList);
   const city = faker.address.city();
   return {
-    type: schoolType,
+    SchoolTypeName: schoolType,
     name: `${schoolType} nr. ${faker.random.number(200)}`,
     city: city,
     postCode: faker.address.zipCode(),
@@ -16,7 +16,7 @@ const schoolData = type => {
 };
 
 const schoolFixture = async (props = {}) => {
-  const data = schoolData(props.type);
+  const data = schoolData(props.SchoolTypeName);
   return await School.create({ ...data, ...props });
 };
 

src/test/factories/schoolTypeFactory.js

@@ -1,13 +1,14 @@
-const { SchoolType } = require("../../db/models");
+const SchoolType = require("../../db/models/school_type");
 const schoolTypeList = require("../../db/school_types");
 const faker = require("faker/locale/pl");
 
 const schoolTypeData = () => {
   return faker.random.arrayElement(schoolTypeList);
 };
 
-const schoolTypeFixture = async name =>
-  await SchoolType.create({ name: name || schoolTypeData() });
+const schoolTypeFixture = async name =>{
+  return await SchoolType.create({ name: name || schoolTypeData() });
+}
 
 module.exports = schoolTypeFixture;
 module.exports.schoolTypeData = schoolTypeData;

src/test/models/school_model.test.js

@@ -1,24 +1,22 @@
 const { sequelize } = require("../../db/db_config");
 const schoolFactory = require("../factories/schoolFactory");
 const schoolTypeFactory = require("../factories/schoolTypeFactory");
-const truncate = require("../truncate");
-const { School, SchoolType } = require("../../db/models");
+const { schoolData } = require("../factories/schoolFactory");
+const { School } = require("../../db/models");
 
 describe("School model", () => {
-  beforeEach(async () => {
-    await truncate([School, SchoolType]);
-    await SchoolType.sync({ force: true });
-    await schoolTypeFactory("przedszkole")
+  beforeAll(() => {
+    return sequelize
+      .sync({ force: true })
+      .then(() => schoolTypeFactory("mock"));
   });
 
-  afterEach(async () => {
-    await truncate([School, SchoolType]);
+  afterAll(async () => {
+    await sequelize.drop();
   });
 
   it("should be created", async () => {
-    const school = await sequelize
-      .sync({ force: true })
-      .then(() => schoolFactory({ name: "TEST", type: "przedszkole" }));
+    const school = await School.create({ ...schoolData("mock"), name: "TEST" });
 
     expect(school).toBeTruthy();
     expect(school.name).toEqual("TEST");
@@ -30,31 +28,23 @@ describe("School model", () => {
   //   .then(() => schoolFactory({ name: "TEST", type: "przedszkole" }));
   // })
 
-  describe("schould has virtual methods which", () => {
+  describe("has virtual methods which", () => {
     it("return concatenated address data by calling `address`", async () => {
-      const school = await sequelize
-        .sync({ force: true })
-        .then(() =>
-          schoolFactory({
-            street: "Testowa 2",
-            city: "Poznan",
-            type: "przedszkole"
-          })
-        );
+      const school = await schoolFactory({
+        street: "Testowa 2",
+        city: "Poznan",
+        SchoolTypeName: "mock"
+      });
 
       expect(school.address).toEqual("Poznan, Testowa 2");
     });
 
     it("return concatenated post data by calling `post`", async () => {
-      const school = await sequelize
-        .sync({ force: true })
-        .then(() =>
-          schoolFactory({
-            postCode: "12-345",
-            postOffice: "Poznan",
-            type: "przedszkole"
-          })
-        );
+      const school = await schoolFactory({
+        postCode: "12-345",
+        postOffice: "Poznan",
+        SchoolTypeName: "mock"
+      });
 
       expect(school.post).toEqual("12-345 Poznan");
     });

src/test/models/school_type_model.test.js

@@ -12,6 +12,10 @@ describe("SchoolType model", () => {
     await truncate(SchoolType);
   });
 
+  afterAll(async () => {
+    await SchoolType.drop()
+  })
+
   it("should be created", async () => {
     const schoolType = await sequelize
       .sync({ force: true })