From 6154396e06e832d19ed1968d2295afa092909e8e Mon Sep 17 00:00:00 2001
From: Oliwia Rogala <oliwia.rogala@smartbear.com>
Date: Fri, 1 Mar 2024 13:50:04 +0100
Subject: [PATCH] fix: fix regression in definition resolution (#9658)

Refs https://github.com/swagger-api/swagger-js/issues/3385
Refs #9645
---
 package-lock.json                                      |  8 ++++----
 package.json                                           |  2 +-
 .../e2e/features/plugins/oas3/complex-spec.cy.js       | 10 +++-------
 .../static/documents/features/oas3-complex-spec.json   |  3 ---
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d7b90be0..b04c5889 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,7 +41,7 @@
         "reselect": "^5.1.0",
         "serialize-error": "^8.1.0",
         "sha.js": "^2.4.11",
-        "swagger-client": "^3.25.3",
+        "swagger-client": "^3.25.4",
         "url-parse": "^1.5.10",
         "xml": "=1.0.1",
         "xml-but-prettier": "^1.0.1",
@@ -27228,9 +27228,9 @@
       }
     },
     "node_modules/swagger-client": {
-      "version": "3.25.3",
-      "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.25.3.tgz",
-      "integrity": "sha512-DUQ1zBgs+SDRTL+w2F2KDoneA9rkwpq9oF2Gex0HzGdlWP/4mEClFgp6ulMgcdSS2mC+B7thnvuT6aF1AwKbqw==",
+      "version": "3.25.4",
+      "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.25.4.tgz",
+      "integrity": "sha512-pq9Zs6yf6Giy5JLnkUSeH+y1AQrhomDCkmVYpMY5Rkx6u70jnyiuRWwkGW6cgsPY+/8N38jRGieoWzJYPPGIuA==",
       "dependencies": {
         "@babel/runtime-corejs3": "^7.22.15",
         "@swagger-api/apidom-core": ">=0.90.0 <1.0.0",
diff --git a/package.json b/package.json
index fdfa5d84..46141900 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "reselect": "^5.1.0",
     "serialize-error": "^8.1.0",
     "sha.js": "^2.4.11",
-    "swagger-client": "^3.25.3",
+    "swagger-client": "^3.25.4",
     "url-parse": "^1.5.10",
     "xml": "=1.0.1",
     "xml-but-prettier": "^1.0.1",
diff --git a/test/e2e-cypress/e2e/features/plugins/oas3/complex-spec.cy.js b/test/e2e-cypress/e2e/features/plugins/oas3/complex-spec.cy.js
index c0b069ea..b70c9905 100644
--- a/test/e2e-cypress/e2e/features/plugins/oas3/complex-spec.cy.js
+++ b/test/e2e-cypress/e2e/features/plugins/oas3/complex-spec.cy.js
@@ -18,19 +18,15 @@ describe("OpenAPI 3.0 complex spec with allOf and nested references", () => {
       cy.get("@scenarioSiblings")
         .find("span")
         .contains("scenarioID")
-        .should("not.exist")
+        .should("exist")
       cy.get("@scenarioSiblings")
         .find("span")
-        .contains("Scenarios (for create)")
+        .contains("Studies (for create)")
         .should("exist")
         .click()
       cy.get("@scenarioSiblings")
         .find("span")
-        .contains("scenarioID")
-        .should("exist")
-      cy.get("@scenarioSiblings")
-        .find("span")
-        .contains("#/components/schemas/unresolvedRef")
+        .contains("studyPhase")
         .should("exist")
     })
   })
diff --git a/test/e2e-cypress/static/documents/features/oas3-complex-spec.json b/test/e2e-cypress/static/documents/features/oas3-complex-spec.json
index 6a4968f8..3ce13bc8 100644
--- a/test/e2e-cypress/static/documents/features/oas3-complex-spec.json
+++ b/test/e2e-cypress/static/documents/features/oas3-complex-spec.json
@@ -62193,9 +62193,6 @@
               "allOf": [
                 {
                   "$ref": "#/components/schemas/com.sap.ctsm.backend.core.api.study.v1.StudyAPIv1.Scenarios-create"
-                },
-                {
-                  "$ref": "#/components/schemas/unresolvedRef"
                 }
               ],
               "nullable": true