merge conflict

dequelabs · Feb 13, 2025 · 46956d6 · 46956d6
2 parents 5d298cb + e7c9735
commit 46956d6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-* @dequelabs/axe-api-team
+* @dequelabs/ocarina-team
diff --git a/src/linter.test.ts b/src/linter.test.ts
@@ -124,7 +124,7 @@ describe('linter', () => {
 
       // Verify error reporting
       assert.isTrue(
-        errorStub.calledWith('test-rule-1 - Test error 1', {
+        errorStub.calledWith('test.js:1 - test-rule-1 - Test error 1', {
           file: 'test.js',
           startLine: 1,
           startColumn: 1,
@@ -135,7 +135,7 @@ describe('linter', () => {
       )
 
       assert.isTrue(
-        errorStub.calledWith('test-rule-2 - Test error 2', {
+        errorStub.calledWith('test.html:1 - test-rule-2 - Test error 2', {
           file: 'test.html',
           startLine: 1,
           startColumn: 1,
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		* @dequelabs/axe-api-team
		* @dequelabs/ocarina-team