Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-27 22:49:56 -05:00
Code Issues Activity

Fixed lint warnings from Admin feature-test

Browse source 
no issue

- converted use of promises to async/await
- removed return from async test functions to clear lint warnings
This commit is contained in:
Kevin Ansfield 2024-09-03 10:53:15 +01:00
parent fd926193ce
commit 3744caa950
1 changed files with 83 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

182
ghost/admin/tests/integration/services/feature-test.js
View file

@ -101,10 +101,9 @@ describe('Integration: Service: feature', function () {
let service = this.owner.lookup('service:feature'); let service = this.owner.lookup('service:feature');
return service.fetch().then(() => { await service.fetch();
expect(service.get('testFlag')).to.be.true; expect(service.get('testFlag')).to.be.true;
expect(service.get('testUserFlag')).to.be.true; expect(service.get('testUserFlag')).to.be.true;
});
}); });
it('returns false for set flag with config false and labs false', async function () { it('returns false for set flag with config false and labs false', async function () {
@ -119,10 +118,9 @@ describe('Integration: Service: feature', function () {
let service = this.owner.lookup('service:feature'); let service = this.owner.lookup('service:feature');
service.config.testFlag = false; service.config.testFlag = false;
return service.fetch().then(() => { await service.fetch();
expect(service.get('labs.testFlag')).to.be.false; expect(service.get('labs.testFlag')).to.be.false;
expect(service.get('testFlag')).to.be.false; expect(service.get('testFlag')).to.be.false;
});
}); });
it('returns true for set flag with config true and labs false', async function () { it('returns true for set flag with config true and labs false', async function () {
@ -137,10 +135,9 @@ describe('Integration: Service: feature', function () {
let service = this.owner.lookup('service:feature'); let service = this.owner.lookup('service:feature');
service.config.testFlag = true; service.config.testFlag = true;
return service.fetch().then(() => { await service.fetch();
expect(service.get('labs.testFlag')).to.be.false; expect(service.get('labs.testFlag')).to.be.false;
expect(service.get('testFlag')).to.be.true; expect(service.get('testFlag')).to.be.true;
});
}); });
it('returns true for set flag with config is an object and labs true', async function () { it('returns true for set flag with config is an object and labs true', async function () {
@ -155,10 +152,9 @@ describe('Integration: Service: feature', function () {
let service = this.owner.lookup('service:feature'); let service = this.owner.lookup('service:feature');
service.config.testFlag = {key: 'value'}; service.config.testFlag = {key: 'value'};
return service.fetch().then(() => { await service.fetch();
expect(service.get('labs.testFlag')).to.be.true; expect(service.get('labs.testFlag')).to.be.true;
expect(service.get('testFlag')).to.be.true; expect(service.get('testFlag')).to.be.true;
});
}); });
it('returns true for set flag with config true and labs true', async function () { it('returns true for set flag with config true and labs true', async function () {
@ -173,10 +169,9 @@ describe('Integration: Service: feature', function () {
let service = this.owner.lookup('service:feature'); let service = this.owner.lookup('service:feature');
service.config.testFlag = true; service.config.testFlag = true;
return service.fetch().then(() => { await service.fetch();
expect(service.get('labs.testFlag')).to.be.true; expect(service.get('labs.testFlag')).to.be.true;
expect(service.get('testFlag')).to.be.true; expect(service.get('testFlag')).to.be.true;
});
}); });
it('returns false for set flag with accessibility false', async function () { it('returns false for set flag with accessibility false', async function () {
@ -190,10 +185,9 @@ describe('Integration: Service: feature', function () {
let service = this.owner.lookup('service:feature'); let service = this.owner.lookup('service:feature');
return service.fetch().then(() => { await service.fetch();
expect(service.get('accessibility.testUserFlag')).to.be.false; expect(service.get('accessibility.testUserFlag')).to.be.false;
expect(service.get('testUserFlag')).to.be.false; expect(service.get('testUserFlag')).to.be.false;
});
}); });
it('returns true for set flag with accessibility true', async function () { it('returns true for set flag with accessibility true', async function () {
@ -207,10 +201,9 @@ describe('Integration: Service: feature', function () {
let service = this.owner.lookup('service:feature'); let service = this.owner.lookup('service:feature');
return service.fetch().then(() => { await service.fetch();
expect(service.get('accessibility.testUserFlag')).to.be.true; expect(service.get('accessibility.testUserFlag')).to.be.true;
expect(service.get('testUserFlag')).to.be.true; expect(service.get('testUserFlag')).to.be.true;
});
}); });
it('saves labs setting correctly', async function () { it('saves labs setting correctly', async function () {
@ -225,18 +218,17 @@ describe('Integration: Service: feature', function () {
let service = this.owner.lookup('service:feature'); let service = this.owner.lookup('service:feature');
service.config.testFlag = {key: 'value'}; service.config.testFlag = {key: 'value'};
return service.fetch().then(() => { await service.fetch();
expect(service.get('testFlag')).to.be.false; expect(service.get('testFlag')).to.be.false;
run(() => { run(() => {
service.set('testFlag', true); service.set('testFlag', true);
});
return settled().then(() => {
expect(server.handlers[2].numberOfCalls).to.equal(1);
expect(service.get('testFlag')).to.be.true;
});
}); });
await settled();
expect(server.handlers[2].numberOfCalls).to.equal(1);
expect(service.get('testFlag')).to.be.true;
}); });
it('saves accessibility setting correctly', async function () { it('saves accessibility setting correctly', async function () {
@ -250,18 +242,16 @@ describe('Integration: Service: feature', function () {
let service = this.owner.lookup('service:feature'); let service = this.owner.lookup('service:feature');
return service.fetch().then(() => { await service.fetch();
expect(service.get('testUserFlag')).to.be.false; expect(service.get('testUserFlag')).to.be.false;
run(() => { run(() => {
service.set('testUserFlag', true); service.set('testUserFlag', true);
});
return settled().then(() => {
expect(server.handlers[4].numberOfCalls).to.equal(1);
expect(service.get('testUserFlag')).to.be.true;
});
}); });
await settled();
expect(server.handlers[4].numberOfCalls).to.equal(1);
expect(service.get('testUserFlag')).to.be.true;
}); });
it('notifies for server errors on labs save', async function () { it('notifies for server errors on labs save', async function () {
@ -276,27 +266,25 @@ describe('Integration: Service: feature', function () {
let service = this.owner.lookup('service:feature'); let service = this.owner.lookup('service:feature');
service.config.testFlag = false; service.config.testFlag = false;
return service.fetch().then(() => { await service.fetch();
expect(service.get('testFlag')).to.be.false; expect(service.get('testFlag')).to.be.false;
run(() => { run(() => {
service.set('testFlag', true); service.set('testFlag', true);
});
return settled().then(() => {
expect(
server.handlers[2].numberOfCalls,
'PUT call is made'
).to.equal(1);
expect(
service.get('notifications.alerts').length,
'number of alerts shown'
).to.equal(1);
expect(service.get('testFlag')).to.be.false;
});
}); });
await settled();
expect(
server.handlers[2].numberOfCalls,
'PUT call is made'
).to.equal(1);
expect(
service.get('notifications.alerts').length,
'number of alerts shown'
).to.equal(1);
expect(service.get('testFlag')).to.be.false;
}); });
it('notifies for server errors on accessibility save', async function () { it('notifies for server errors on accessibility save', async function () {
@ -310,27 +298,25 @@ describe('Integration: Service: feature', function () {
let service = this.owner.lookup('service:feature'); let service = this.owner.lookup('service:feature');
return service.fetch().then(() => { await service.fetch();
expect(service.get('testUserFlag')).to.be.false; expect(service.get('testUserFlag')).to.be.false;
run(() => { run(() => {
service.set('testUserFlag', true); service.set('testUserFlag', true);
});
return settled().then(() => {
expect(
server.handlers[3].numberOfCalls,
'PUT call is made'
).to.equal(1);
expect(
service.get('notifications.alerts').length,
'number of alerts shown'
).to.equal(1);
expect(service.get('testUserFlag')).to.be.false;
});
}); });
await settled();
expect(
server.handlers[3].numberOfCalls,
'PUT call is made'
).to.equal(1);
expect(
service.get('notifications.alerts').length,
'number of alerts shown'
).to.equal(1);
expect(service.get('testUserFlag')).to.be.false;
}); });
it('notifies for validation errors', async function () { it('notifies for validation errors', async function () {
@ -345,21 +331,19 @@ describe('Integration: Service: feature', function () {
let featureService = this.owner.lookup('service:feature'); let featureService = this.owner.lookup('service:feature');
featureService.config.testFlag = false; featureService.config.testFlag = false;
return featureService.fetch().then(() => { await featureService.fetch();
expect(featureService.get('testFlag'), 'testFlag before set').to.be.false; expect(featureService.get('testFlag'), 'testFlag before set').to.be.false;
run(() => { run(() => {
expect(() => { expect(() => {
featureService.set('testFlag', true); featureService.set('testFlag', true);
}, EmberError, 'threw validation error'); }, EmberError, 'threw validation error');
});
return settled().then(() => {
// ensure validation is happening before the API is hit
expect(server.handlers[2].numberOfCalls).to.equal(0);
expect(featureService.get('testFlag')).to.be.false;
});
}); });
await settled();
// ensure validation is happening before the API is hit
expect(server.handlers[2].numberOfCalls).to.equal(0);
expect(featureService.get('testFlag')).to.be.false;
}); });
it('has correct labs flags when accessed before and after settings load', async function () { it('has correct labs flags when accessed before and after settings load', async function () {