Test

.gitignore

@@ -1,2 +1,3 @@
 node_modules/
 config.env
+coverage/

client/app/NotesItem.js

@@ -8,16 +8,13 @@ export default class NotesItem extends Component{
   render(){
     const formatTime = time => new Date(time * 1000).toISOString().substr(11, 8);
     return (
-
          <div className="eachNotes">
             <h4>{this.props.content}</h4>
             {this.props.timestamp !== undefined &&
             <p onClick={this.goto}>{formatTime(this.props.timestamp)}</p>}
              <button id="edit">Edit</button>
              <button id="delete">delete</button>
          </div>
-
-
     )
   }
 }

client/app/NotesList.js

@@ -21,11 +21,7 @@ export default class NotesList extends Component{
         headers: {'Content-Type':'application/x-www-form-urlencoded'}, //no idea why this work but fuck this
         body: `video_id=${videoId}&text=${notes}&timestamp=${currentTime}`
       })
-      .then(res => res.json(res))
-      .then(res => console.log('from db for notes',res))
       .catch(err => console.log(err));
-
-      // console.log(currentTime, videoId, notes);
     }
     e.target.reset();
   }

client/app/URLInput.js

@@ -5,16 +5,15 @@ class URLInput extends Component{
     const videoID = this.url.value.split('=')[1].substr(0,11);
     //need to check userinput nvm that for now
     event.preventDefault();
+
+    this.props.onInputChange({thumbnail: `https://img.youtube.com/vi/${videoID}/sddefault.jpg`});
+
     fetch('/add',
     {
       method: 'POST',
       headers: {'Content-Type':'application/x-www-form-urlencoded'}, //no idea why this work but fuck this
       body: `url=${videoID}`
     })
-    .then(res => res.json(res))
-    .then(res =>
-    this.props.onInputChange({thumbnail: `https://img.youtube.com/vi/${videoID}/sddefault.jpg`})
-    )
     .catch(err => console.log(err));
 
     this.form.reset();

package.json

@@ -7,7 +7,7 @@
     "dev": "webpack -d --watch",
     "build": "webpack -p",
     "start": "node server/server.js",
-    "test": "jest"
+    "test": "jest --coverage"
   },
   "repository": {
     "type": "git",
@@ -39,7 +39,8 @@
     "babel-preset-react": "^6.24.1",
     "enzyme": "^2.9.1",
     "jest": "^21.1.0",
-    "react-test-render": "^1.0.3",
+    "react-test-renderer": "^15.6.1",
+    "supertest": "^3.0.0",
     "webpack": "^3.5.6"
   }
 }

server/app.js

@@ -0,0 +1,41 @@
+const express = require('express'),
+      app = express(),
+      path = require('path'),
+      bp = require('body-parser'),
+      {addVideo, getGallery, getNotes, addNotes} = require('./query/queries');
+
+
+app.use(express.static(path.join(__dirname, '..', 'client', 'public')));
+
+
+app.use(bp.urlencoded({extended: true}));
+
+app.get('/getGallery', (req, resp) => {
+  getGallery()
+  .then(res => resp.send(res))
+  .catch(err => console.log(err));
+});
+
+app.post('/getnotes', (req, resp)=>{
+  getNotes(req.body.video_id)
+  .then(res => resp.send(res))
+  .catch(err => console.log(err));
+});
+
+app.post('/addnotes', (req, resp)=>{
+  addNotes(req.body.timestamp, req.body.text, req.body.video_id)
+  .then(res => console.log('successfully added notes'))
+  .catch(err => console.log(err));
+});
+
+app.post('/add', (req, resp)=>{
+  addVideo(req.body.url)
+  .then(res => console.log('successfully added video'))
+  .catch(err => console.log(err));
+});
+
+app.get('*', (req, res)=>{
+  res.sendFile(path.join(__dirname, '..', 'client','index.html'));
+});
+
+module.exports = app;

server/server.js

@@ -1,46 +1,6 @@
-const express = require('express'),
-      app = express(),
-      path = require('path'),
-      bp = require('body-parser'),
-      {addVideo, getGallery, getNotes, addNotes} = require('./query/queries'),
+const app = require('./app'),
       PORT = process.env.PORT || 9001;
 
-app.use(express.static(path.join(__dirname, '..', 'client', 'public')));
-
-
-app.use(bp.urlencoded({extended: true}));
-
-app.get('/getGallery', (req, resp) => {
-  console.log('hit get gallery');
-  getGallery()
-  .then(res => resp.send(res))
-  .catch(err => console.log(err));
-});
-
-app.post('/getnotes', (req, resp)=>{
-  console.log('hit get notes');
-  getNotes(req.body.video_id)
-  .then(res => resp.send(res))
-  .catch(err => console.log(err));
-});
-
-app.post('/addnotes', (req, res)=>{
-  addNotes(req.body.timestamp, req.body.text, req.body.video_id)
-  .then(res => resp.send(res))
-  .catch(err => console.log(err));
-});
-
-app.post('/add', (req, res)=>{
-  addVideo(req.body.url)
-  .then(res => console.log(res))
-  .catch(err => console.log(err));
-  res.send(req.body); //for debugging
-});
-
-app.get('*', (req, res)=>{
-  res.sendFile(path.join(__dirname, '..', 'client','index.html'));
-});
-
 app.listen(PORT, ()=>{
   console.log(`magic is happening in http://localhost:${PORT}`);
 });

test/NotesItem.test.js

@@ -0,0 +1,6 @@
+import NotesItem from '../client/app/NotesItem';
+import React from 'react';
+import renderer from 'react-test-renderer';
+import {shallow} from 'enzyme';
+
+test();

test/route.test.js

@@ -0,0 +1,46 @@
+const app = require('../server/app'),
+      request = require('supertest');
+
+      describe('Test catch all path', () => {
+        //using done
+          test('It should response the GET method', done => {
+              request(app).get('/').then((response) => {
+                  expect(response.statusCode).toBe(200);
+                  done();
+              });
+          });
+        //using return
+          test('It should return the html', ()=>{
+            return request(app).get('/').then((response) => {
+                expect(response.text).toMatch(/<html>/);
+            });
+          });
+
+          test('Check type of return', ()=>{
+            return request(app).get('/').then((response) => {
+                expect(response.header['content-type']).toMatch(/text\/html/);
+            });
+          });
+      });
+//TBC
+      // describe('Test /add route', () => {
+      //   //using done
+      //     test('It should response the GET method', done => {
+      //         request(app).post('/').then((response) => {
+      //             expect(response.statusCode).toBe(200);
+      //             done();
+      //         });
+      //     });
+      //   //using return
+      //     test('It should return the html', ()=>{
+      //       return request(app).get('/').then((response) => {
+      //           expect(response.text).toMatch(/<html>/);
+      //       });
+      //     });
+      //
+      //     test('Check type of return', ()=>{
+      //       return request(app).get('/').then((response) => {
+      //           expect(response.header['content-type']).toMatch(/text\/html/);
+      //       });
+      //     });
+      // });