Merge pull request #4 from laineveeti/bugfixing

fixed broken tests and workflow
piisamirontta · Jul 26, 2024 · a358aab · a358aab
2 parents f0805ab + 0c2566b
commit a358aab
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 23 deletions.
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -12,10 +12,10 @@ on:
 env:
     COMMIT_MESSAGES: ${{ toJson(github.event.commits.*.message) }}
     COMMIT: ${{ toJson(github.event.commits)[0] }}
-    SECRET: secrets.SECRET
-    MONGODB_URI: secrets.MONGODB_URI
-    TEST_MONGODB_URI: secrets.TEST_MONGODB_URI
-    DEV_MONGODB_URI: secrets.DEV_MONGODB_URI
+    SECRET: ${{ secrets.SECRET }}
+    MONGODB_URI: ${{ secrets.MONGODB_URI }}
+    TEST_MONGODB_URI: ${{ secrets.TEST_MONGODB_URI }}
+    DEV_MONGODB_URI: ${{ secrets.DEV_MONGODB_URI }}
 
 jobs:
     simple_deployment_pipeline:

diff --git a/tests/api/test_helper.js b/tests/api/test_helper.js
@@ -21,12 +21,7 @@ const initialUsers = [
         username: 'user1',
         name: 'käyttäjä',
         password: 'salasana',
-    },
-    {
-        username: 'user2',
-        name: 'käyttäjä toinen',
-        password: 'salasana',
-    },
+    }
 ];
 
 const blogsInDb = async () => {

diff --git a/utils/config.js b/utils/config.js
@@ -4,17 +4,17 @@ let PORT = process.env.PORT;
 let ENV = process.env.NODE_ENV;
 let MONGODB_URI;
 switch (ENV) {
-    case 'testing':
-        MONGODB_URI = process.env.TEST_MONGODB_URI;
-        break;
-    case 'development':
-        MONGODB_URI = process.env.DEV_MONGODB_URI;
-        break;
-    case 'production':
-        MONGODB_URI = process.env.MONGODB_URI;
-        break;
-    default:
-        MONGODB_URI = process.env.DEV_MONGODB_URI;
+case 'testing':
+    MONGODB_URI = process.env.TEST_MONGODB_URI;
+    break;
+case 'development':
+    MONGODB_URI = process.env.DEV_MONGODB_URI;
+    break;
+case 'production':
+    MONGODB_URI = process.env.MONGODB_URI;
+    break;
+default:
+    MONGODB_URI = process.env.DEV_MONGODB_URI;
 }
 let SECRET = process.env.SECRET;
 

diff --git a/utils/logger.js b/utils/logger.js
@@ -1,11 +1,11 @@
 const info = (...params) => {
-    if (process.env.NODE_ENV !== 'test') {
+    if (process.env.NODE_ENV !== 'testing') {
         console.log(...params);
     }
 };
 
 const error = (...params) => {
-    if (process.env.NODE_ENV !== 'test') {
+    if (process.env.NODE_ENV !== 'testing') {
         console.error(...params);
     }
 };