Skip to content

Commit e2860a9

Browse files
MitMaroziluvatar
MitMaro
authored and
ziluvatar
committed
Minor test refactoring for recently added tests (#504)
* Prefix claim- to claim related test files * Fix typo of "signWithNoBfore" in notBefore tests
1 parent 53d405e commit e2860a9

File tree

3 files changed

+22
-22
lines changed

3 files changed

+22
-22
lines changed

‎test/aud.test.js ‎test/claim-aud.test.js

File renamed without changes.

‎test/exp.test.js ‎test/claim-exp.test.js

File renamed without changes.

‎test/nbf.test.js ‎test/claim-nbf.test.js

+22-22
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const testUtils = require('./test-utils');
99
const base64UrlEncode = testUtils.base64UrlEncode;
1010
const noneAlgorithmHeader = 'eyJhbGciOiJub25lIiwidHlwIjoiSldUIn0';
1111

12-
function signWithNoBefore(payload, notBefore) {
12+
function signWithNotBefore(payload, notBefore) {
1313
const options = {algorithm: 'none'};
1414
if (notBefore !== undefined) {
1515
options.notBefore = notBefore;
@@ -36,15 +36,15 @@ describe('not before', function() {
3636
{foo: 'bar'},
3737
].forEach((notBefore) => {
3838
it(`should error with with value ${util.inspect(notBefore)}`, function () {
39-
expect(() => signWithNoBefore({}, notBefore)).to.throw(
39+
expect(() => signWithNotBefore({}, notBefore)).to.throw(
4040
'"notBefore" should be a number of seconds or string representing a timespan'
4141
);
4242
});
4343
});
4444

4545
// TODO this should throw the same error as other invalid inputs
4646
it(`should error with with value ''`, function () {
47-
expect(() => signWithNoBefore({}, '')).to.throw(
47+
expect(() => signWithNotBefore({}, '')).to.throw(
4848
'val is not a non-empty string or a valid number. val=""'
4949
);
5050
});
@@ -57,19 +57,19 @@ describe('not before', function() {
5757
});
5858

5959
it('should error when "nbf" is in payload', function () {
60-
expect(() => signWithNoBefore({nbf: 100}, 100)).to.throw(
60+
expect(() => signWithNotBefore({nbf: 100}, 100)).to.throw(
6161
'Bad "options.notBefore" option the payload already has an "nbf" property.'
6262
);
6363
});
6464

6565
it('should error with a string payload', function () {
66-
expect(() => signWithNoBefore('a string payload', 100)).to.throw(
66+
expect(() => signWithNotBefore('a string payload', 100)).to.throw(
6767
'invalid notBefore option for string payload'
6868
);
6969
});
7070

7171
it('should error with a Buffer payload', function () {
72-
expect(() => signWithNoBefore(new Buffer('a Buffer payload'), 100)).to.throw(
72+
expect(() => signWithNotBefore(new Buffer('a Buffer payload'), 100)).to.throw(
7373
'invalid notBefore option for object payload'
7474
);
7575
});
@@ -90,7 +90,7 @@ describe('not before', function() {
9090
{foo: 'bar'},
9191
].forEach((nbf) => {
9292
it(`should error with with value ${util.inspect(nbf)}`, function () {
93-
expect(() => signWithNoBefore({nbf})).to.throw(
93+
expect(() => signWithNotBefore({nbf})).to.throw(
9494
'"nbf" should be a number of seconds'
9595
);
9696
});
@@ -135,7 +135,7 @@ describe('not before', function() {
135135
});
136136

137137
it('should set correct "nbf" with negative number of seconds', function () {
138-
const token = signWithNoBefore({}, -10);
138+
const token = signWithNotBefore({}, -10);
139139
const decoded = jwt.decode(token);
140140

141141
const verified = jwt.verify(token, undefined);
@@ -144,7 +144,7 @@ describe('not before', function() {
144144
});
145145

146146
it('should set correct "nbf" with positive number of seconds', function () {
147-
const token = signWithNoBefore({}, 10);
147+
const token = signWithNotBefore({}, 10);
148148

149149
fakeClock.tick(10000);
150150
const decoded = jwt.decode(token);
@@ -155,7 +155,7 @@ describe('not before', function() {
155155
});
156156

157157
it('should set correct "nbf" with zero seconds', function () {
158-
const token = signWithNoBefore({}, 0);
158+
const token = signWithNotBefore({}, 0);
159159

160160
const decoded = jwt.decode(token);
161161

@@ -165,7 +165,7 @@ describe('not before', function() {
165165
});
166166

167167
it('should set correct "nbf" with negative string timespan', function () {
168-
const token = signWithNoBefore({}, '-10 s');
168+
const token = signWithNotBefore({}, '-10 s');
169169

170170
const decoded = jwt.decode(token);
171171

@@ -176,7 +176,7 @@ describe('not before', function() {
176176

177177

178178
it('should set correct "nbf" with positive string timespan', function () {
179-
const token = signWithNoBefore({}, '10 s');
179+
const token = signWithNotBefore({}, '10 s');
180180

181181
fakeClock.tick(10000);
182182
const decoded = jwt.decode(token);
@@ -187,7 +187,7 @@ describe('not before', function() {
187187
});
188188

189189
it('should set correct "nbf" with zero string timespan', function () {
190-
const token = signWithNoBefore({}, '0 s');
190+
const token = signWithNotBefore({}, '0 s');
191191

192192
const decoded = jwt.decode(token);
193193

@@ -198,30 +198,30 @@ describe('not before', function() {
198198

199199
// TODO an nbf of -Infinity should fail validation
200200
it('should set null "nbf" when given -Infinity', function () {
201-
const token = signWithNoBefore({nbf: -Infinity});
201+
const token = signWithNotBefore({nbf: -Infinity});
202202

203203
const decoded = jwt.decode(token);
204204
expect(decoded.nbf).to.be.null;
205205
});
206206

207207
// TODO an nbf of Infinity should fail validation
208208
it('should set null "nbf" when given value Infinity', function () {
209-
const token = signWithNoBefore({nbf: Infinity});
209+
const token = signWithNotBefore({nbf: Infinity});
210210

211211
const decoded = jwt.decode(token);
212212
expect(decoded.nbf).to.be.null;
213213
});
214214

215215
// TODO an nbf of NaN should fail validation
216216
it('should set null "nbf" when given value NaN', function () {
217-
const token = signWithNoBefore({nbf: NaN});
217+
const token = signWithNotBefore({nbf: NaN});
218218

219219
const decoded = jwt.decode(token);
220220
expect(decoded.nbf).to.be.null;
221221
});
222222

223223
it('should set correct "nbf" when "iat" is passed', function () {
224-
const token = signWithNoBefore({iat: 40}, -10);
224+
const token = signWithNotBefore({iat: 40}, -10);
225225

226226
const decoded = jwt.decode(token);
227227

@@ -231,31 +231,31 @@ describe('not before', function() {
231231
});
232232

233233
it('should verify "nbf" using "clockTimestamp"', function () {
234-
const token = signWithNoBefore({}, 10);
234+
const token = signWithNotBefore({}, 10);
235235

236236
const verified = jwt.verify(token, undefined, {clockTimestamp: 70});
237237
expect(verified.iat).to.equal(60);
238238
expect(verified.nbf).to.equal(70);
239239
});
240240

241241
it('should verify "nbf" using "clockTolerance"', function () {
242-
const token = signWithNoBefore({}, 5);
242+
const token = signWithNotBefore({}, 5);
243243

244244
const verified = jwt.verify(token, undefined, {clockTolerance: 6});
245245
expect(verified.iat).to.equal(60);
246246
expect(verified.nbf).to.equal(65);
247247
});
248248

249249
it('should ignore a not active token when "ignoreNotBefore" is true', function () {
250-
const token = signWithNoBefore({}, '10 s');
250+
const token = signWithNotBefore({}, '10 s');
251251

252252
const verified = jwt.verify(token, undefined, {ignoreNotBefore: true});
253253
expect(verified.iat).to.equal(60);
254254
expect(verified.nbf).to.equal(70);
255255
});
256256

257257
it('should error on verify if "nbf" is after current time', function () {
258-
const token = signWithNoBefore({nbf: 61});
258+
const token = signWithNotBefore({nbf: 61});
259259

260260
expect(() => jwt.verify(token, undefined)).to.throw(
261261
jwt.NotBeforeError,
@@ -264,7 +264,7 @@ describe('not before', function() {
264264
});
265265

266266
it('should error on verify if "nbf" is after current time using clockTolerance', function () {
267-
const token = signWithNoBefore({}, 5);
267+
const token = signWithNotBefore({}, 5);
268268

269269
expect(() => jwt.verify(token, undefined, {clockTolerance: 4})).to.throw(
270270
jwt.NotBeforeError,

0 commit comments

Comments
 (0)