Simplify assertions

This commit is contained in:
Daniel García Aubert 2020-04-30 12:30:31 +02:00
parent d5348dd9d4
commit 8d73571f5b

View File

@ -39,7 +39,7 @@ function templateBuilder ({ name }) {
}; };
}; };
describe('metrics middleware', function () { describe('metrics', function () {
beforeEach(function () { beforeEach(function () {
this.originalMetricsBackendSendMethod = MetricsBackend.prototype.send; this.originalMetricsBackendSendMethod = MetricsBackend.prototype.send;
this.pubSubMetricsBackendSendMethodCalled = false; this.pubSubMetricsBackendSendMethodCalled = false;
@ -121,14 +121,17 @@ describe('metrics middleware', function () {
const { token, cacheBuster } = LayergroupToken.parse(body.layergroupid); const { token, cacheBuster } = LayergroupToken.parse(body.layergroupid);
assert.ok(this.pubSubMetricsBackendSendMethodCalled); assert.ok(this.pubSubMetricsBackendSendMethodCalled);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.event, expectedEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.client_event, expectedMetricsEvent); const { event, attributes } = this.pubSubMetricsBackendSendMethodCalledWith;
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.event_source, expectedEventSource);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.client_event_group_id, expectedEventGroupId); assert.strictEqual(event, expectedEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.response_code, expectedResponseCode); assert.strictEqual(attributes.client_event, expectedMetricsEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.map_type, expectedMapType); assert.strictEqual(attributes.event_source, expectedEventSource);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.map_id, token); assert.strictEqual(attributes.client_event_group_id, expectedEventGroupId);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.cache_buster, cacheBuster); assert.strictEqual(attributes.response_code, expectedResponseCode);
assert.strictEqual(attributes.map_type, expectedMapType);
assert.strictEqual(attributes.map_id, token);
assert.strictEqual(attributes.cache_buster, cacheBuster);
return done(); return done();
}); });
@ -161,14 +164,17 @@ describe('metrics middleware', function () {
const { token, cacheBuster } = LayergroupToken.parse(body.layergroupid); const { token, cacheBuster } = LayergroupToken.parse(body.layergroupid);
assert.ok(this.pubSubMetricsBackendSendMethodCalled); assert.ok(this.pubSubMetricsBackendSendMethodCalled);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.event, expectedEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.client_event, expectedMetricsEvent); const { event, attributes } = this.pubSubMetricsBackendSendMethodCalledWith;
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.event_source, expectedEventSource);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.client_event_group_id, expectedEventGroupId); assert.strictEqual(event, expectedEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.response_code, expectedResponseCode); assert.strictEqual(attributes.client_event, expectedMetricsEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.map_type, expectedMapType); assert.strictEqual(attributes.event_source, expectedEventSource);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.map_id, token); assert.strictEqual(attributes.client_event_group_id, expectedEventGroupId);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.cache_buster, cacheBuster); assert.strictEqual(attributes.response_code, expectedResponseCode);
assert.strictEqual(attributes.map_type, expectedMapType);
assert.strictEqual(attributes.map_id, token);
assert.strictEqual(attributes.cache_buster, cacheBuster);
return done(); return done();
}); });
@ -209,14 +215,17 @@ describe('metrics middleware', function () {
} }
assert.ok(this.pubSubMetricsBackendSendMethodCalled); assert.ok(this.pubSubMetricsBackendSendMethodCalled);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.event, expectedEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.client_event, expectedMetricsEvent); const { event, attributes } = this.pubSubMetricsBackendSendMethodCalledWith;
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.event_source, expectedEventSource);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.client_event_group_id, expectedEventGroupId); assert.strictEqual(event, expectedEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.response_code, expectedResponseCode); assert.strictEqual(attributes.client_event, expectedMetricsEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.map_type, expectedMapType); assert.strictEqual(attributes.event_source, expectedEventSource);
assert.strictEqual(typeof this.pubSubMetricsBackendSendMethodCalledWith.attributes.map_id, 'string'); assert.strictEqual(attributes.client_event_group_id, expectedEventGroupId);
assert.strictEqual(typeof this.pubSubMetricsBackendSendMethodCalledWith.attributes.cache_buster, 'string'); assert.strictEqual(attributes.response_code, expectedResponseCode);
assert.strictEqual(attributes.map_type, expectedMapType);
assert.strictEqual(typeof attributes.map_id, 'string');
assert.strictEqual(typeof attributes.cache_buster, 'string');
return done(); return done();
}); });
@ -242,12 +251,15 @@ describe('metrics middleware', function () {
} }
assert.ok(this.pubSubMetricsBackendSendMethodCalled); assert.ok(this.pubSubMetricsBackendSendMethodCalled);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.event, expectedEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.event_source, expectedEventSource); const { event, attributes } = this.pubSubMetricsBackendSendMethodCalledWith;
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.client_event_group_id, expectedEventGroupId);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.response_code, expectedResponseCode); assert.strictEqual(event, expectedEvent);
assert.strictEqual(typeof this.pubSubMetricsBackendSendMethodCalledWith.attributes.map_id, 'string'); assert.strictEqual(attributes.event_source, expectedEventSource);
assert.strictEqual(typeof this.pubSubMetricsBackendSendMethodCalledWith.attributes.cache_buster, 'string'); assert.strictEqual(attributes.client_event_group_id, expectedEventGroupId);
assert.strictEqual(attributes.response_code, expectedResponseCode);
assert.strictEqual(typeof attributes.map_id, 'string');
assert.strictEqual(typeof attributes.cache_buster, 'string');
return done(); return done();
}); });
@ -282,12 +294,15 @@ describe('metrics middleware', function () {
} }
assert.ok(this.pubSubMetricsBackendSendMethodCalled); assert.ok(this.pubSubMetricsBackendSendMethodCalled);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.event, expectedEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.event_source, expectedEventSource); const { event, attributes } = this.pubSubMetricsBackendSendMethodCalledWith;
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.client_event_group_id, expectedEventGroupId);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.response_code, expectedResponseCode); assert.strictEqual(event, expectedEvent);
assert.strictEqual(typeof this.pubSubMetricsBackendSendMethodCalledWith.attributes.map_id, 'string'); assert.strictEqual(attributes.event_source, expectedEventSource);
assert.strictEqual(typeof this.pubSubMetricsBackendSendMethodCalledWith.attributes.cache_buster, 'string'); assert.strictEqual(attributes.client_event_group_id, expectedEventGroupId);
assert.strictEqual(attributes.response_code, expectedResponseCode);
assert.strictEqual(typeof attributes.map_id, 'string');
assert.strictEqual(typeof attributes.cache_buster, 'string');
return done(); return done();
}); });
@ -320,16 +335,19 @@ describe('metrics middleware', function () {
const { token, cacheBuster, templateHash } = LayergroupToken.parse(body.layergroupid); const { token, cacheBuster, templateHash } = LayergroupToken.parse(body.layergroupid);
assert.ok(this.pubSubMetricsBackendSendMethodCalled); assert.ok(this.pubSubMetricsBackendSendMethodCalled);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.event, expectedEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.client_event, expectedMetricsEvent); const { event, attributes } = this.pubSubMetricsBackendSendMethodCalledWith;
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.event_source, expectedEventSource);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.client_event_group_id, expectedEventGroupId); assert.strictEqual(event, expectedEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.response_code, expectedResponseCode); assert.strictEqual(attributes.client_event, expectedMetricsEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.map_type, expectedMapType); assert.strictEqual(attributes.event_source, expectedEventSource);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.map_id, token); assert.strictEqual(attributes.client_event_group_id, expectedEventGroupId);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.cache_buster, cacheBuster); assert.strictEqual(attributes.response_code, expectedResponseCode);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.template_hash, templateHash); assert.strictEqual(attributes.map_type, expectedMapType);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.stat_tag, template.layergroup.stat_tag); assert.strictEqual(attributes.map_id, token);
assert.strictEqual(attributes.cache_buster, cacheBuster);
assert.strictEqual(attributes.template_hash, templateHash);
assert.strictEqual(attributes.stat_tag, template.layergroup.stat_tag);
return done(); return done();
}); });
@ -383,17 +401,20 @@ describe('metrics middleware', function () {
} }
assert.ok(this.pubSubMetricsBackendSendMethodCalled); assert.ok(this.pubSubMetricsBackendSendMethodCalled);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.event, expectedEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.client_event, expectedMetricsEvent); const { event, attributes } = this.pubSubMetricsBackendSendMethodCalledWith;
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.event_source, expectedEventSource);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.client_event_group_id, expectedEventGroupId); assert.strictEqual(event, expectedEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.response_code, expectedResponseCode); assert.strictEqual(attributes.client_event, expectedMetricsEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.map_type, expectedMapType); assert.strictEqual(attributes.event_source, expectedEventSource);
assert.strictEqual(typeof this.pubSubMetricsBackendSendMethodCalledWith.attributes.map_id, 'string'); assert.strictEqual(attributes.client_event_group_id, expectedEventGroupId);
assert.strictEqual(typeof this.pubSubMetricsBackendSendMethodCalledWith.attributes.cache_buster, 'string'); assert.strictEqual(attributes.response_code, expectedResponseCode);
assert.strictEqual(attributes.map_type, expectedMapType);
assert.strictEqual(typeof attributes.map_id, 'string');
assert.strictEqual(typeof attributes.cache_buster, 'string');
// TODO: uncomment this // TODO: uncomment this
// assert.strictEqual(typeof this.pubSubMetricsBackendSendMethodCalledWith.attributes.template_hash, 'string'); // assert.strictEqual(typeof attributes.template_hash, 'string');
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.stat_tag, templateMissingCartoCSSVersion.layergroup.stat_tag); assert.strictEqual(attributes.stat_tag, templateMissingCartoCSSVersion.layergroup.stat_tag);
return done(); return done();
}); });
@ -420,14 +441,17 @@ describe('metrics middleware', function () {
} }
assert.ok(this.pubSubMetricsBackendSendMethodCalled); assert.ok(this.pubSubMetricsBackendSendMethodCalled);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.event, expectedEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.event_source, expectedEventSource); const { event, attributes } = this.pubSubMetricsBackendSendMethodCalledWith;
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.client_event_group_id, expectedEventGroupId);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.response_code, expectedResponseCode); assert.strictEqual(event, expectedEvent);
assert.strictEqual(typeof this.pubSubMetricsBackendSendMethodCalledWith.attributes.map_id, 'string'); assert.strictEqual(attributes.event_source, expectedEventSource);
assert.strictEqual(typeof this.pubSubMetricsBackendSendMethodCalledWith.attributes.cache_buster, 'string'); assert.strictEqual(attributes.client_event_group_id, expectedEventGroupId);
assert.strictEqual(typeof this.pubSubMetricsBackendSendMethodCalledWith.attributes.template_hash, 'string'); assert.strictEqual(attributes.response_code, expectedResponseCode);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.stat_tag, template.layergroup.stat_tag); assert.strictEqual(typeof attributes.map_id, 'string');
assert.strictEqual(typeof attributes.cache_buster, 'string');
assert.strictEqual(typeof attributes.template_hash, 'string');
assert.strictEqual(attributes.stat_tag, template.layergroup.stat_tag);
return done(); return done();
}); });
@ -456,17 +480,20 @@ describe('metrics middleware', function () {
} }
assert.ok(this.pubSubMetricsBackendSendMethodCalled); assert.ok(this.pubSubMetricsBackendSendMethodCalled);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.event, expectedEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.client_event, expectedMetricsEvent); const { event, attributes } = this.pubSubMetricsBackendSendMethodCalledWith;
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.event_source, expectedEventSource);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.client_event_group_id, expectedEventGroupId); assert.strictEqual(event, expectedEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.response_code, expectedResponseCode); assert.strictEqual(attributes.client_event, expectedMetricsEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.map_type, expectedMapType); assert.strictEqual(attributes.event_source, expectedEventSource);
assert.strictEqual(typeof this.pubSubMetricsBackendSendMethodCalledWith.attributes.map_id, 'string'); assert.strictEqual(attributes.client_event_group_id, expectedEventGroupId);
assert.strictEqual(typeof this.pubSubMetricsBackendSendMethodCalledWith.attributes.cache_buster, 'string'); assert.strictEqual(attributes.response_code, expectedResponseCode);
assert.strictEqual(attributes.map_type, expectedMapType);
assert.strictEqual(typeof attributes.map_id, 'string');
assert.strictEqual(typeof attributes.cache_buster, 'string');
// TODO: uncomment this // TODO: uncomment this
// assert.strictEqual(typeof this.pubSubMetricsBackendSendMethodCalledWith.attributes.template_hash, 'string'); // assert.strictEqual(typeof attributes.template_hash, 'string');
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.stat_tag, template.layergroup.stat_tag); assert.strictEqual(attributes.stat_tag, template.layergroup.stat_tag);
return done(); return done();
}); });
@ -504,17 +531,21 @@ describe('metrics middleware', function () {
return done(err); return done(err);
} }
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.event, expectedEvent); assert.ok(this.pubSubMetricsBackendSendMethodCalled);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.client_event, expectedMetricsEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.event_source, expectedEventSource); const { event, attributes } = this.pubSubMetricsBackendSendMethodCalledWith;
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.client_event_group_id, expectedEventGroupId);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.response_code, expectedResponseCode); assert.strictEqual(event, expectedEvent);
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.map_type, expectedMapType); assert.strictEqual(attributes.client_event, expectedMetricsEvent);
assert.strictEqual(typeof this.pubSubMetricsBackendSendMethodCalledWith.attributes.map_id, 'string'); assert.strictEqual(attributes.event_source, expectedEventSource);
assert.strictEqual(typeof this.pubSubMetricsBackendSendMethodCalledWith.attributes.cache_buster, 'string'); assert.strictEqual(attributes.client_event_group_id, expectedEventGroupId);
assert.strictEqual(attributes.response_code, expectedResponseCode);
assert.strictEqual(attributes.map_type, expectedMapType);
assert.strictEqual(typeof attributes.map_id, 'string');
assert.strictEqual(typeof attributes.cache_buster, 'string');
// TODO: uncomment this // TODO: uncomment this
// assert.strictEqual(typeof this.pubSubMetricsBackendSendMethodCalledWith.attributes.template_hash, 'string'); // assert.strictEqual(typeof attributes.template_hash, 'string');
assert.strictEqual(this.pubSubMetricsBackendSendMethodCalledWith.attributes.stat_tag, template.layergroup.stat_tag); assert.strictEqual(attributes.stat_tag, template.layergroup.stat_tag);
return done(); return done();
}); });