[TT-14358] Fix mock response fixtures in 5.8.0 branch (#6967)

### **User description**
<!-- Provide a general summary of your changes in the Title above -->

## Description

<!-- Describe your changes in detail -->

## Related Issue

<!-- This project only accepts pull requests related to open issues. -->
<!-- If suggesting a new feature or change, please discuss it in an
issue first. -->
<!-- If fixing a bug, there should be an issue describing it with steps
to reproduce. -->
<!-- OSS: Please link to the issue here. Tyk: please create/link the
JIRA ticket. -->
https://tyktech.atlassian.net/browse/TT-14358

## Motivation and Context

<!-- Why is this change required? What problem does it solve? -->

## How This Has Been Tested

<!-- Please describe in detail how you tested your changes -->
<!-- Include details of your testing environment, and the tests -->
<!-- you ran to see how your change affects other areas of the code,
etc. -->
<!-- This information is helpful for reviewers and QA. -->

## Screenshots (if appropriate)

## Types of changes

<!-- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] Refactoring or add test (improvements in base code or adds test
coverage to functionality)

## Checklist

<!-- Go over all the following points, and put an `x` in all the boxes
that apply -->
<!-- If there are no documentation updates required, mark the item as
checked. -->
<!-- Raise up any additional concerns not covered by the checklist. -->

- [ ] I ensured that the documentation is up to date
- [ ] I explained why this PR updates go.mod in detail with reasoning
why it's required
- [ ] I would like a code coverage CI quality gate exception and have
explained why


___

### **PR Type**
- Bug fix



___

### **Description**
- Removed legacy conflict markers in fixture file.

- Replaced <nil> mock response entries with structured YAML arrays.

- Updated multiple test fixture segments for proper API response
simulation.


___



### **Changes walkthrough** 📝
<table><thead><tr><th></th><th align="left">Relevant
files</th></tr></thead><tbody><tr><td><strong>Bug
fix</strong></td><td><table>
<tr>
  <td>
    <details>
<summary><strong>mock_response.yml</strong><dd><code>Update and
standardize mock response fixtures.</code>&nbsp; &nbsp; &nbsp; &nbsp;
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </dd></summary>
<hr>

apidef/oas/testdata/fixtures/mock_response.yml

<li>Cleared Git merge conflict markers.<br> <li> Replaced <nil> with
valid YAML mock response arrays.<br> <li> Standardized fixture
definitions for various test cases.


</details>


  </td>
<td><a
href="https://github.com/TykTechnologies/tyk/pull/6967/files#diff-c7c72a9398d68abedf9238cc2a9606521069e13034f921e7a979d859e0559c8d">+1/-46</a>&nbsp;
&nbsp; </td>

</tr>
</table></td></tr></tr></tbody></table>

___

> <details> <summary> Need help?</summary><li>Type <code>/help how to
...</code> in the comments thread for any questions about PR-Agent
usage.</li><li>Check out the <a
href="https://qodo-merge-docs.qodo.ai/usage-guide/">documentation</a>
for more information.</li></details>

---------

Co-authored-by: Andrei <[email protected]>

Author: edsonmichaque

.taskfiles/lint.yml

@@ -4,6 +4,13 @@ version: "3"
 vars:
   root:
     sh: git rev-parse --show-toplevel
+  branch_name:
+    sh: |
+      if [ -z "$BRANCH_NAME" ]; then
+        git rev-parse --abbrev-ref HEAD
+      else
+        echo $BRANCH_NAME
+      fi
 
 tasks:
   run:
@@ -12,7 +19,7 @@ tasks:
       - task: fmt
       - task: vet
       - task: check
-      - golangci-lint run --new-from-rev=origin/master --issues-exit-code=1 --fix ./...
+      - golangci-lint run --new-from-rev=origin/{{ .branch_name }} --issues-exit-code=1 --fix ./...
 
   fmt:
     desc: "Run typical code cleanup steps"
@@ -79,4 +86,4 @@ tasks:
     desc: "Lint x-tyk-gateway schema"
     dir: '{{.root}}'
     cmds:
-      - go test -count 1 -run=TestXTykGateway_Lint ./apidef/oas/
+      - go test -count 1 -run=TestXTykGateway_Lint ./apidef/oas/

apidef/oas/testdata/fixtures/mock_response.yml

@@ -33,20 +33,8 @@ tests:
         versions:
           "":
             extended_paths:
-<<<<<<< HEAD
               mock_response: <nil>
               white_list: <nil>
-=======
-              mock_response:
-                - disabled: false
-                  path: "/test"
-                  method: "GET"
-                  ignore_case: false
-                  code: 200
-                  headers:
-                    Content-Type: "application/json"
-                  body: '{"message": "success"}'
->>>>>>> 8d005fd5f... [TT-7306] [fix] Migrate Mock Response from Classic API Definition to OAS API Definition (#6914)
   - desc: "multiple methods on same path"
     source: oas
     input:
@@ -100,29 +88,8 @@ tests:
         versions:
           "":
             extended_paths:
-<<<<<<< HEAD
               mock_response: <nil>
               white_list: <nil>
-=======
-              mock_response:
-                - disabled: false
-                  path: "/test"
-                  method: "GET"
-                  ignore_case: false
-                  code: 200
-                  headers:
-                    Content-Type: "application/json"
-                  body: '{"status": "ok"}'
-                - disabled: false
-                  path: "/test"
-                  method: "POST"
-                  ignore_case: false
-                  code: 201
-                  headers:
-                    Content-Type: "application/json"
-                    Location: "/test/123"
-                  body: '{"id": "123"}'
->>>>>>> 8d005fd5f... [TT-7306] [fix] Migrate Mock Response from Classic API Definition to OAS API Definition (#6914)
   - desc: "disabled mock response"
     source: oas
     input:
@@ -155,20 +122,8 @@ tests:
         versions:
           "":
             extended_paths:
-<<<<<<< HEAD
               mock_response: <nil>
               white_list: <nil>
-=======
-              mock_response:
-                - disabled: true
-                  path: "/test"
-                  method: "GET"
-                  ignore_case: false
-                  code: 404
-                  headers:
-                    Content-Type: "application/json"
-                  body: '{"error": "not found"}'
->>>>>>> 8d005fd5f... [TT-7306] [fix] Migrate Mock Response from Classic API Definition to OAS API Definition (#6914)
   - desc: "basic mock response - classic"
     source: "classic"
     input:
@@ -430,4 +385,4 @@ tests:
                   - name: Content-Type
                     value: application/json
               ignoreAuthentication:
-                enabled: true
+                enabled: true