fix: Merge conflicts

SAP · Dec 10, 2024 · 5d87eb5 · 5d87eb5
1 parent 48c2c58
commit 5d87eb5
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 7 deletions.
diff --git a/test/lib/linter/rules/snapshots/NoDeprecatedApi.ts.snap b/test/lib/linter/rules/snapshots/NoDeprecatedApi.ts.snap
diff --git a/test/lib/linter/snapshots/linter.ts.md b/test/lib/linter/snapshots/linter.ts.md
@@ -1339,7 +1339,7 @@ Generated by [AVA](https://avajs.dev).
       },
       {
         coverageInfo: [],
-        errorCount: 0,
+        errorCount: 1,
         fatalErrorCount: 0,
         filePath: 'webapp/test/integration/opaTests.qunit.html',
         messages: [
@@ -1350,6 +1350,13 @@ Generated by [AVA](https://avajs.dev).
             ruleId: 'no-deprecated-api',
             severity: 1,
           },
+          {
+            column: 4,
+            line: 17,
+            message: 'Bootstrap parameter \'data-sap-ui-animation\' should be replaced with data-sap-ui-animation-mode',
+            ruleId: 'no-deprecated-api',
+            severity: 2,
+          },
           {
             column: 4,
             line: 18,

diff --git a/test/lib/snapshots/index.ts.md b/test/lib/snapshots/index.ts.md
@@ -233,7 +233,7 @@ Generated by [AVA](https://avajs.dev).
       },
       {
         coverageInfo: [],
-        errorCount: 0,
+        errorCount: 1,
         fatalErrorCount: 0,
         filePath: 'webapp/test/integration/opaTests.qunit.html',
         messages: [
@@ -244,6 +244,13 @@ Generated by [AVA](https://avajs.dev).
             ruleId: 'no-deprecated-api',
             severity: 1,
           },
+          {
+            column: 4,
+            line: 17,
+            message: 'Bootstrap parameter \'data-sap-ui-animation\' should be replaced with data-sap-ui-animation-mode',
+            ruleId: 'no-deprecated-api',
+            severity: 2,
+          },
           {
             column: 4,
             line: 18,
@@ -637,7 +644,7 @@ Generated by [AVA](https://avajs.dev).
       },
       {
         coverageInfo: [],
-        errorCount: 0,
+        errorCount: 1,
         fatalErrorCount: 0,
         filePath: 'webapp/test/integration/opaTests.qunit.html',
         messages: [
@@ -648,6 +655,13 @@ Generated by [AVA](https://avajs.dev).
             ruleId: 'no-deprecated-api',
             severity: 1,
           },
+          {
+            column: 4,
+            line: 17,
+            message: 'Bootstrap parameter \'data-sap-ui-animation\' should be replaced with data-sap-ui-animation-mode',
+            ruleId: 'no-deprecated-api',
+            severity: 2,
+          },
           {
             column: 4,
             line: 18,
@@ -1114,7 +1128,7 @@ Generated by [AVA](https://avajs.dev).
       },
       {
         coverageInfo: [],
-        errorCount: 0,
+        errorCount: 1,
         fatalErrorCount: 0,
         filePath: 'webapp/test/integration/opaTests.qunit.html',
         messages: [
@@ -1125,6 +1139,14 @@ Generated by [AVA](https://avajs.dev).
             ruleId: 'no-deprecated-api',
             severity: 1,
           },
+          {
+            column: 4,
+            line: 17,
+            message: 'Bootstrap parameter \'data-sap-ui-animation\' should be replaced with data-sap-ui-animation-mode',
+            messageDetails: 'Migrate to \'data-sap-ui-animation-mode\' attribute AnimationMode (https://ui5.sap.com/1.120/#/api/module:sap/ui/core/AnimationMode)',
+            ruleId: 'no-deprecated-api',
+            severity: 2,
+          },
           {
             column: 4,
             line: 18,
@@ -1645,7 +1667,7 @@ Generated by [AVA](https://avajs.dev).
       },
       {
         coverageInfo: [],
-        errorCount: 0,
+        errorCount: 1,
         fatalErrorCount: 0,
         filePath: 'webapp/test/integration/opaTests.qunit.html',
         messages: [
@@ -1656,6 +1678,13 @@ Generated by [AVA](https://avajs.dev).
             ruleId: 'no-deprecated-api',
             severity: 1,
           },
+          {
+            column: 4,
+            line: 17,
+            message: 'Bootstrap parameter \'data-sap-ui-animation\' should be replaced with data-sap-ui-animation-mode',
+            ruleId: 'no-deprecated-api',
+            severity: 2,
+          },
           {
             column: 4,
             line: 18,
@@ -2049,7 +2078,7 @@ Generated by [AVA](https://avajs.dev).
       },
       {
         coverageInfo: [],
-        errorCount: 0,
+        errorCount: 1,
         fatalErrorCount: 0,
         filePath: 'webapp/test/integration/opaTests.qunit.html',
         messages: [
@@ -2060,6 +2089,13 @@ Generated by [AVA](https://avajs.dev).
             ruleId: 'no-deprecated-api',
             severity: 1,
           },
+          {
+            column: 4,
+            line: 17,
+            message: 'Bootstrap parameter \'data-sap-ui-animation\' should be replaced with data-sap-ui-animation-mode',
+            ruleId: 'no-deprecated-api',
+            severity: 2,
+          },
           {
             column: 4,
             line: 18,
@@ -2453,7 +2489,7 @@ Generated by [AVA](https://avajs.dev).
       },
       {
         coverageInfo: [],
-        errorCount: 0,
+        errorCount: 1,
         fatalErrorCount: 0,
         filePath: 'webapp/test/integration/opaTests.qunit.html',
         messages: [
@@ -2464,6 +2500,13 @@ Generated by [AVA](https://avajs.dev).
             ruleId: 'no-deprecated-api',
             severity: 1,
           },
+          {
+            column: 4,
+            line: 17,
+            message: 'Bootstrap parameter \'data-sap-ui-animation\' should be replaced with data-sap-ui-animation-mode',
+            ruleId: 'no-deprecated-api',
+            severity: 2,
+          },
           {
             column: 4,
             line: 18,

diff --git a/test/lib/snapshots/index.ts.snap b/test/lib/snapshots/index.ts.snap