Skip to content
Merged

Dev #36

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
PORT=3001
DBNAME=test1
DBNAME=test2
3 changes: 0 additions & 3 deletions backend/controllers/restaurantController.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ const restaurant_create = async (req, res) => {
// checa se já existe um restaurante com mesmo nome e mesmo endereço
const restaurantExist = await Restaurant.findOne({name : req.body.name, 'address.street': street, 'address.number': number, 'address.city': city, 'address.neighborhood': neighborhood})

console.log(req.body)
console.log(restaurantExist)

if (restaurantExist) {
return res.status(400).json({ error: 'Restaurante já cadastrado' });
}
Expand Down
28 changes: 5 additions & 23 deletions backend/tests/controllers/followers/listFollowers.steps.ts
Original file line number Diff line number Diff line change
@@ -1,26 +1,8 @@
import { defineFeature, loadFeature } from 'jest-cucumber';
import axios, { AxiosResponse } from 'axios';
const mongoose = require('mongoose');
export async function connectDBForTesting() {
try {
const dbUri = "mongodb://localhost:27017";
const dbName = "test";
await mongoose.connect(dbUri, {
dbName,
autoCreate: true,
});
} catch (error) {
console.log("DB connect error");
}
}

export async function disconnectDBForTesting() {
try {
await mongoose.connection.close();
} catch (error) {
console.log("DB disconnect error");
}
}
import { loadFeature, defineFeature } from "jest-cucumber"
import axios, { AxiosResponse } from 'axios'
const mongoose = require('mongoose')
require("dotenv").config()
import {connectDBForTesting, disconnectDBForTesting} from '../common'

const User = require('../../../models/User.js');
const feature = loadFeature('tests/features/followers/listFollowers.feature');
Expand Down
28 changes: 5 additions & 23 deletions backend/tests/controllers/followers/listFollowersUnit.steps.ts
Original file line number Diff line number Diff line change
@@ -1,26 +1,8 @@
import { defineFeature, loadFeature } from 'jest-cucumber';
import axios, { AxiosResponse } from 'axios';
const mongoose = require('mongoose');
export async function connectDBForTesting() {
try {
const dbUri = "mongodb://localhost:27017";
const dbName = "test";
await mongoose.connect(dbUri, {
dbName,
autoCreate: true,
});
} catch (error) {
console.log("DB connect error");
}
}

export async function disconnectDBForTesting() {
try {
await mongoose.connection.close();
} catch (error) {
console.log("DB disconnect error");
}
}
import { loadFeature, defineFeature } from "jest-cucumber"
import axios, { AxiosResponse } from 'axios'
const mongoose = require('mongoose')
require("dotenv").config()
import {connectDBForTesting, disconnectDBForTesting} from '../common'

const User = require('../../../models/User.js');
const feature = loadFeature('tests/features/followers/listFollowersUnit.feature');
Expand Down
28 changes: 5 additions & 23 deletions backend/tests/controllers/followers/listFollowing.steps.ts
Original file line number Diff line number Diff line change
@@ -1,26 +1,8 @@
import { defineFeature, loadFeature } from 'jest-cucumber';
import axios, { AxiosResponse } from 'axios';
const mongoose = require('mongoose');
export async function connectDBForTesting() {
try {
const dbUri = "mongodb://localhost:27017";
const dbName = "test";
await mongoose.connect(dbUri, {
dbName,
autoCreate: true,
});
} catch (error) {
console.log("DB connect error");
}
}

export async function disconnectDBForTesting() {
try {
await mongoose.connection.close();
} catch (error) {
console.log("DB disconnect error");
}
}
import { loadFeature, defineFeature } from "jest-cucumber"
import axios, { AxiosResponse } from 'axios'
const mongoose = require('mongoose')
require("dotenv").config()
import {connectDBForTesting, disconnectDBForTesting} from '../common'

const User = require('../../../models/User.js');
const feature = loadFeature('tests/features/followers/listFollowing.feature');
Expand Down
28 changes: 5 additions & 23 deletions backend/tests/controllers/followers/seguirUsuario.steps.ts
Original file line number Diff line number Diff line change
@@ -1,26 +1,8 @@
import { defineFeature, loadFeature } from 'jest-cucumber';
import axios, { AxiosResponse } from 'axios';
const mongoose = require('mongoose');
export async function connectDBForTesting() {
try {
const dbUri = "mongodb://localhost:27017";
const dbName = "test";
await mongoose.connect(dbUri, {
dbName,
autoCreate: true,
});
} catch (error) {
console.log("DB connect error");
}
}

export async function disconnectDBForTesting() {
try {
await mongoose.connection.close();
} catch (error) {
console.log("DB disconnect error");
}
}
import { loadFeature, defineFeature } from "jest-cucumber"
import axios, { AxiosResponse } from 'axios'
const mongoose = require('mongoose')
require("dotenv").config()
import {connectDBForTesting, disconnectDBForTesting} from '../common'

const User = require('../../../models/User.js');
const feature = loadFeature('tests/features/followers/seguirUsuario.feature');
Expand Down
28 changes: 5 additions & 23 deletions backend/tests/controllers/followers/unfollow.steps.ts
Original file line number Diff line number Diff line change
@@ -1,26 +1,8 @@
import { defineFeature, loadFeature } from 'jest-cucumber';
import axios, { AxiosResponse } from 'axios';
const mongoose = require('mongoose');
export async function connectDBForTesting() {
try {
const dbUri = "mongodb://localhost:27017";
const dbName = "test";
await mongoose.connect(dbUri, {
dbName,
autoCreate: true,
});
} catch (error) {
console.log("DB connect error");
}
}

export async function disconnectDBForTesting() {
try {
await mongoose.connection.close();
} catch (error) {
console.log("DB disconnect error");
}
}
import { loadFeature, defineFeature } from "jest-cucumber"
import axios, { AxiosResponse } from 'axios'
const mongoose = require('mongoose')
require("dotenv").config()
import {connectDBForTesting, disconnectDBForTesting} from '../common'

const User = require('../../../models/User.js');
const feature = loadFeature('tests/features/followers/unfollow.feature');
Expand Down
28 changes: 3 additions & 25 deletions backend/tests/controllers/login/login1.steps.ts
Original file line number Diff line number Diff line change
@@ -1,34 +1,15 @@
import { loadFeature, defineFeature } from "jest-cucumber"
import axios, { AxiosResponse } from 'axios'
const bcrypt = require('bcrypt');
const mongoose = require('mongoose')
require("dotenv").config()
import {connectDBForTesting, disconnectDBForTesting} from '../common'
const bcrypt = require('bcrypt');
const User = require("../../../models/User")

const feature = loadFeature('tests/features/login/login1.feature');

const SERVER_URL = 'http://localhost:3001'

export async function connectDBForTesting() {
try {
const dbUri = "mongodb://localhost:27017";
const dbName = "test";
await mongoose.connect(dbUri, {
dbName,
autoCreate: true,
});
} catch (error) {
console.log("DB connect error");
}
}

export async function disconnectDBForTesting() {
try {
await mongoose.connection.close();
} catch (error) {
console.log("DB disconnect error");
}
}

defineFeature(feature, test => {

beforeAll(async () => {
Expand Down Expand Up @@ -63,9 +44,6 @@ defineFeature(feature, test => {
})
and(/^um usuário é cadastrado com nome "(.*)", email "(.*)" e senha "(.*)"$/, async (name,email,password) => {
const user = await User.findOne({name: name, email: email})
if(user){
console.log(user.name)
}
const verify = await bcrypt.compare(password,user.password)
let compare = true
if(!verify){
Expand Down
24 changes: 3 additions & 21 deletions backend/tests/controllers/login/login2.steps.ts
Original file line number Diff line number Diff line change
@@ -1,33 +1,15 @@
import { loadFeature, defineFeature } from "jest-cucumber"
import axios, { AxiosResponse } from 'axios'
const bcrypt = require('bcrypt');
const mongoose = require('mongoose')
require("dotenv").config()
import {connectDBForTesting, disconnectDBForTesting} from '../common'

const User = require("../../../models/User")

const feature = loadFeature('tests/features/login/login2.feature');

const SERVER_URL = 'http://localhost:3001'

export async function connectDBForTesting() {
try {
const dbUri = "mongodb://localhost:27017";
const dbName = "test";
await mongoose.connect(dbUri, {
dbName,
autoCreate: true,
});
} catch (error) {
console.log("DB connect error");
}
}

export async function disconnectDBForTesting() {
try {
await mongoose.connection.close();
} catch (error) {
console.log("DB disconnect error");
}
}

defineFeature(feature, test => {

Expand Down
25 changes: 3 additions & 22 deletions backend/tests/controllers/login/login3.steps.ts
Original file line number Diff line number Diff line change
@@ -1,34 +1,15 @@
import { loadFeature, defineFeature } from "jest-cucumber"
import axios, { AxiosResponse } from 'axios'
const bcrypt = require('bcrypt');
const mongoose = require('mongoose')
require("dotenv").config()
import {connectDBForTesting, disconnectDBForTesting} from '../common'

const User = require("../../../models/User")

const feature = loadFeature('tests/features/login/login3.feature');

const SERVER_URL = 'http://localhost:3001'

export async function connectDBForTesting() {
try {
const dbUri = "mongodb://localhost:27017";
const dbName = "test";
await mongoose.connect(dbUri, {
dbName,
autoCreate: true,
});
} catch (error) {
console.log("DB connect error");
}
}

export async function disconnectDBForTesting() {
try {
await mongoose.connection.close();
} catch (error) {
console.log("DB disconnect error");
}
}

defineFeature(feature, test => {

beforeAll(async () => {
Expand Down
24 changes: 3 additions & 21 deletions backend/tests/controllers/login/login4.steps.ts
Original file line number Diff line number Diff line change
@@ -1,33 +1,15 @@
import { loadFeature, defineFeature } from "jest-cucumber"
import axios, { AxiosResponse } from 'axios'
const bcrypt = require('bcrypt');
const mongoose = require('mongoose')
require("dotenv").config()
import {connectDBForTesting, disconnectDBForTesting} from '../common'
const bcrypt = require('bcrypt');
const User = require("../../../models/User")

const feature = loadFeature('tests/features/login/login4.feature');

const SERVER_URL = 'http://localhost:3001'

export async function connectDBForTesting() {
try {
const dbUri = "mongodb://localhost:27017";
const dbName = "test";
await mongoose.connect(dbUri, {
dbName,
autoCreate: true,
});
} catch (error) {
console.log("DB connect error");
}
}

export async function disconnectDBForTesting() {
try {
await mongoose.connection.close();
} catch (error) {
console.log("DB disconnect error");
}
}

defineFeature(feature, test => {

Expand Down
27 changes: 3 additions & 24 deletions backend/tests/controllers/login/login5.steps.ts
Original file line number Diff line number Diff line change
@@ -1,36 +1,15 @@
import { loadFeature, defineFeature } from "jest-cucumber"
import axios, { AxiosResponse } from 'axios'
const bcrypt = require('bcrypt');
const mongoose = require('mongoose')
require("dotenv").config()
import {connectDBForTesting, disconnectDBForTesting} from '../common'
const bcrypt = require('bcrypt');
const User = require("../../../models/User")

const feature = loadFeature('tests/features/login/login5.feature');

const SERVER_URL = 'http://localhost:3001'



export async function connectDBForTesting() {
try {
const dbUri = "mongodb://localhost:27017";
const dbName = "test";
await mongoose.connect(dbUri, {
dbName,
autoCreate: true,
});
} catch (error) {
console.log("DB connect error");
}
}

export async function disconnectDBForTesting() {
try {
await mongoose.connection.close();
} catch (error) {
console.log("DB disconnect error");
}
}

defineFeature(feature, test => {

beforeAll(async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,9 @@ defineFeature(feature, test => {
when(/^uma requisição POST foi enviada para "(.*)" com nome "(.*)", endereço "(.*)" e tipo de comida "(.*)"$/, async (path, name, addr, typeOfFood) => {

const addressInfo = addressSeparation(addr)
console.log(`${SERVER_URL}${path}`)

if (addressInfo !== null) {
const { street, number, neighborhood, city } = addressInfo
console.log(restaurant.name, name)
console.log(restaurant.name === name)
console.log(addressInfo)

response = await axios.post(`${SERVER_URL}${path}`, {
name: name,
Expand All @@ -62,7 +58,6 @@ defineFeature(feature, test => {
validateStatus: (status) => true
})

console.log(response)
}

})
Expand Down
Loading