Skip to content

Commit 1586ec5

Browse files
19majkel9419majkel94
authored
Merge pull request #268 from elementar/replace-should-for-expect
Replaced `should` for `expect`
2 parents 8327273 + 33bfc16 commit 1586ec5

File tree

3 files changed

+36
-36
lines changed

3 files changed

+36
-36
lines changed

‎test/functional/action-params.spec.ts

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ describe("action parameters", () => {
336336

337337
describe("@Param should give a param from route", () => {
338338
assertRequest([3001, 3002], "get", "users/1", response => {
339-
paramUserId.should.be.equal(1);
339+
expect(paramUserId).to.be.equal(1);
340340
expect(response).to.be.status(200);
341341
expect(response).to.have.header("content-type", "text/html; charset=utf-8");
342342
expect(response.body).to.be.equal("<html><body>1</body></html>");
@@ -345,8 +345,8 @@ describe("action parameters", () => {
345345

346346
describe("multiple @Param should give a proper values from route", () => {
347347
assertRequest([3001, 3002], "get", "users/23/photos/32", response => {
348-
paramFirstId.should.be.equal(23);
349-
paramSecondId.should.be.equal(32);
348+
expect(paramFirstId).to.be.equal(23);
349+
expect(paramSecondId).to.be.equal(32);
350350
expect(response).to.be.status(200);
351351
expect(response).to.have.header("content-type", "text/html; charset=utf-8");
352352
expect(response.body).to.be.equal("<html><body>23,32</body></html>");
@@ -411,18 +411,18 @@ describe("action parameters", () => {
411411

412412
describe("@QueryParam should give a proper values from request query parameters", () => {
413413
assertRequest([3001, 3002], "get", "photos?sortBy=name&count=2&limit=10&showAll=true", response => {
414-
queryParamSortBy.should.be.equal("name");
415-
queryParamCount.should.be.equal("2");
416-
queryParamLimit.should.be.equal(10);
417-
queryParamShowAll.should.be.equal(true);
414+
expect(queryParamSortBy).to.be.equal("name");
415+
expect(queryParamCount).to.be.equal("2");
416+
expect(queryParamLimit).to.be.equal(10);
417+
expect(queryParamShowAll).to.be.equal(true);
418418
expect(response).to.be.status(200);
419419
expect(response).to.have.header("content-type", "text/html; charset=utf-8");
420420
});
421421
});
422422

423423
describe("for @QueryParam when required is params must be provided and they should not be empty", () => {
424424
assertRequest([3001, 3002], "get", "photos-with-required/?limit=0", response => {
425-
queryParamLimit.should.be.equal(0);
425+
expect(queryParamLimit).to.be.equal(0);
426426
expect(response).to.be.status(200);
427427
expect(response).to.have.header("content-type", "text/html; charset=utf-8");
428428
expect(response.body).to.be.equal("<html><body>0</body></html>");
@@ -452,7 +452,7 @@ describe("action parameters", () => {
452452

453453
describe("for @QueryParam when parseJson flag is used query param must be converted to object", () => {
454454
assertRequest([3001, 3002], "get", "photos-with-json/?filter={\"keyword\": \"name\", \"limit\": 5}", response => {
455-
queryParamFilter.should.be.eql({ keyword: "name", limit: 5 });
455+
expect(queryParamFilter).to.be.eql({ keyword: "name", limit: 5 });
456456
expect(response).to.be.status(200);
457457
expect(response).to.have.header("content-type", "text/html; charset=utf-8");
458458
});
@@ -467,9 +467,9 @@ describe("action parameters", () => {
467467
}
468468
};
469469
assertRequest([3001, 3002], "get", "posts", requestOptions, response => {
470-
headerParamToken.should.be.equal("31ds31das231sad12");
471-
headerParamCount.should.be.equal(20);
472-
headerParamShowAll.should.be.equal(false);
470+
expect(headerParamToken).to.be.equal("31ds31das231sad12");
471+
expect(headerParamCount).to.be.equal(20);
472+
expect(headerParamShowAll).to.be.equal(false);
473473
expect(response).to.be.status(200);
474474
expect(response).to.have.header("content-type", "text/html; charset=utf-8");
475475
});
@@ -487,7 +487,7 @@ describe("action parameters", () => {
487487
}
488488
};
489489
assertRequest([3001, 3002], "get", "posts-with-required", validRequestOptions, response => {
490-
headerParamLimit.should.be.equal(0);
490+
expect(headerParamLimit).to.be.equal(0);
491491
expect(response).to.be.status(200);
492492
expect(response).to.have.header("content-type", "text/html; charset=utf-8");
493493
});
@@ -506,7 +506,7 @@ describe("action parameters", () => {
506506
}
507507
};
508508
assertRequest([3001, 3002], "get", "posts-with-json", requestOptions, response => {
509-
headerParamFilter.should.be.eql({ keyword: "name", limit: 5 });
509+
expect(headerParamFilter).to.be.eql({ keyword: "name", limit: 5 });
510510
expect(response).to.be.status(200);
511511
expect(response).to.have.header("content-type", "text/html; charset=utf-8");
512512
});
@@ -524,9 +524,9 @@ describe("action parameters", () => {
524524
jar: jar
525525
};
526526
assertRequest([3001, 3002], "get", "questions", requestOptions, response => {
527-
cookieParamToken.should.be.equal("31ds31das231sad12");
528-
cookieParamCount.should.be.equal(20);
529-
cookieParamShowAll.should.be.equal(false);
527+
expect(cookieParamToken).to.be.equal("31ds31das231sad12");
528+
expect(cookieParamCount).to.be.equal(20);
529+
expect(cookieParamShowAll).to.be.equal(false);
530530
expect(response).to.be.status(200);
531531
expect(response).to.have.header("content-type", "text/html; charset=utf-8");
532532
});
@@ -542,7 +542,7 @@ describe("action parameters", () => {
542542
const invalidRequestOptions = { jar: request.jar() };
543543

544544
assertRequest([3001, 3002], "get", "questions-with-required", validRequestOptions, response => {
545-
cookieParamLimit.should.be.equal(20);
545+
expect(cookieParamLimit).to.be.equal(20);
546546
expect(response).to.be.status(200);
547547
expect(response).to.have.header("content-type", "text/html; charset=utf-8");
548548
});
@@ -560,7 +560,7 @@ describe("action parameters", () => {
560560
const requestOptions = { jar: jar };
561561

562562
assertRequest([3001, 3002], "get", "questions-with-json", requestOptions, response => {
563-
cookieParamFilter.should.be.eql({ keyword: "name", limit: 5 });
563+
expect(cookieParamFilter).to.be.eql({ keyword: "name", limit: 5 });
564564
expect(response).to.be.status(200);
565565
expect(response).to.have.header("content-type", "text/html; charset=utf-8");
566566
});
@@ -576,7 +576,7 @@ describe("action parameters", () => {
576576

577577
// todo: koa @Body with text bug. uncomment after fix https://github.com/koajs/bodyparser/issues/52
578578
assertRequest([3001/*, 3002*/], "post", "questions", "hello", requestOptions, response => {
579-
body.should.be.equal("hello");
579+
expect(body).to.be.equal("hello");
580580
expect(response).to.be.status(200);
581581
expect(response).to.have.header("content-type", "text/html; charset=utf-8");
582582
});
@@ -592,7 +592,7 @@ describe("action parameters", () => {
592592
};
593593

594594
assertRequest([3001/*, 3002*/], "post", "questions-with-required", "0", requestOptions, response => {
595-
body.should.be.equal("0");
595+
expect(body).to.be.equal("0");
596596
expect(response).to.be.status(200);
597597
expect(response).to.have.header("content-type", "text/html; charset=utf-8");
598598
});
@@ -608,7 +608,7 @@ describe("action parameters", () => {
608608

609609
describe("@Body should provide a json object for json-typed controllers and actions", () => {
610610
assertRequest([3001, 3002], "post", "posts", { hello: "world" }, response => {
611-
body.should.be.eql({ hello: "world" });
611+
expect(body).to.be.eql({ hello: "world" });
612612
expect(response).to.be.status(200);
613613
expect(response).to.have.header("content-type", "application/json; charset=utf-8");
614614
expect(response.body).to.be.eql(body); // should we allow to return a text body for json controllers?
@@ -626,9 +626,9 @@ describe("action parameters", () => {
626626

627627
describe("@BodyParam should provide a json object for json-typed controllers and actions", () => {
628628
assertRequest([3001, 3002], "post", "users", { name: "johny", age: 27, isActive: true }, response => {
629-
bodyParamName.should.be.eql("johny");
630-
bodyParamAge.should.be.eql(27);
631-
bodyParamIsActive.should.be.eql(true);
629+
expect(bodyParamName).to.be.eql("johny");
630+
expect(bodyParamAge).to.be.eql(27);
631+
expect(bodyParamIsActive).to.be.eql(true);
632632
expect(response).to.be.status(204);
633633
});
634634
});
@@ -675,7 +675,7 @@ describe("action parameters", () => {
675675
};
676676

677677
assertRequest([3001, 3002], "post", "files", undefined, requestOptions, response => {
678-
// uploadedFileName.should.be.eql("hello-world.txt");
678+
// expect(uploadedFileName).to.be.eql("hello-world.txt");
679679
expect(response).to.be.status(200);
680680
expect(response).to.have.header("content-type", "text/html; charset=utf-8");
681681
expect(response.body).to.be.equal("<html><body>hello-world.txt</body></html>");
@@ -757,8 +757,8 @@ describe("action parameters", () => {
757757
};
758758

759759
assertRequest([3001, 3002], "post", "photos", undefined, requestOptions, response => {
760-
uploadedFilesFirstName.should.be.eql("me.jpg");
761-
uploadedFilesSecondName.should.be.eql("she.jpg");
760+
expect(uploadedFilesFirstName).to.be.eql("me.jpg");
761+
expect(uploadedFilesSecondName).to.be.eql("she.jpg");
762762
expect(response).to.be.status(200);
763763
expect(response).to.have.header("content-type", "text/html; charset=utf-8");
764764
expect(response.body).to.be.equal("<html><body>me.jpg she.jpg</body></html>");

‎test/functional/class-transformer-options.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ describe("class transformer options", () => {
7272
_lastName: "Khudoiberdiev",
7373
name: "Umed Khudoiberdiev"
7474
});
75-
requestFilter.should.be.instanceOf(UserFilter);
76-
requestFilter.should.be.eql({
75+
expect(requestFilter).to.be.instanceOf(UserFilter);
76+
expect(requestFilter).to.be.eql({
7777
keyword: "Um",
7878
__somethingPrivate: "blablabla",
7979
});
@@ -127,8 +127,8 @@ describe("class transformer options", () => {
127127
id: 1,
128128
name: "Umed Khudoiberdiev"
129129
});
130-
requestFilter.should.be.instanceOf(UserFilter);
131-
requestFilter.should.be.eql({
130+
expect(requestFilter).to.be.instanceOf(UserFilter);
131+
expect(requestFilter).to.be.eql({
132132
keyword: "Um"
133133
});
134134
});
@@ -173,8 +173,8 @@ describe("class transformer options", () => {
173173
id: 1,
174174
name: "Umed Khudoiberdiev"
175175
});
176-
requestFilter.should.be.instanceOf(UserFilter);
177-
requestFilter.should.be.eql({
176+
expect(requestFilter).to.be.instanceOf(UserFilter);
177+
expect(requestFilter).to.be.eql({
178178
keyword: "Um"
179179
});
180180
});

‎test/functional/class-validator-options.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ describe("parameters auto-validation", () => {
200200
_firstName: "Umed",
201201
_lastName: "Khudoiberdiev"
202202
});
203-
requestFilter.should.be.instanceOf(UserFilter);
204-
requestFilter.should.be.eql({
203+
expect(requestFilter).to.be.instanceOf(UserFilter);
204+
expect(requestFilter).to.be.eql({
205205
keyword: "Umedi",
206206
__somethingPrivate: "blablabla",
207207
});

0 commit comments

Comments
 (0)