From 8174cd7c7a31770a494956d4fed064025fdc030f Mon Sep 17 00:00:00 2001
From: rhymes <github@rhymes.dev>
Date: Fri, 4 Jun 2021 16:25:10 +0200
Subject: [PATCH] Fix flakey test in articleFlows/pinArticle (#13913)

* Fix flakey test in articleFlows/pinArticle

* Add other interaction guards
---
 .../articleFlows/pinArticle.spec.js           | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/cypress/integration/articleFlows/pinArticle.spec.js b/cypress/integration/articleFlows/pinArticle.spec.js
index d8fd54f9b..386c256d2 100644
--- a/cypress/integration/articleFlows/pinArticle.spec.js
+++ b/cypress/integration/articleFlows/pinArticle.spec.js
@@ -131,7 +131,6 @@ describe('Pin an article - Admin User', () => {
     });
 
     cy.findByRole('heading', { name: 'Tools:' });
-
     cy.findByRole('main')
       .findAllByRole('link', { name: 'Delete' })
       .first()
@@ -140,14 +139,11 @@ describe('Pin an article - Admin User', () => {
     cy.findByRole('heading', {
       name: 'Are you sure you want to delete this article?',
     });
-
     cy.findByRole('main')
       .findAllByRole('button', { name: 'Delete' })
       .first()
       .click();
 
-    cy.visit('/');
-
     cy.createArticle({
       title: 'Another Article',
       tags: ['beginner', 'ruby', 'go'],
@@ -157,6 +153,7 @@ describe('Pin an article - Admin User', () => {
       cy.visit(response.body.current_state_path);
     });
 
+    cy.findByRole('heading', { name: 'Another Article' });
     cy.findByRole('main')
       .findAllByRole('button', { name: 'Pin Post' })
       .first()
@@ -166,19 +163,10 @@ describe('Pin an article - Admin User', () => {
   it('should allow to pin another post after the current pinned post is unpublished', () => {
     cy.findByRole('main').within(() => {
       cy.findAllByRole('button', { name: 'Pin Post' }).first().click();
-      cy.findAllByRole('link', { name: 'Manage' }).first().click();
+      cy.findAllByRole('link', { name: 'Edit' }).first().click();
     });
 
-    cy.findByRole('main')
-      .findAllByRole('link', { name: 'Delete' })
-      .first()
-      .click();
-
-    cy.findByRole('main')
-      .findAllByRole('link', { name: 'Unpublish' })
-      .first()
-      .click();
-
+    cy.findByRole('form', { name: 'Edit post' });
     cy.findByRole('main').within(() => {
       cy.findAllByTitle(/^Post options$/i)
         .first()
@@ -186,6 +174,7 @@ describe('Pin an article - Admin User', () => {
       cy.findAllByRole('button', { name: 'Unpublish post' }).first().click();
     });
 
+    cy.findByRole('heading', { name: 'Test Article' });
     cy.createArticle({
       title: 'Another Article',
       tags: ['beginner', 'ruby', 'go'],
@@ -195,6 +184,7 @@ describe('Pin an article - Admin User', () => {
       cy.visit(response.body.current_state_path);
     });
 
+    cy.findByRole('heading', { name: 'Another Article' });
     cy.findByRole('main')
       .findAllByRole('button', { name: 'Pin Post' })
       .first()