kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: bugs/4641 flaky test (#6047)

Browse Source 
* fix: flaky bugs/4641 test

* fix: apply isFunc check for security.getIn
This commit is contained in:
Tim Lai
2020-06-01 14:23:51 -07:00
committed by GitHub
parent b9b32c9c93
commit a371ba1ca9
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/plugins/auth/reducers.js
View File

@@ -1,5 +1,5 @@
import { fromJS, Map } from "immutable" import { fromJS, Map } from "immutable"
import { btoa } from "core/utils" import { btoa, isFunc } from "core/utils"
import { import {
SHOW_AUTH_POPUP, SHOW_AUTH_POPUP,
@@ -20,6 +20,9 @@ export default {
// refactor withMutations // refactor withMutations
securities.entrySeq().forEach( ([ key, security ]) => { securities.entrySeq().forEach( ([ key, security ]) => {
if (!isFunc(security.getIn)) {
return state.set("authorized", map)
}
let type = security.getIn(["schema", "type"]) let type = security.getIn(["schema", "type"])
if ( type === "apiKey" || type === "http" ) { if ( type === "apiKey" || type === "http" ) {

15
test/e2e-cypress/tests/bugs/4641.js
View File

@@ -1,10 +1,8 @@
const clickTryItOutAndExecute = () => { const clickTryItOutAndExecute = () => {
return cy return cy
.get(".opblock-summary") .get(".btn.try-out__btn") // expand "try it out"
.click() .click()
.get(".try-out > .btn") // expand "try it out" .get(".btn.execute") // execute request
.click()
.get(".execute-wrapper > .btn") // excecute request
.click() .click()
} }
@@ -44,7 +42,8 @@ describe("#4641: The Logout button in Authorize popup not clearing API Key", ()
.within(fillInApiKeyAndAuthorise("my_api_key")) .within(fillInApiKeyAndAuthorise("my_api_key"))
.get(".close-modal") // close authorise popup button .get(".close-modal") // close authorise popup button
.click() .click()
.get("#operations-default-get_4641_1") // expand the route details .get("#operations-default-get_4641_1") // expand the route details onClick
.click()
.within(clickTryItOutAndExecute) .within(clickTryItOutAndExecute)
.get("@request") .get("@request")
.its("request") .its("request")
@@ -64,7 +63,8 @@ describe("#4641: The Logout button in Authorize popup not clearing API Key", ()
.within(clickLogoutAndReauthorise) .within(clickLogoutAndReauthorise)
.get(".close-modal") // close authorise popup button .get(".close-modal") // close authorise popup button
.click() .click()
.get("#operations-default-get_4641_1") // expand the route details .get("#operations-default-get_4641_1") // expand the route details onClick
.click()
.within(clickTryItOutAndExecute) .within(clickTryItOutAndExecute)
.get("@request") .get("@request")
.its("request") .its("request")
@@ -86,7 +86,8 @@ describe("#4641: The Logout button in Authorize popup not clearing API Key", ()
.within(clickLogoutAndReauthorise) .within(clickLogoutAndReauthorise)
.get(".close-modal") // close authorise popup button .get(".close-modal") // close authorise popup button
.click() .click()
.get("#operations-default-get_4641_2") // expand the route details .get("#operations-default-get_4641_2") // expand the route details onClick
.click()
.within(clickTryItOutAndExecute) .within(clickTryItOutAndExecute)
.get("@request") .get("@request")
.its("request") .its("request")