diff --git a/__tests__/gitlab.unit.test.js b/__tests__/gitlab.unit.test.js
index c4cca3385d3d3a89afee0b9b0e688f1777c85b38..65d02b22ed0d23989f102d7f216faa04e866efa2 100644
--- a/__tests__/gitlab.unit.test.js
+++ b/__tests__/gitlab.unit.test.js
@@ -1,29 +1,79 @@
const gitlab = require('../routes/gitlab')
-const axios = require('axios')
+//const axios = require('axios')
+//jest.mock('axios')
-beforeAll(() => {
- // test gitlab API connection
- var config = {
- method: 'get',
- url: 'https://transfer.hft-stuttgart.de/gitlab/api/v4/projects'
- }
-
- axios(config)
- .then(function (response) {
- expect(response.statusCode).toBe(200)
+describe('GitLab API', () => {
+
+ /*
+ test('jest.fn recalls what it has been called with', () => {
+ const mock = jest.fn()
+ mock('a', 'b', 'c')
+ expect(mock).toHaveBeenCalledTimes(1)
+ expect(mock).toHaveBeenCalledWith('a', 'b', 'c')
+ }); */
+
+ // mock
+/* it('returns an existing gitlab-userID by an email address', done => {
+ let resp = {
+ error: false,
+ data: 1}
+ axios.get.mockResolvedValue(resp)
+
+ gitlab.getUserIdByEmail('rosanny.sihombing@hft-stuttgart.de', function(resp){
+ try {
+ expect(resp.error).toBeFalsy()
+ expect(resp.data).not.toBeNull()
+ done()
+ } catch (error) {
+ done(error)
+ }
+ })
+ })
+*/
+
+ it('returns an existing gitlab-userID by an email address', done => {
+ gitlab.getUserIdByEmail('rosanny.sihombing@hft-stuttgart.de', function(data){
+ try {
+ expect(data.error).toBeFalsy()
+ expect(data.data).not.toBeNull()
+ done()
+ } catch (error) {
+ done(error)
+ }
+ })
+ })
+
+ it('returns an error due to the non-exist user', done => {
+ gitlab.getUserIdByEmail('test@hft-stuttgart.com', function (data) {
+ try {
+ expect(data.error).toBeTruthy()
+ done()
+ } catch (error) {
+ done(error)
+ }
})
-})
+ })
-describe('GitLab API test', () => {
- test("Get a gitlab userID by email", () => { // email = any email address
- gitlab.getUserIdByEmail("test@email.de", function(resp){
- expect(resp).not.toBeNull()
- })
+ it('returns the projects of a particular userId', done => {
+ gitlab.getUserProjects(3, function (data) {
+ try {
+ expect(data.error).toBeFalsy()
+ expect(data.data).not.toBeNull()
+ done()
+ } catch (error) {
+ done(error)
+ }
})
+ })
- test("Get the projects of a particular user", () => { // userID = any integer
- gitlab.getUserProjects(3, function(resp){
- expect(resp).not.toBeNull()
- })
+ it('returns an error due to the wrong userID', done => {
+ gitlab.getUserProjects('abc', function (data) {
+ try {
+ expect(data.error).toBeTruthy()
+ done()
+ } catch (error) {
+ done(error)
+ }
})
+ })
})
\ No newline at end of file
diff --git a/__tests__/method.unit.test.js b/__tests__/method.unit.test.js
index 9c856e1d607066c27084b65a89e5aa94e4034f37..9ad00d8e01af125cb81c14c620695aa8c24ee42e 100644
--- a/__tests__/method.unit.test.js
+++ b/__tests__/method.unit.test.js
@@ -1,53 +1,52 @@
-const dbconn = require('../routes/dbconn')
const methods = require('../routes/methods')
-beforeAll(() => {
- // test DB connection
- dbconn.user.query('SELECT 1 + 5 AS solution', function (err, rows) {
- expect(err).toBeNull()
- expect(rows[0].solution).toBe(6)
- })
- dbconn.project.query('SELECT 10 + 5 AS solution', function (err, rows) {
- expect(err).toBeNull()
- expect(rows[0].solution).toBe(15)
- })
-})
-
describe("DB methohds test", () => {
-/*
- test("Get a user from DB by email", () => {
- let gitlabUserData = "to-be-defined"
- methods.addGitlabUser(gitlabUserData, function(data, err){
- expect(data).not.toBeNull()
- expect(err).toBeNull()
- })
- }) */
-
- test("Get a user from DB by email", () => { // email = any email address
- methods.getUserByEmail("test@email.de", function(data, err){
- expect(data).not.toBeNull()
- expect(err).toBeNull()
- })
+
+ it('returns a user from DB by email', done => {
+ methods.getUserByEmail('rosanny.sihombing@hft-stuttgart.de', function(resp, err){
+ try {
+ expect(resp).not.toBeNull()
+ expect(err).toBeNull()
+ done()
+ } catch (error) {
+ done(error)
+ }
+ })
})
- test("Get a user from DB by ID", () => { // ID = any integer
- methods.getUserById(100, function(data, err){
- expect(data).not.toBeNull()
- expect(err).toBeNull()
- })
+ it("returns a user from DB by ID", done => {
+ methods.getUserById(10, function(resp, err){
+ try {
+ expect(resp).not.toBeNull()
+ expect(err).toBeNull()
+ done()
+ } catch (error) {
+ done(error)
+ }
+ })
})
- test("Check user email", () => { // email = any email address
- methods.checkUserEmail("test@email.de", function(err, data){
- expect(data).not.toBeNull()
- expect(err).toBeNull()
+ it("checks user email", done => {
+ methods.checkUserEmail("test@email.de", function(err, resp){
+ try {
+ expect(resp).not.toBeNull()
+ expect(err).toBeNull()
+ done()
+ } catch (error) {
+ done(error)
+ }
})
})
- test("Get a user by token", () => { // token = any alphanumeric
- methods.checkUserEmail("1abc0qwerty", function(err, data){
- expect(data).not.toBeNull()
- expect(err).toBeNull()
+ it("returns a user by token", done => {
+ methods.checkUserEmail("1abc0qwerty", function(err, resp){ // token = any alphanumeric
+ try {
+ expect(resp).not.toBeNull()
+ expect(err).toBeNull()
+ done()
+ } catch (error) {
+ done(error)
+ }
})
})
})
diff --git a/__tests__/routes-account.unit.test.js b/__tests__/routes-account.unit.test.js
deleted file mode 100644
index 81f63035868296dd999b933f850474ce91300d1c..0000000000000000000000000000000000000000
--- a/__tests__/routes-account.unit.test.js
+++ /dev/null
@@ -1,5 +0,0 @@
-describe('Sample Test', () => {
- it('should test that true === true', () => {
- expect(true).toBe(true)
- })
-})
\ No newline at end of file