Rebase

index.js

@@ -44,7 +44,6 @@ module.exports = {
  'ava/prefer-async-await': 'error',
  'ava/prefer-power-assert': 'off',
  'ava/prefer-t-regex': 'error',
- 'ava/prevent-errortype': 'error',
  'ava/test-ended': 'error',
  'ava/test-title': 'error',
  'ava/test-title-format': 'off',

rules/no-error-ctor-with-notthrows.js

@@ -11,17 +11,16 @@ const create = context => {
  ava.isInTestFile,
  ava.isInTestNode
  ])(node => {
-
  const functionArgIndex = node.arguments.length - 1;
 
- if (typeof node.callee.property === 'undefined' || functionArgIndex !== 1 || node.callee.type !== 'MemberExpression' || node.arguments[1].type !== 'Identifier') {
+ if (typeof node.callee.property === 'undefined' || functionArgIndex !== 1 || node.callee.type !== 'MemberExpression' || node.arguments[1].type !== 'Identifier' || util.getNameOfRootNodeObject(node.callee) !== 't') {
  return;
  }
 
  const calleeProperty = node.callee.property.name;
  const functionArgName = node.arguments[1].name;
  if (calleeProperty === 'notThrows' || calleeProperty === 'notThrowsAsync') {
- if (functionArgName.endsWith("Error")) {
+ if (functionArgName.endsWith('Error')) {
  context.report({
  node,
  message: `Do not specify an error constructor in the second argument of \`t.${calleeProperty}()\``

test/no-error-ctor-with-notthrows.js

@@ -5,6 +5,9 @@ import rule from '../rules/no-error-ctor-with-notthrows';
 const ruleTester = avaRuleTester(test, {
  env: {
  es6: true
+ },
+ parserOptions: {
+ ecmaVersion: 2019
  }
 });
 
@@ -81,19 +84,27 @@ ruleTester.run('no-error-ctor-with-notthrows', rule, {
  }, {firstName:'some', lastName: 'object'});
  });`,
 
+ `${header}
+ test('some test',t => {
+ notThrows(foo);
+ });`,
+
+ `${header}
+ test('some test',t => {
+ myCustomNotThrows.notThrows(foo);
+ });`,
+
+ `${header}
+ t.notThrows(() => {
+ t.pass();
+ }, void 0);`,
+
  // Shouldn't be triggered since it's not a test file
  `test('some test',t => {
  t.notThrowsAsync(() => {
  t.pass();
  }, TypeError);
- });`,
- {
- code: `const { notThrows } = require("./my-custom-not-throws")
- ${header}
- test('some test',t => {
- notThrows(foo);
- });`
- },
+ });`
  ],
  invalid: [
  {
@@ -185,6 +196,15 @@ ruleTester.run('no-error-ctor-with-notthrows', rule, {
  }, SystemError);
  });`,
  errors
+ },
+ {
+ code: `${header}
+ test('some test',t => {
+ t.notThrowsAsync(() => {
+ t.pass();
+ }, $DOMError);
+ });`,
+ errors
  }
  ]
 });