Skip to content
/ dsw-e2e-tests Public

Commit 7817a7a

Browse files
janslifkajanslifka
committed
Rework IDs
1 parent 25d098b commit 7817a7a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+542
-583
lines changed

‎cypress/e2e/document-template-editor/create.spec.js‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import * as documentTemplates from '../../support/document-templates-helpers'
2+
13
describe('Document Template Editor / Create', () => {
24
before(() => {
35
cy.putDefaultAppConfig()
@@ -28,19 +30,25 @@ describe('Document Template Editor / Create', () => {
2830
})
2931
cy.submitForm()
3032

31-
cy.url().should('contain', `/document-template-editors/dsw:${templateId}:1.0.0`)
33+
documentTemplates.getDocumentTemplateUuid(`dsw:${templateId}:1.0.0`).then(uuid => {
34+
cy.url().should('contain', `/document-template-editors/${uuid}`)
35+
})
3236

3337
cy.visitApp('/document-template-editors')
3438
cy.getListingItem(templateId).should('contain', name)
3539
})
3640

3741
it('can create from existing', () => {
38-
cy.visitApp('/document-templates/dsw:questionnaire-report:1.4.0')
42+
documentTemplates.getDocumentTemplateUuid('dsw:questionnaire-report:1.4.0').then(uuid => {
43+
cy.visitApp(`/document-templates/${uuid}`)
44+
})
3945
cy.clickDropdownAction('create-editor')
4046
cy.submitForm()
4147

4248
// it should be prefilled to next minor version
43-
cy.url().should('contain', `/document-template-editors/dsw:questionnaire-report:1.5.0`)
49+
documentTemplates.getDocumentTemplateUuid('dsw:questionnaire-report:1.5.0').then(uuid => {
50+
cy.url().should('contain', `/document-template-editors/${uuid}`)
51+
})
4452

4553
cy.visitApp('/document-template-editors')
4654
cy.getListingItem('questionnaire-report').should('contain', 'Questionnaire Report')

‎cypress/e2e/document-template-editor/editor/files.spec.js‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as editor from '../../../support/dt-editor-helpers'
1+
import * as dtEditor from '../../../support/dt-editor-helpers'
22

33
describe('Document Template Editor / Editor / Files', () => {
44
before(() => {
@@ -13,26 +13,24 @@ describe('Document Template Editor / Editor / Files', () => {
1313

1414
// create document template editor
1515
cy.loginAs('datasteward')
16-
cy.visitApp('/document-template-editors/create?selected=dsw:questionnaire-report:1.4.0&edit=true')
17-
cy.submitForm()
18-
cy.url().should('contain', '/document-template-editors/dsw:questionnaire-report:1.5.0')
16+
dtEditor.createEditor('dsw:questionnaire-report:1.4.0', 'dsw:questionnaire-report:1.5.0')
1917
cy.getCy('dt-editor_nav_files').click()
2018
})
2119

2220
it('create file simple', () => {
23-
editor.addFile()
21+
dtEditor.addFile()
2422
cy.fillFields({ 'file-name': 'index.html' })
2523
cy.clickModalAction()
2624
cy.getCy('dt-editor_file-tree_file').contains('index.html').should('exist')
2725
})
2826

2927
it('create folder and file', () => {
30-
editor.addFolder()
28+
dtEditor.addFolder()
3129
cy.fillFields({ 'folder-name': 'src' })
3230
cy.clickModalAction()
3331
cy.getCy('dt-editor_file-tree_folder').contains('src').click()
3432

35-
editor.addFile()
33+
dtEditor.addFile()
3634
cy.fillFields({ 'file-name': 'index.html' })
3735
cy.clickModalAction()
3836
cy.getCy('dt-editor_file-tree_file').contains('index.html').should('exist')
@@ -56,11 +54,11 @@ describe('Document Template Editor / Editor / Files', () => {
5654

5755
it('rename folder', () => {
5856
// create file and folder
59-
editor.addFolder()
57+
dtEditor.addFolder()
6058
cy.fillFields({ 'folder-name': 'src' })
6159
cy.clickModalAction()
6260
cy.getCy('dt-editor_file-tree_folder').contains('src').click()
63-
editor.addFile()
61+
dtEditor.addFile()
6462
cy.fillFields({ 'file-name': 'index.html' })
6563
cy.clickModalAction()
6664

@@ -77,7 +75,7 @@ describe('Document Template Editor / Editor / Files', () => {
7775

7876
it('move file', () => {
7977
// create a folder
80-
editor.addFolder()
78+
dtEditor.addFolder()
8179
cy.fillFields({ 'folder-name': 'src' })
8280
cy.clickModalAction()
8381

@@ -97,13 +95,13 @@ describe('Document Template Editor / Editor / Files', () => {
9795

9896
it('move folder', () => {
9997
// create a folder
100-
editor.addFolder()
98+
dtEditor.addFolder()
10199
cy.fillFields({ 'folder-name': 'src' })
102100
cy.clickModalAction()
103101

104102
// create another folder
105103
cy.getCy('dt-editor_file-tree_folder').contains('Questionnaire Report').click()
106-
editor.addFolder()
104+
dtEditor.addFolder()
107105
cy.fillFields({ 'folder-name': 'css' })
108106
cy.clickModalAction()
109107

@@ -130,7 +128,7 @@ describe('Document Template Editor / Editor / Files', () => {
130128
})
131129

132130
it('upload image asset', () => {
133-
editor.addAsset()
131+
dtEditor.addAsset()
134132
cy.get('.dropzone').selectFile('cypress/fixtures/dt-editor/image.svg', {
135133
action: 'drag-drop'
136134
})
@@ -140,7 +138,7 @@ describe('Document Template Editor / Editor / Files', () => {
140138
})
141139

142140
it('upload docx asset', () => {
143-
editor.addAsset()
141+
dtEditor.addAsset()
144142
cy.get('.dropzone').selectFile('cypress/fixtures/dt-editor/document.docx', {
145143
action: 'drag-drop'
146144
})
@@ -150,7 +148,7 @@ describe('Document Template Editor / Editor / Files', () => {
150148
})
151149

152150
it('upload MD file', () => {
153-
editor.addAsset()
151+
dtEditor.addAsset()
154152
cy.get('.dropzone').selectFile('cypress/fixtures/dt-editor/readme.md', {
155153
action: 'drag-drop'
156154
})

‎cypress/e2e/document-template-editor/editor/preview-with-editor.spec.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import * as editor from '../../../support/editor-helpers'
1+
import * as kmEditor from '../../../support/editor-helpers'
2+
import * as dtEditor from '../../../support/dt-editor-helpers'
23
import * as project from '../../../support/project-helpers'
34
import { dataCy } from '../../../support/utils'
45

@@ -23,16 +24,15 @@ describe('Document Template Editor / Editor / Preview with KM Editor', () => {
2324
s_type: 'Value',
2425
title: 'Question 1',
2526
}
26-
editor.createChildren([
27+
kmEditor.createChildren([
2728
['chapter', chapter],
2829
['question', question]
2930
])
3031
}
3132

3233
const createDocumentTemplateEditor = () => {
33-
cy.visitApp('/document-template-editors/create?selected=dsw:questionnaire-report:1.4.0&edit=true')
34-
cy.submitForm()
35-
cy.url().should('contain', '/document-template-editors/dsw:questionnaire-report:1.5.0')
34+
cy.loginAs('datasteward')
35+
dtEditor.createEditor('dsw:questionnaire-report:1.4.0', 'dsw:questionnaire-report:1.5.0')
3636
}
3737

3838
const validateReplies = (validate) => {
@@ -74,11 +74,11 @@ describe('Document Template Editor / Editor / Preview with KM Editor', () => {
7474

7575
// Go back to the KM Editor and edit replies
7676
cy.visitApp('/knowledge-model-editors')
77-
editor.open(kmId)
78-
editor.openPreview()
77+
kmEditor.open(kmId)
78+
kmEditor.openPreview()
7979
project.typeAnswer('Question 1', 'This is the question answer')
8080
cy.getCy('km-editor_preview_save-values').click()
81-
editor.awaitSave()
81+
kmEditor.awaitSave()
8282

8383
// Go back to the Document Template Editor
8484
cy.visitApp('/document-template-editors')
@@ -95,11 +95,11 @@ describe('Document Template Editor / Editor / Preview with KM Editor', () => {
9595

9696
// Back to KM Editor
9797
cy.visitApp('/knowledge-model-editors')
98-
editor.open(kmId)
99-
editor.openPreview()
98+
kmEditor.open(kmId)
99+
kmEditor.openPreview()
100100
project.clearAnswer('Question 1')
101101
cy.getCy('km-editor_preview_save-values').click()
102-
editor.awaitSave()
102+
kmEditor.awaitSave()
103103

104104
// Back to Document Template Editor and check replies are empty again
105105
cy.visitApp('/document-template-editors')

‎cypress/e2e/document-template-editor/editor/preview.spec.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1+
import * as dtEditor from '../../../support/dt-editor-helpers'
12
import * as project from '../../../support/project-helpers'
23

34
describe('Document Template Editor / Editor / Preview', () => {
45
const projectName = 'My Project'
56
const kmId = 'basic-questionnaire-test-km'
6-
const knowledgeModelPackageId = 'dsw:basic-questionnaire-test-km:1.0.0'
7+
let knowledgeModelPackageUuid
78

89
before(() => {
910
cy.task('knowledgeModelPackage:delete', { km_id: kmId })
1011
cy.putDefaultAppConfig()
1112
cy.clearServerCache()
1213

13-
cy.importKM(kmId)
14+
cy.importKM(kmId, (uuid) => {
15+
knowledgeModelPackageUuid = uuid
16+
})
1417
})
1518

1619
beforeEach(() => {
@@ -25,14 +28,12 @@ describe('Document Template Editor / Editor / Preview', () => {
2528
visibility: project.VisibleView,
2629
sharing: project.Restricted,
2730
name: projectName,
28-
knowledgeModelPackageId
31+
knowledgeModelPackageUuid
2932
})
3033

3134
// create document template editor
3235
cy.loginAs('datasteward')
33-
cy.visitApp('/document-template-editors/create?selected=dsw:questionnaire-report:1.4.0&edit=true')
34-
cy.submitForm()
35-
cy.url().should('contain', '/document-template-editors/dsw:questionnaire-report:1.5.0')
36+
dtEditor.createEditor('dsw:questionnaire-report:1.4.0', 'dsw:questionnaire-report:1.5.0')
3637
cy.getCy('dt-editor_nav_preview').click()
3738
})
3839

‎cypress/e2e/document-template-editor/editor/publish.spec.js‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import * as editor from '../../../support/dt-editor-helpers'
1+
import * as dtEditor from '../../../support/dt-editor-helpers'
2+
23

34
describe('Document Template Editor / Editor / Publish', () => {
45
before(() => {
56
cy.putDefaultAppConfig()
67
cy.clearServerCache()
78
})
8-
9+
910
beforeEach(() => {
1011
// prepare base document template
1112
cy.task('documentTemplate:delete')
@@ -14,12 +15,14 @@ describe('Document Template Editor / Editor / Publish', () => {
1415

1516
it('publish', () => {
1617
cy.loginAs('datasteward')
17-
cy.visitApp('/document-template-editors/create?selected=dsw:questionnaire-report:1.4.0&edit=true')
18-
cy.submitForm()
19-
cy.url().should('contain', '/document-template-editors/dsw:questionnaire-report:1.5.0')
20-
cy.getCy('dt-editor_publish').click()
21-
cy.clickModalAction()
22-
cy.url().should('contain', '/document-templates/dsw:questionnaire-report:1.5.0')
18+
dtEditor
19+
.createEditor('dsw:questionnaire-report:1.4.0', 'dsw:questionnaire-report:1.5.0')
20+
.then((documentTemplateUuid) => {
21+
cy.url().should('contain', `/document-template-editors/${documentTemplateUuid}`)
22+
cy.getCy('dt-editor_publish').click()
23+
cy.clickModalAction()
24+
cy.url().should('contain', `/document-templates/${documentTemplateUuid}`)
25+
})
2326

2427
cy.visitApp('/document-templates')
2528
cy.getListingItem('dsw:questionnaire-report:1.5.0').should('contain', 'Questionnaire Report')

‎cypress/e2e/document-template-editor/editor/settings.spec.js‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
1-
import * as editor from '../../../support/dt-editor-helpers'
1+
import * as dtEditor from '../../../support/dt-editor-helpers'
22
import { dataCy } from '../../../support/utils'
33

44
describe('Document Template Editor / Editor / Template', () => {
5+
let documentTemplateUuid
6+
57
before(() => {
68
cy.putDefaultAppConfig()
79
cy.clearServerCache()
810
})
9-
11+
1012
beforeEach(() => {
1113
// prepare base document template
1214
cy.task('documentTemplate:delete')
1315
cy.importTemplate('templates/questionnaire-report.zip')
14-
16+
1517
// create document template editor
1618
cy.loginAs('datasteward')
17-
cy.visitApp('/document-template-editors/create?selected=dsw:questionnaire-report:1.4.0&edit=true')
18-
cy.submitForm()
19-
cy.url().should('contain', '/document-template-editors/dsw:questionnaire-report:1.5.0')
19+
dtEditor
20+
.createEditor('dsw:questionnaire-report:1.4.0', 'dsw:questionnaire-report:1.5.0')
21+
.then((uuid) => {
22+
documentTemplateUuid = uuid
23+
})
2024
cy.get('.file-tree').should('exist')
2125
cy.getCy('dt-editor_nav_settings').click()
2226
})
2327

2428
it('simple edit', () => {
2529
const name = 'My New Template'
2630
const description = 'This is my new template'
31+
const templateId = 'my-template'
2732
const readme = '# My New Template\n\nThis is my new template.'
2833

2934
// change fields and save
3035
cy.fillFields({
3136
name,
3237
description,
33-
readme
38+
templateId,
39+
readme,
40+
'version-major': '2',
41+
'version-minor': '4',
42+
'version-patch': '8'
43+
})
44+
cy.fillFields({
45+
'version-major': '2',
46+
'version-minor': '4',
47+
'version-patch': '8'
3448
})
35-
editor.save()
49+
dtEditor.save()
3650

3751
// reopen and check fields
38-
cy.visitApp('/document-template-editors/dsw:questionnaire-report:1.5.0')
52+
cy.visitApp(`/document-template-editors/${documentTemplateUuid}`)
3953
cy.getCy('dt-editor_nav_settings').click()
4054
cy.checkFields({
4155
name,
4256
description,
43-
readme
44-
})
45-
})
46-
47-
it('change template id', () => {
48-
const templateId = 'my-template'
49-
cy.fillFields({ templateId })
50-
editor.save()
51-
52-
cy.url().should('contain', `/document-template-editors/dsw:${templateId}:1.5.0`)
53-
})
54-
55-
it('change version', () => {
56-
cy.fillFields({
57+
templateId,
58+
readme,
5759
'version-major': '2',
5860
'version-minor': '4',
59-
'version-patch': '8' })
60-
editor.save()
61-
62-
cy.url().should('contain', `/document-template-editors/dsw:questionnaire-report:2.4.8`)
61+
'version-patch': '8'
62+
})
6363
})
6464

6565
it('add format', () => {
@@ -71,7 +71,7 @@ describe('Document Template Editor / Editor / Template', () => {
7171
'formats\\.7\\.icon': 'fas fa-home'
7272
})
7373

74-
editor.save()
74+
dtEditor.save()
7575

7676
cy.getCy('dt-editor_nav_preview').click()
7777
cy.get(`#format option`).contains('My Format').should('exist')

0 commit comments

Comments
 (0)