Skip to content

Commit

Permalink
Merge pull request #936 from elwayman02/prettier-8
Browse files Browse the repository at this point in the history
Prettier v8
  • Loading branch information
elwayman02 authored Aug 24, 2023
2 parents b8042ec + 6cb8a44 commit 8b4cfd9
Show file tree
Hide file tree
Showing 7 changed files with 162 additions and 131 deletions.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,24 +68,24 @@
"ember-template-lint": "^5.11.2",
"ember-try": "^3.0.0-beta.1",
"eslint": "^8.47.0",
"eslint-config-prettier": "^8.8.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-ember": "^11.10.0",
"eslint-plugin-n": "^16.0.2",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-qunit": "^8.0.0",
"field-guide": "^2.4.0",
"field-guide-default-template": "^3.0.0",
"loader.js": "^4.7.0",
"prember": "^2.0.0",
"prettier": "^2.8.8",
"prettier": "^3.0.0",
"qunit": "^2.19.4",
"qunit-dom": "^2.0.0",
"release-it": "^15.11.0",
"release-it-lerna-changelog": "^5.0.0",
"sass": "^1.66.1",
"stylelint": "^15.10.3",
"stylelint-config-standard": "^33.0.0",
"stylelint-prettier": "^3.0.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-prettier": "^4.0.2",
"webpack": "^5.83.1"
},
"fastbootDependencies": [
Expand Down
24 changes: 12 additions & 12 deletions tests/integration/modifiers/did-intersect-mock-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module(

test('Did intersect mock triggers onEnter correctly', async function (assert) {
await render(
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub}}></div>`
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub}}></div>`,
);
await this.didIntersectMock.enter('[data-test-did-intersect]');

Expand All @@ -30,7 +30,7 @@ module(

test('Did intersect mock triggers onEnter with additional state correctly', async function (assert) {
await render(
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub}}></div>`
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub}}></div>`,
);
await this.didIntersectMock.enter('[data-test-did-intersect]', {
time: 100,
Expand All @@ -39,13 +39,13 @@ module(
assert.ok(
this.enterStub.calledWithMatch({
time: 100,
})
}),
);
});

test('Did intersect mock triggers onExit correctly', async function (assert) {
await render(
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub}}></div>`
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub}}></div>`,
);
await this.didIntersectMock.exit('[data-test-did-intersect]');

Expand All @@ -55,7 +55,7 @@ module(

test('Did intersect mock triggers onExit with additional state correctly', async function (assert) {
await render(
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub}}></div>`
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub}}></div>`,
);
await this.didIntersectMock.exit('[data-test-did-intersect]', {
time: 100,
Expand All @@ -64,13 +64,13 @@ module(
assert.ok(
this.exitStub.calledWithMatch({
time: 100,
})
}),
);
});

test('Did intersect mock triggers onExit never exceeds maxEnter if maxEnter is provided', async function (assert) {
await render(
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub maxEnter=this.maxEnter}}></div>`
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub maxEnter=this.maxEnter}}></div>`,
);

for (let i = 0; i < this.maxEnter + 1; i++) {
Expand All @@ -82,7 +82,7 @@ module(

test('Did intersect mock triggers onExit never exceeds maxExit if maxExit is provided', async function (assert) {
await render(
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub maxExit=this.maxExit}}></div>`
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub maxExit=this.maxExit}}></div>`,
);

for (let i = 0; i < this.maxExit + 1; i++) {
Expand All @@ -94,7 +94,7 @@ module(

test('Did intersect mock fire without limit if maxEnter and maxExit is not provided', async function (assert) {
await render(
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub}}></div>`
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub}}></div>`,
);

const numOfFiredCallback = this.maxEnter + this.maxExit;
Expand All @@ -107,13 +107,13 @@ module(
assert.strictEqual(
this.enterStub.callCount,
numOfFiredCallback,
'Enter callback has fired more than maxEnter times'
'Enter callback has fired more than maxEnter times',
);
assert.strictEqual(
this.exitStub.callCount,
numOfFiredCallback,
'Exit callback has fired more than maxExit times'
'Exit callback has fired more than maxExit times',
);
});
}
},
);
Loading

0 comments on commit 8b4cfd9

Please sign in to comment.