Skip to content

Commit e0320b5

Browse files
Merge pull request #2541 from johanrd/issue/2339-array-extensions-mirage
[BUGFIX legacy]: Broaden mirage.js `findBy` exclusion in `no-array-prototype-extensions`
2 parents 9a6e7cb + 721eb82 commit e0320b5

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

lib/rules/no-array-prototype-extensions.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ const KNOWN_NON_ARRAY_FUNCTION_CALLS = new Set([
9393
* Ignore these function calls using RegExps.
9494
*/
9595
const KNOWN_NON_ARRAY_FUNCTION_CALLS_REGEXP = new Set([
96-
// ember-cli-mirage
97-
/\.server\.schema\.(.*)\.findBy\(\)/,
96+
// ember-cli-mirage: server.schema.X.findBy(), schema.X.findBy(), server.X.findBy(), server.db.X.findBy()
97+
/(^|\.)(server|schema)\b.*\.findBy\(\)/,
9898
]);
9999

100100
/**

tests/lib/rules/no-array-prototype-extensions.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,10 @@ ruleTester.run('no-array-prototype-extensions', rule, {
253253
'this.server.schema.devices.findBy()',
254254
'this.server.schema.users.findBy({ foo: "bar" })',
255255
'this.server.schema.devices.findBy({ foo: "bar" })',
256+
'server.schema.users.findBy({ email: "[email protected]" })',
257+
'schema.users.findBy({ email: "[email protected]" })',
258+
'server.users.findBy({ email: "[email protected]" })',
259+
'server.db.users.findBy({ email: "[email protected]" })',
256260
],
257261
invalid: [
258262
{

0 commit comments

Comments
 (0)