Skip to content

Commit 8ff3b0a

Browse files
authored
Enhance cypress tests durability (#1553)
1. Weaken error messages checks. They are platform-dependent and cause test failure in docker. 2. Fix server-details.spec.js interfering with other tests.
1 parent c66eea2 commit 8ff3b0a

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

webui/cypress/integration/disable-server.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ describe('Disable server', () => {
120120
.find('.meta-test__ReplicasetServerListItem__dropdownBtn').click();
121121
cy.get('.meta-test__ReplicasetServerListItem__dropdown *').contains('Enable server').click();
122122
cy.get('span:contains(Disabled state setting error) +' +
123-
'span:contains(NetboxCallError: "localhost:13302": Connection refused)').click();
123+
'span:contains(NetboxCallError: "localhost:13302":)').click();
124124
cy.get('.ServerLabelsHighlightingArea:contains(dummy-2)')
125125
.should('have.css', 'background-color', 'rgb(250, 250, 250)');
126126

@@ -131,7 +131,7 @@ describe('Disable server', () => {
131131
cy.get('.meta-test__ServerDetailsModal .meta-test__ReplicasetServerListItem__dropdownBtn').click();
132132
cy.get('.meta-test__ReplicasetServerListItem__dropdown div').contains('Enable server').click();
133133
cy.get('span:contains(Disabled state setting error) +' +
134-
'span:contains(NetboxCallError: "localhost:13303": Connection refused)').click();
134+
'span:contains(NetboxCallError: "localhost:13303":)').click();
135135
cy.get('.meta-test__ServerDetailsModal span:contains(Disabled)').should('exist');
136136
cy.get('.meta-test__ServerDetailsModal button').contains('Close').click();
137137

webui/cypress/integration/server-details.spec.js

+9-4
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,12 @@ describe('Server details', () => {
144144
////////////////////////////////////////////////////////////////////
145145
cy.log('Dead server');
146146
////////////////////////////////////////////////////////////////////
147-
cy.task('tarantool', { code: `_G.cluster:server('dummy-2').process:kill('KILL')` });
147+
cy.task('tarantool', {
148+
code: `
149+
_G.cluster:server('dummy-2').process:kill('KILL')
150+
_G.cluster:server('dummy-2').process = nil
151+
`
152+
});
148153

149154
cy.get('.ServerLabelsHighlightingArea').contains('dummy-2')
150155
.closest('li').should('contain', 'Server status is "dead"');
@@ -154,15 +159,15 @@ describe('Server details', () => {
154159

155160
cy.get('div').contains('Mordor').should('exist');
156161
cy.get('.meta-test__ZoneListItem').contains('Mordor').click();
157-
cy.get('span:contains(NetboxCallError: "localhost:13302": Connection refused)').click();
162+
cy.get('span:contains(NetboxCallError: "localhost:13302":)').click();
158163

159164
cy.get('.meta-test__ServerDetailsModal button:contains(Zone Mordor)').click();
160165
cy.get('button:contains(Add new zone)').click();
161166
cy.get('.ZoneAddModal input[name="zone_name"]')
162167
.should('be.focused')
163168
.type('Moscow');
164169
cy.get('.meta-test__ZoneAddSubmitBtn').click();
165-
cy.get('.ZoneAddModal_error').find('span:contains("localhost:13302": Connection refused)');
170+
cy.get('.ZoneAddModal_error').find('span:contains("localhost:13302":)');
166171
cy.get('h2:contains(Add name of zone)').next().click();
167172
cy.get('.ZoneAddModal').should('not.exist');
168173

@@ -187,7 +192,7 @@ describe('Server details', () => {
187192
.click();
188193
cy.get('.meta-test__ReplicasetServerListItem__dropdown div')
189194
.contains('Enable server').click();
190-
cy.get('span:contains(NetboxCallError: "localhost:13302": Connection refused)')
195+
cy.get('span:contains(NetboxCallError: "localhost:13302":)')
191196
.click();
192197
cy.get('.meta-test__ServerDetailsModal span:contains(Disabled)').should('exist');
193198
cy.get('.meta-test__ServerDetailsModal button').contains('Close').click();

0 commit comments

Comments
 (0)