Skip to content

Commit d0c0375

Browse files
committed
Fix linting and some test failures
1 parent 0711278 commit d0c0375

File tree

13 files changed

+29
-23
lines changed

13 files changed

+29
-23
lines changed

.eslintrc.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,15 @@ module.exports = {
2323
'ember/no-jquery': 'off',
2424
'no-console': 'off',
2525
'ember/no-new-mixins': 'off',
26+
'ember/no-mixins': 'off',
2627
'ember/native-classes': 'off',
2728
'ember/require-tagless-components': 'off',
29+
'ember/no-test-this-render': 'off',
30+
'ember/no-classic-classes': 'off',
31+
'ember/no-get': 'off',
32+
'ember/no-actions-hash': 'off',
33+
'ember/no-classic-components': 'off',
34+
'ember/no-private-routing-service': 'off',
2835
},
2936
overrides: [
3037
// node files

.template-lintrc.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,7 @@ module.exports = {
1111
'no-curly-component-invocation': false,
1212
'no-action': false,
1313
quotes: false,
14+
'no-link-to-positional-params': false,
15+
'require-input-label': false,
1416
},
1517
};

app/mixins/parent-name.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Mixin from '@ember/object/mixin';
44
import { inject as service } from '@ember/service';
55

66
export default Mixin.create({
7-
router: service('-routing'),
7+
router: service('router'),
88

99
routeName: readOnly('router.currentRouteName'),
1010
parentName: computed('routeName', function () {

app/router.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AppRouter extends EmberRouter {
1313
constructor() {
1414
super(...arguments);
1515

16-
if (!this.get('fastboot.isFastBoot')) {
16+
if (!this.fastboot.isFastBoot) {
1717
this.on('routeDidChange', this, this._trackPage);
1818
}
1919
}

app/routes/project-version/classes/class.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { resolve, all } from 'rsvp';
22
import Route from '@ember/routing/route';
3-
import { set, get } from '@ember/object';
3+
import { set } from '@ember/object';
44
import ScrollTracker from 'ember-api-docs/mixins/scroll-tracker';
55
import { inject as service } from '@ember/service';
66
import { pluralize } from 'ember-inflector';

app/routes/project-version/functions/function.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Route from '@ember/routing/route';
22
import getFullVersion from 'ember-api-docs/utils/get-full-version';
33
import { inject as service } from '@ember/service';
4-
import { get, set } from '@ember/object';
4+
import { set } from '@ember/object';
55
import createExcerpt from 'ember-api-docs/utils/create-excerpt';
66

77
export default Route.extend({
@@ -10,7 +10,7 @@ export default Route.extend({
1010
scrollPositionReset: service(),
1111

1212
titleToken(model) {
13-
return get(model, 'fn.name');
13+
return model?.fn?.name;
1414
},
1515

1616
async model(params) {

app/services/scroll-position-reset.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ import getOffset from '../utils/get-offset';
55
const { scrollContainerSelector } = config.APP;
66

77
export default class ScrollPositionResetService extends Service {
8+
constructor() {
9+
super(...arguments);
10+
this._shouldResetScroll = false;
11+
}
812
handleScrollPosition() {
913
if (
1014
typeof FastBoot === 'undefined' &&
@@ -62,7 +66,7 @@ export default class ScrollPositionResetService extends Service {
6266
selector.scrollLeft = 0;
6367
selector.scrollTop = 0;
6468
}
65-
this.set('_shouldResetScroll', false);
69+
this._shouldResetScroll = false;
6670
}
6771
}
6872
}

app/services/search.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Service, { inject as service } from '@ember/service';
22
import { task } from 'ember-concurrency';
3-
import { get, set } from '@ember/object';
3+
import { set } from '@ember/object';
44
import { A as emberArray } from '@ember/array';
55
import { alias } from '@ember/object/computed';
66

app/templates/head.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<meta name="description" content={{model.description}}>
88
<meta property="og:description" content={{model.description}}>
99
{{/if}}
10-
{{#if (not model.isRelease)}}
10+
{{#unless model.isRelease}}
1111
<link rel="canonical" href={{model.canonicalUrl}}>
12-
{{/if}}
12+
{{/unless}}

app/templates/project-version.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
@ariaLabel="Select a version"
2222
@required={{true}}
2323
@searchField="compactVersion"
24+
@searchEnabled={{true}}
2425
as |ver|
2526
>
2627
{{ver.compactVersion}}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
"normalize.css": "^8.0.1",
107107
"npm-run-all": "^4.1.5",
108108
"prettier": "^2.2.1",
109-
"qunit": "^2.14.1",
109+
"qunit": "^2.16.0",
110110
"qunit-dom": "^1.6.0",
111111
"sanitize-html": "^2.3.2",
112112
"sass": "^1.25.0",

tests/unit/utils/get-full-version-test.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ import getFullVersion from 'ember-api-docs/utils/get-full-version';
22
import { module, test } from 'qunit';
33
import Service from '@ember/service';
44
import { A } from '@ember/array';
5-
import DS from 'ember-data';
6-
7-
const { ManyArray } = DS;
5+
import { ManyArray } from '@ember-data/model/-private';
86

97
module('Unit | Utility | get full version', function () {
108
test('should return full version when release', function (assert) {

yarn.lock

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9701,11 +9701,6 @@ js-base64@^2.1.8:
97019701
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
97029702
integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
97039703

9704-
9705-
version "2.0.0"
9706-
resolved "https://registry.yarnpkg.com/js-reporters/-/js-reporters-2.0.0.tgz#62ad6a512f1740d3ab4686b0059dd9f57cc0708b"
9707-
integrity sha512-VJd/86niT7GzsaVc+Yxrs8QPrYl1orzv8bYZPuSOtxU6rk/pv8aOXTcIa7HaANvtvdLMTsZspAiucNQ6T2QFHw==
9708-
97099704
js-string-escape@^1.0.1:
97109705
version "1.0.1"
97119706
resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
@@ -12031,13 +12026,12 @@ qunit-dom@^1.6.0:
1203112026
ember-cli-babel "^7.23.0"
1203212027
ember-cli-version-checker "^5.1.1"
1203312028

12034-
qunit@^2.14.1:
12035-
version "2.15.0"
12036-
resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.15.0.tgz#8ba3a3c5d13369ab1740337680600a98a7f8b591"
12037-
integrity sha512-9ZoOILeyRZzrdvy2m7M4S76bneGD75Bh4B2aot3uKRKZuoEvA9gevvzU339L805Ys0AN2C7cnAV9nIBD5t72IQ==
12029+
qunit@^2.16.0:
12030+
version "2.16.0"
12031+
resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.16.0.tgz#b8ed63d512e5d4eaada5afc0c6c9e8b844181ba1"
12032+
integrity sha512-88x9t+rRMbB6IrCIUZvYU4pJy7NiBEv7SX8jD4LZAsIj+dV+kwGnFStOmPNvqa6HM96VZMD8CIIFKH2+3qvluA==
1203812033
dependencies:
1203912034
commander "7.1.0"
12040-
js-reporters "2.0.0"
1204112035
node-watch "0.7.1"
1204212036
tiny-glob "0.2.8"
1204312037

0 commit comments

Comments
 (0)