Skip to content

Commit 4f2791f

Browse files
author
Ritvi Bhatt
committed
change time format test to match 1.2
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>
1 parent 7261835 commit 4f2791f

File tree

4 files changed

+37
-42
lines changed

4 files changed

+37
-42
lines changed

.github/workflows/cypress-workflow-bundle-snapshot-based.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ jobs:
5555
- name: Get Cypress version
5656
id: cypress_version
5757
run: |
58-
cypress_version_temp=$(cat ./monetery-test/package.json | jq -r '.devDependencies.cypress')
59-
echo "cypress_version=$cypress_version_temp" >> $GITHUB_ENV
58+
echo "::set-output name=cypress_version::$(cat ./monetery-test/package.json | jq '.devDependencies.cypress' | tr -d '"')"
6059
- name: Cache Cypress
6160
id: cache-cypress
6261
uses: actions/cache@v1

.github/workflows/cypress-workflow-plugins-bundle-snapshot-based.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ jobs:
5555
- name: Get Cypress version
5656
id: cypress_version
5757
run: |
58-
cypress_version_temp=$(cat ./monetery-test/package.json | jq -r '.devDependencies.cypress')
59-
echo "cypress_version=$cypress_version_temp" >> $GITHUB_ENV
58+
echo "::set-output name=cypress_version::$(cat ./monetery-test/package.json | jq '.devDependencies.cypress' | tr -d '"')"
6059
- name: Cache Cypress
6160
id: cache-cypress
6261
uses: actions/cache@v1

.github/workflows/cypress-workflow-vanilla-snapshot-based.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ jobs:
5353
- name: Get Cypress version
5454
id: cypress_version
5555
run: |
56-
cypress_version_temp=$(cat ./monetery-test/package.json | jq -r '.devDependencies.cypress')
57-
echo "cypress_version=$cypress_version_temp" >> $GITHUB_ENV
56+
echo "::set-output name=cypress_version::$(cat ./monterey-test/package.json | jq '.devDependencies.cypress' | tr -d '"')"
5857
- name: Cache Cypress
5958
id: cache-cypress
6059
uses: actions/cache@v1

cypress/integration/plugins/gantt-chart-dashboards/gantt_ui.spec.js

+34-36
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
/// <reference types="cypress" />
77

88
import { BASE_PATH } from '../../../utils/constants';
9+
import moment from 'moment';
910

1011
const delay = 100;
1112
const GANTT_VIS_NAME =
@@ -169,70 +170,67 @@ describe('Configure panel settings', () => {
169170
});
170171

171172
it('Changes time formats', () => {
172-
cy.intercept('**').as('timeRequest');
173173
cy.get('select').eq(3).select('MM/DD hh:mm:ss A');
174+
cy.wait(delay);
174175
cy.get('.euiButton__text').contains('Update').click({ force: true });
175-
cy.wait('@timeRequest');
176+
cy.wait(1000);
176177
cy.get('.xtick')
177178
.eq(0)
178-
.should((element) => {
179-
if (element) {
180-
const text = element.text();
181-
cy.log(text);
182-
expect(dayjs(text, 'MM/DD hh:mm:ss A', true).isValid()).to.be.true;
183-
}
179+
.invoke('text')
180+
.then((text) => {
181+
expect(
182+
moment(text, 'MM/DD hh:mm:ss A').format('MM/DD hh:mm:ss A')
183+
).equal(text);
184184
});
185185

186186
cy.get('select').eq(3).select('MM/DD/YY hh:mm A');
187+
cy.wait(delay);
187188
cy.get('.euiButton__text').contains('Update').click({ force: true });
188-
cy.wait('@timeRequest');
189+
cy.wait(1000);
189190
cy.get('.xtick')
190191
.eq(0)
191-
.should((element) => {
192-
if (element) {
193-
const text = element.text();
194-
cy.log(text);
195-
expect(dayjs(text, 'MM/DD/YY hh:mm A', true).isValid()).to.be.true;
196-
}
192+
.invoke('text')
193+
.then((text) => {
194+
expect(
195+
moment(text, 'MM/DD/YY hh:mm A').format('MM/DD/YY hh:mm A')
196+
).equal(text);
197197
});
198198

199199
cy.get('select').eq(3).select('HH:mm:ss.SSS');
200+
cy.wait(delay);
200201
cy.get('.euiButton__text').contains('Update').click({ force: true });
201-
cy.wait('@timeRequest');
202+
cy.wait(1000);
202203
cy.get('.xtick')
203204
.eq(0)
204-
.should((element) => {
205-
if (element) {
206-
const text = element.text();
207-
cy.log(text);
208-
expect(dayjs(text, 'HH:mm:ss.SSS', true).isValid()).to.be.true;
209-
}
205+
.invoke('text')
206+
.then((text) => {
207+
expect(moment(text, 'HH:mm:ss.SSS').format('HH:mm:ss.SSS')).equal(text);
210208
});
211209

212210
cy.get('select').eq(3).select('MM/DD HH:mm:ss');
211+
cy.wait(delay);
213212
cy.get('.euiButton__text').contains('Update').click({ force: true });
214-
cy.wait('@timeRequest');
213+
cy.wait(1000);
215214
cy.get('.xtick')
216215
.eq(0)
217-
.should((element) => {
218-
if (element) {
219-
const text = element.text();
220-
cy.log(text);
221-
expect(dayjs(text, 'MM/DD HH:mm:ss', true).isValid()).to.be.true;
222-
}
216+
.invoke('text')
217+
.then((text) => {
218+
expect(moment(text, 'MM/DD HH:mm:ss').format('MM/DD HH:mm:ss')).equal(
219+
text
220+
);
223221
});
224222

225223
cy.get('select').eq(3).select('MM/DD/YY HH:mm');
224+
cy.wait(delay);
226225
cy.get('.euiButton__text').contains('Update').click({ force: true });
227-
cy.wait('@timeRequest');
226+
cy.wait(1000);
228227
cy.get('.xtick')
229228
.eq(0)
230-
.should((element) => {
231-
if (element) {
232-
const text = element.text();
233-
cy.log(text);
234-
expect(dayjs(text, 'MM/DD/YY HH:mm', true).isValid()).to.be.true;
235-
}
229+
.invoke('text')
230+
.then((text) => {
231+
expect(moment(text, 'MM/DD/YY HH:mm').format('MM/DD/YY HH:mm')).equal(
232+
text
233+
);
236234
});
237235
});
238236

0 commit comments

Comments
 (0)