Merge pull request #58 from Jonas56/dev

New version

.github/workflows/pipeline.yml

@@ -31,6 +31,7 @@ jobs:
           DB_USERNAME: ${{ secrets.DB_USERNAME }}
           DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
           DB_HOSTNAME: ${{ secrets.DB_HOSTNAME }}
+          SECRET: 0
       # ****End to end Testing***** #
       # - name: e2e tests
       #   uses: cypress-io/github-action@v2
@@ -39,19 +40,17 @@ jobs:
       #     start: npm run start-prod
       #     wait-on: http://localhost:5000
       - name: Deploy
-        if: ${{ github.base_ref == 'main' }}
+        if: ${{ github.ref == 'main' }}
         uses: akhileshns/[email protected] # This is the action
         with:
           heroku_api_key: ${{secrets.HEROKU_API_KEY}}
           heroku_app_name: "law-firm-management-sys" # Must be unique in Heroku
           heroku_email: "[email protected]"
           # healthcheck: "law-firm-management-sys.herokuapp.com/version"
           # checkString: "1.1.0"
-
       - name: Bump version and push tag
-        if: ${{ github.base_ref == 'main' }}
+        if: ${{ github.ref == 'main' }}
         uses: anothrNick/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           WITH_V: true
-

server/routes/api.js

@@ -9,7 +9,7 @@ api.use("/api/cases", middleware.userAuthentication, caseRouter);
 api.use("/api/users", userRouter);
 api.use("/api/login", loginRouter);
 api.get("/health", (req, res) => {
-  res.send("v0.1.0");
+  res.status(200).send("v0.1.0");
 });
 
 module.exports = api;

server/tests/cases/case_api.test.js

@@ -17,6 +17,12 @@ beforeAll(async () => {
   await Case.create({ ...helper.cases });
 });
 
+describe("Health check", () => {
+  test("should return 200 OK", async () => {
+    await request(app).get("/v1/health").expect(200);
+  });
+});
+
 describe("GET /v1/api/cases", () => {
   test("should return all cases", async () => {
     const logedInUser = await request(app)