Skip to content

Commit eb73198

Browse files
authored
Merge pull request #15 from oslabs-beta/backend-ts-convert
Backend ts convert
2 parents b38c46c + 90a3135 commit eb73198

36 files changed

+748
-803
lines changed

.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
],
1414
// presets are a set of of plug-ins
1515
"presets": [
16+
["@babel/preset-env", { "targets": { "node": "current" } }],
1617
"@babel/preset-typescript",
17-
"@babel/preset-env",
1818
"@babel/preset-react"
1919
]
2020
}

__tests__/enzyme.test.tsx

Lines changed: 0 additions & 173 deletions
This file was deleted.

__tests__/gql.projects.test.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
* @jest-environment node
33
*/
44

5-
// const { Mongoose } = require('mongoose');
6-
// const request = require('supertest');
7-
// const http = require('http');
8-
// const app = require('../server/server.js');
9-
// const mock = require('../mockData');
5+
const { Mongoose } = require('mongoose');
6+
const request = require('supertest');
7+
const http = require('http');
8+
const app = require('../server/server');
9+
const mock = require('../mockData');
1010

1111
// tests user signup and login routes
1212
xdescribe('GraphQL tests', () => {
@@ -27,7 +27,7 @@ xdescribe('GraphQL tests', () => {
2727
});
2828
// GraphQL Query
2929

30-
describe('Testing GraphQL query', () => {
30+
xdescribe('Testing GraphQL query', () => {
3131
it('getAllProjects should return more than 1 project by default', () =>
3232
request(server)
3333
.post('/graphql')
@@ -58,7 +58,7 @@ xdescribe('GraphQL tests', () => {
5858
});
5959
// GraphQL Mutation
6060

61-
describe('Testing GraphQL mutation', () => {
61+
xdescribe('Testing GraphQL mutation', () => {
6262
// Add likes
6363
it('addLike should update the "likes" field of the project document', () =>
6464
request(server)

__tests__/projects.test.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
* @jest-environment node
33
*/
44

5-
// const { Mongoose } = require('mongoose');
6-
// const request = require('supertest');
5+
const { Mongoose } = require('mongoose');
6+
const request = require('supertest');
77
// initializes the project to be sent to server/DB
8-
const { projectToSave, state } = require('../mockData');
9-
// const app = require('../server/server.js');
10-
// const http = require('http');
8+
import mockData from '../mockData'
9+
import app from ('../server/server');
10+
const http = require('http')
11+
const {state, projectToSave } = mockData
1112

1213
// save and get projects endpoint testing
13-
xdescribe('Project endpoints tests', () => {
14+
describe('Project endpoints tests', () => {
1415
let server;
1516
beforeAll((done) => {
1617
server = http.createServer(app);

__tests__/userAuth.test.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ import {
77
newUserIsCreated
88
} from '../app/src/helperFunctions/auth';
99

10-
const { Mongoose } = require('mongoose');
10+
import Mongoose from 'mongoose';
1111

12-
const http = require('http');
13-
const app = require('../server/server.mjs');
12+
import http from 'http';
13+
14+
import app from '../server/server';
1415

1516
let server;
1617

__tests__/users.test.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
/**
22
* @jest-environment node
33
*/
4-
5-
const { Mongoose } = require('mongoose');
6-
const request = require('supertest');
7-
const http = require('http');
8-
const app = require('../server/server.mjs');
9-
4+
import Mongoose from 'mongoose';
5+
import request from 'supertest';
6+
// const http = require('http');
7+
import http from 'http';
8+
import app from '../server/server';
109
const browser = 'http://localhost:8080'; // for checking endpoints accessed with hash router
11-
12-
const { user } = require('../mockData');
10+
import mockObj from '../mockData';
11+
const user = mockObj.user;
1312

1413
// tests user signup and login routes
1514
describe('User authentication tests', () => {

0 commit comments

Comments
 (0)