Skip to content

fix async request leaks in fastboot #681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 29, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/helpers/is-latest.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { helper } from '@ember/component/helper';
import getLastVersion from 'ember-api-docs/utils/get-last-version';

export function isLatest(params, { version, allVersions}) {
let latestVersion = getLastVersion(allVersions);
let latestVersion = getLastVersion(allVersions.map(version => version.id));
return version === latestVersion;
}

Expand Down
4 changes: 2 additions & 2 deletions app/routes/project-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default Route.extend({
return this.store.findRecord('project-version', id, { includes: 'project' });
},

// Using redirect instead of afterModel so transition succeeds and returns 30
// Using redirect instead of afterModel so transition succeeds and returns 307
redirect(model, transition) {
this._gatherHeadDataFromVersion(model, transition.params['project-version'].project_version);
let classParams = transition.params['project-version.classes.class'];
Expand All @@ -41,7 +41,7 @@ export default Route.extend({
let transitionVersion = this.projectService.getUrlVersion();
if (!classParams && !moduleParams && !namespaceParams && !functionParams) {
// if there is no class, module, or namespace specified...
let latestVersion = getLastVersion(model.get('project.projectVersions'));
let latestVersion = getLastVersion(model.get('project.content').hasMany('projectVersions').ids());
let isLatestVersion = transitionVersion === latestVersion || transitionVersion === 'release';
let shouldConvertPackages = semverCompare(model.get('version'), '2.16') < 0;
if (!shouldConvertPackages || isLatestVersion) {
Expand Down
2 changes: 1 addition & 1 deletion app/utils/get-full-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import getLastVersion from 'ember-api-docs/utils/get-last-version';
export default function getFullVersion(urlVersion, project, projectObj, metaStore) {
let projectVersion;
if (urlVersion === 'release') {
let versions = projectObj.get('projectVersions').toArray();
let versions = projectObj.hasMany('projectVersions').ids();
projectVersion = metaStore.getFullVersion(project, getCompactVersion(getLastVersion(versions)));
} else {
projectVersion = metaStore.getFullVersion(project, urlVersion);
Expand Down
2 changes: 1 addition & 1 deletion app/utils/get-last-version.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import semverCompare from 'semver-compare';

export default function getLastVersion(projectVersions) {
const sortedVersions = projectVersions.getEach('id').map(v => v.replace(/ember-data-|ember-/g, '')).sort((v1, v2) => {
const sortedVersions = projectVersions.map(v => v.replace(/ember-data-|ember-/g, '')).sort((v1, v2) => {
return semverCompare(v1, v2);
});
return sortedVersions[sortedVersions.length - 1];
Expand Down
21 changes: 15 additions & 6 deletions tests/unit/utils/get-full-version-test.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import getFullVersion from 'ember-api-docs/utils/get-full-version';
import { module, test } from 'qunit';
import Service from '@ember/service';
import Object from '@ember/object';
import ArrayProxy from '@ember/array/proxy';
import { A } from '@ember/array';
import DS from 'ember-data';

const { ManyArray } = DS;

module('Unit | Utility | get full version', function() {
test('should return full version when release', function(assert) {
Expand All @@ -14,11 +15,19 @@ module('Unit | Utility | get full version', function() {
return '2.17.1';
}
});
let projectVersions = ArrayProxy.create({
content: A([{ id: 'ember-2.17.1'}, { id: 'ember-2.16.1' }])
let projectVersions = ManyArray.create({
content: A([{ id: 'ember-2.17.1'}, { id: 'ember-2.16.1' }]),
flushCanonical() {},
ids() {
return this.content.map(obj => obj.id);
}
});
let projectObj = Object.create({ projectVersions });
let projectObj = {
hasMany() {
return projectVersions;
}
};
let result = getFullVersion('release', 'ember', projectObj, metaStore);
assert.equal(result, '2.17.1');
});
});
});
14 changes: 7 additions & 7 deletions tests/unit/utils/get-last-version-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ import { module, test } from 'qunit';
module('Unit | Utility | get-latest-version', function() {
test('should pick the latest version of ember', function (assert) {
let versions = A([
{ id: 'ember-1.13.0' },
{ id: 'ember-2.7' },
{ id: 'ember-2.1.10' }
'ember-1.13.0',
'ember-2.7',
'ember-2.1.10'
]);
let latestVersion = getLastVersion(versions);
assert.equal(latestVersion, '2.7');
});

test('should pick the latest version of ember-data', function (assert) {
let versions = A([
{ id: 'ember-data-1.13.0' },
{ id: 'ember-data-2.7' },
{ id: 'ember-data-2.1.10' }
'ember-data-1.13.0',
'ember-data-2.7',
'ember-data-2.1.10'
]);
let latestVersion = getLastVersion(versions);
assert.equal(latestVersion, '2.7');
});
});
});