From 7af86c6f662ab05ba981160db03f234cdd770a69 Mon Sep 17 00:00:00 2001
From: Simeon Widdis <sawiddis@amazon.com>
Date: Mon, 6 May 2024 10:58:54 -0700
Subject: [PATCH 1/4] Replace refresh with wait for creation
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
---
.../6_notebooks.spec.js | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/cypress/integration/plugins/observability-dashboards/6_notebooks.spec.js b/cypress/integration/plugins/observability-dashboards/6_notebooks.spec.js
index 005b219b9..6d3986f5b 100644
--- a/cypress/integration/plugins/observability-dashboards/6_notebooks.spec.js
+++ b/cypress/integration/plugins/observability-dashboards/6_notebooks.spec.js
@@ -33,22 +33,7 @@ const makeTestNotebook = () => {
cy.get('input[data-test-subj="custom-input-modal-input"]').type(notebookName);
cy.get('button[data-test-subj="custom-input-modal-confirm-button"]').click();
- // Force refresh the observablity index and reload page to load notebooks.
- cy.request({
- method: 'POST',
- failOnStatusCode: false,
- form: false,
- url: 'api/console/proxy',
- headers: {
- 'content-type': 'application/json;charset=UTF-8',
- 'osd-xsrf': true,
- },
- qs: {
- path: `${OBSERVABILITY_INDEX_NAME}/_refresh`,
- method: 'POST',
- },
- });
- cy.reload();
+ cy.contains(`Notebook "${notebookName}" successfully created`);
cy.get('h1[data-test-subj="notebookTitle"]')
.contains(notebookName)
From d6f0790b7e5a0c2c6d9edfebd5379f69a4d194c3 Mon Sep 17 00:00:00 2001
From: Simeon Widdis <sawiddis@amazon.com>
Date: Mon, 6 May 2024 11:13:42 -0700
Subject: [PATCH 2/4] Remove unused variable
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
---
.../plugins/observability-dashboards/6_notebooks.spec.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/cypress/integration/plugins/observability-dashboards/6_notebooks.spec.js b/cypress/integration/plugins/observability-dashboards/6_notebooks.spec.js
index 6d3986f5b..c4f0bd896 100644
--- a/cypress/integration/plugins/observability-dashboards/6_notebooks.spec.js
+++ b/cypress/integration/plugins/observability-dashboards/6_notebooks.spec.js
@@ -10,7 +10,6 @@ import {
BASE_PATH,
delayTime,
MARKDOWN_TEXT,
- OBSERVABILITY_INDEX_NAME,
} from '../../../utils/constants';
import { skipOn } from '@cypress/skip-test';
From 6dca5a7ed773b0ba57f0b12f14ee78c80682c87c Mon Sep 17 00:00:00 2001
From: Simeon Widdis <sawiddis@amazon.com>
Date: Mon, 6 May 2024 11:30:23 -0700
Subject: [PATCH 3/4] Re-add refresh/reload with issue ref
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
---
.../6_notebooks.spec.js | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/cypress/integration/plugins/observability-dashboards/6_notebooks.spec.js b/cypress/integration/plugins/observability-dashboards/6_notebooks.spec.js
index c4f0bd896..1c017cfd4 100644
--- a/cypress/integration/plugins/observability-dashboards/6_notebooks.spec.js
+++ b/cypress/integration/plugins/observability-dashboards/6_notebooks.spec.js
@@ -10,6 +10,7 @@ import {
BASE_PATH,
delayTime,
MARKDOWN_TEXT,
+ OBSERVABILITY_INDEX_NAME,
} from '../../../utils/constants';
import { skipOn } from '@cypress/skip-test';
@@ -34,6 +35,25 @@ const makeTestNotebook = () => {
cy.contains(`Notebook "${notebookName}" successfully created`);
+ // Force refresh/reload due to concurrency bug:
+ // https://github.com/opensearch-project/dashboards-observability/issues/1822
+ // TODO delete the refresh/reload when the issue is closed
+ cy.request({
+ method: 'POST',
+ failOnStatusCode: false,
+ form: false,
+ url: 'api/console/proxy',
+ headers: {
+ 'content-type': 'application/json;charset=UTF-8',
+ 'osd-xsrf': true,
+ },
+ qs: {
+ path: `${OBSERVABILITY_INDEX_NAME}/_refresh`,
+ method: 'POST',
+ },
+ });
+ cy.reload();
+
cy.get('h1[data-test-subj="notebookTitle"]')
.contains(notebookName)
.should('exist');
From 10580dc693055903be029c5a48cb4fc8028a233b Mon Sep 17 00:00:00 2001
From: Simeon Widdis <sawiddis@amazon.com>
Date: Mon, 6 May 2024 14:22:03 -0700
Subject: [PATCH 4/4] Revert "Re-add refresh/reload with issue ref"
This reverts commit 6dca5a7ed773b0ba57f0b12f14ee78c80682c87c.
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
---
.../6_notebooks.spec.js | 20 -------------------
1 file changed, 20 deletions(-)
diff --git a/cypress/integration/plugins/observability-dashboards/6_notebooks.spec.js b/cypress/integration/plugins/observability-dashboards/6_notebooks.spec.js
index 1c017cfd4..c4f0bd896 100644
--- a/cypress/integration/plugins/observability-dashboards/6_notebooks.spec.js
+++ b/cypress/integration/plugins/observability-dashboards/6_notebooks.spec.js
@@ -10,7 +10,6 @@ import {
BASE_PATH,
delayTime,
MARKDOWN_TEXT,
- OBSERVABILITY_INDEX_NAME,
} from '../../../utils/constants';
import { skipOn } from '@cypress/skip-test';
@@ -35,25 +34,6 @@ const makeTestNotebook = () => {
cy.contains(`Notebook "${notebookName}" successfully created`);
- // Force refresh/reload due to concurrency bug:
- // https://github.com/opensearch-project/dashboards-observability/issues/1822
- // TODO delete the refresh/reload when the issue is closed
- cy.request({
- method: 'POST',
- failOnStatusCode: false,
- form: false,
- url: 'api/console/proxy',
- headers: {
- 'content-type': 'application/json;charset=UTF-8',
- 'osd-xsrf': true,
- },
- qs: {
- path: `${OBSERVABILITY_INDEX_NAME}/_refresh`,
- method: 'POST',
- },
- });
- cy.reload();
-
cy.get('h1[data-test-subj="notebookTitle"]')
.contains(notebookName)
.should('exist');