Ch setup ci/cd

.travis.yml

@@ -0,0 +1,31 @@
+language: node_js
+node_js:
+  - "stable"
+cache:
+  directories:
+    - "node_modules"
+install:
+  - npm install
+services:
+  - postgresql
+
+env:
+  global:
+  - NODE_ENV=test
+  - DB_USER_TEST=utpwsugatpqjzn
+  - DB_PASSWORD_TEST=03120a462667a671da3979385da1b5650ab8082d1319630013ec707eb7338ca5
+  - DB_HOST_TEST=ec2-54-225-173-42.compute-1.amazonaws.com
+  - DB_PORT_TEST=5432
+  - DB_DATABASE_TEST=ddo2ssbhau003c
+  - CLOUDINARY_CLOUD_NAME=mukuna
+  - CLOUDINARY_API_KEY=133265748257957
+  - CLOUDINARY_API_SECRET=uXZx1YbXcdEK6yhcgXs1VxAHkUE
+
+  - SECRET=teamwork-api-secret-key
+
+before_script:
+  - npm run build
+script:
+  - npm test
+after_success:
+  - npm run coverage

api/v1/config/dbConfig.js

@@ -6,18 +6,25 @@ dotenv.config();
 const isProduction = process.env.NODE_ENV === 'production';
 const isDevelopment = process.env.NODE_ENV === 'development';
 let conn;
+let c;
 
 if (isProduction) {
-  conn = process.env.DATABASE_URL;
+  conn = {connectionString :process.env.DATABASE_URL};
+
 } else if (isDevelopment) {
-  conn = `postgresql://${process.env.DB_USER}:${process.env.DB_PASSWORD}@${process.env.DB_HOST}:${process.env.DB_PORT}/${process.env.DB_DATABASE}`;
+  conn = {connectionString: `postgresql://${process.env.DB_USER}:${process.env.DB_PASSWORD}@${process.env.DB_HOST}:${process.env.DB_PORT}/${process.env.DB_DATABASE}`};
 } else {
-  conn = `postgresql://${process.env.DB_USER_TEST}:${process.env.DB_PASSWORD_TEST}@${process.env.DB_HOST}:${process.env.DB_PORT}/${process.env.DB_DATABASE_TEST}`;
+  conn = {  
+    user: process.env.DB_USER_TEST,
+    password: process.env.DB_PASSWORD_TEST,
+    database: process.env.DB_DATABASE_TEST,
+    port: process.env.DB_PORT_TEST,
+    host: process.env.DB_HOST_TEST,
+    ssl: true
+  }
 }
 
-const pool = new Pool({
-  connectionString: conn,
-});
+const pool = new Pool(conn);
 
 pool.on('error', (err, client) => {
   client.release();

api/v1/test/article.spec.js

@@ -21,7 +21,7 @@ chai.use(chaiHttp);
 
 describe('Articles', () => {
   const id1 = uuidv1();
-  const obj = generateToken({ sub: id1, role: 'ADMIN' });
+  const obj = generateToken({ sub: id1, role: 'EMPLOYEE' });
   const token = `Bearer ${obj}`;
   before(async () => {
     const articleTitle = 'First test title';

api/v1/test/comment.spec.js

@@ -26,7 +26,7 @@ chai.use(chaiHttp);
 
 describe('comments', () => {
   const id1 = uuidv1();
-  const obj = generateToken({ sub: id1, role: 'ADMIN' });
+  const obj = generateToken({ sub: id1, role: 'EMPLOYEE' });
   const token = `Bearer ${obj}`;
   before(async () => {
     const articleTitle = 'First test title';

api/v1/test/feed.spec.js

@@ -26,7 +26,7 @@ chai.use(chaiHttp);
 
 describe('comments', () => {
   const id1 = uuidv1();
-  const obj = generateToken({ sub: id1, role: 'ADMIN' });
+  const obj = generateToken({ sub: id1, role: 'EMPLOYEE' });
   const token = `Bearer ${obj}`;
   before(async () => {
     const articleTitle = 'First test title';

api/v1/test/gif.spec.js

@@ -21,7 +21,7 @@ chai.use(chaiHttp);
 
 describe('Gifs', () => {
   const id1 = uuidv1();
-  const obj = generateToken({ sub: id1, role: 'ADMIN' });
+  const obj = generateToken({ sub: id1, role: 'EMPLOYEE' });
   const token = `Bearer ${obj}`;
   before(async () => {
     const gifTitle = 'First gif test value';