Skip to content

Commit c3bd1db

Browse files
committed
fix conflict in users integration test file
1 parent d0ed63c commit c3bd1db

File tree

1 file changed

+2
-20
lines changed

1 file changed

+2
-20
lines changed

test/integration/users.test.js

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
const chai = require("chai");
22
const { expect } = chai;
33
const chaiHttp = require("chai-http");
4+
45
const firestore = require("../../utils/firestore");
56
const app = require("../../server");
67
const authService = require("../../services/authService");
@@ -13,8 +14,6 @@ const profileDiffData = require("../fixtures/profileDiffs/profileDiffs")();
1314
const superUser = userData[4];
1415
const searchParamValues = require("../fixtures/user/search")();
1516

16-
const inDiscordUsers = require("../fixtures/user/inDiscord")();
17-
1817
const config = require("config");
1918
const joinData = require("../fixtures/user/join");
2019
const {
@@ -26,6 +25,7 @@ const userStatusModel = require("../../models/userStatus");
2625

2726
const cookieName = config.get("userToken.cookieName");
2827
chai.use(chaiHttp);
28+
2929
describe("Users", function () {
3030
let jwt;
3131
let superUserId;
@@ -1092,7 +1092,6 @@ describe("Users", function () {
10921092
});
10931093
});
10941094

1095-
10961095
describe("POST /users/migrate", function () {
10971096
it("Should return 401 when user is unauthorize", function (done) {
10981097
chai
@@ -1130,33 +1129,16 @@ describe("Users", function () {
11301129
chai
11311130
.request(app)
11321131
.post(`/users/migrate`)
1133-
1134-
describe("PATCH /users", function () {
1135-
beforeEach(async function () {
1136-
await addUser(inDiscordUsers[0]);
1137-
await addUser(inDiscordUsers[1]);
1138-
await addUser(inDiscordUsers[2]);
1139-
});
1140-
it("returns users with discord id and in_discord false", function (done) {
1141-
chai
1142-
.request(app)
1143-
.patch("/users")
1144-
.set("Cookie", `${cookieName}=${superUserAuthToken}`)
1145-
11461132
.end((err, res) => {
11471133
if (err) {
11481134
return done(err);
11491135
}
1150-
11511136
expect(res).to.have.status(401);
11521137
expect(res.body).to.eql({
11531138
statusCode: 401,
11541139
error: "Unauthorized",
11551140
message: "Unauthenticated User",
11561141
});
1157-
expect(res).to.have.status(200);
1158-
expect(res.body).to.have.length(1);
1159-
expect(res.body[0].username).equal("test-user");
11601142
return done();
11611143
});
11621144
});

0 commit comments

Comments
 (0)