Skip to content
/ dsw-e2e-tests Public

Commit 735daa9

Browse files
janslifkajanslifka
committed
Rename questionnaire to project
1 parent 584fb2a commit 735daa9

37 files changed

+132
-132
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ describe('Document Template Editor / Editor / Preview', () => {
1616
beforeEach(() => {
1717
// prepare base document template
1818
cy.task('documentTemplate:delete')
19-
cy.task('questionnaire:delete')
19+
cy.task('project:delete')
2020
cy.clearServerCache()
2121
cy.importTemplate('templates/questionnaire-report.zip')
2222

2323
// create project to use for preview
24-
cy.createQuestionnaire({
24+
cy.createProject({
2525
visibility: project.VisibleView,
2626
sharing: project.Restricted,
2727
name: projectName,

‎cypress/e2e/documents/list.spec.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,37 @@ import * as project from '../../support/project-helpers'
22

33

44
describe('Document List', () => {
5-
const questionnaireName = 'Documents test'
5+
const projectName = 'Documents test'
66
const kmId = 'test-km-1'
77
const knowledgeModelPackageId = 'dsw:test-km-1:1.0.0'
88
const documentTemplateId = 'dsw:questionnaire-report:1.4.0'
99
const formatUuid = 'd3e98eb6-344d-481f-8e37-6a67b6cd1ad2'
1010

1111
before(() => {
12-
cy.task('questionnaire:delete')
12+
cy.task('project:delete')
1313
cy.task('knowledgeModelPackage:delete', { km_id: kmId })
1414
cy.removeTemplate(documentTemplateId)
1515
cy.clearServerCache()
1616

1717
cy.importKM('test-km-1')
1818
cy.importTemplate('templates/questionnaire-report.zip')
1919

20-
const questionnaire = {
20+
const projectData = {
2121
visibility: project.Private,
22-
name: questionnaireName,
22+
name: projectName,
2323
sharing: project.Restricted,
2424
knowledgeModelPackageId
2525
}
2626

27-
cy.createQuestionnaire(questionnaire).then((resp) => {
28-
const questionnaireUuid = resp.body.uuid
27+
cy.createProject(projectData).then((resp) => {
28+
const projectUuid = resp.body.uuid
2929
const documents = []
3030
for (let i = 1; i <= 40; i++) {
3131
documents.push({
3232
name: `Document ${('0' + i).slice(-2)}`,
3333
formatUuid,
3434
documentTemplateId,
35-
questionnaireUuid
35+
projectUuid
3636
})
3737
}
3838
cy.createDocuments(documents)

‎cypress/e2e/km-editor/editor/websocket.spec.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ describe('KMEditor WebSocket Tests', () => {
2323
it('Basic editations', () => {
2424
// Add chapter
2525
const addChapterMsg = {
26-
"type": "SetContent_ClientKnowledgeModelEditorAction",
26+
"type": "SetContent_ClientKnowledgeModelEditorMessage",
2727
"data": {
2828
"type": "AddKnowledgeModelEditorWebSocketEvent",
2929
"uuid": "83c73272-3926-4486-aa1e-2a3bad78608c",
@@ -52,7 +52,7 @@ describe('KMEditor WebSocket Tests', () => {
5252

5353
// Edit that chapter
5454
const editChapterMsg = {
55-
"type": "SetContent_ClientKnowledgeModelEditorAction",
55+
"type": "SetContent_ClientKnowledgeModelEditorMessage",
5656
"data": {
5757
"type": "AddKnowledgeModelEditorWebSocketEvent",
5858
"uuid": "17aa44c9-ed54-4681-a77a-bca140266dd5",
@@ -91,7 +91,7 @@ describe('KMEditor WebSocket Tests', () => {
9191

9292
// Delete the chapter
9393
const deleteChapterMsg = {
94-
"type": "SetContent_ClientKnowledgeModelEditorAction",
94+
"type": "SetContent_ClientKnowledgeModelEditorMessage",
9595
"data": {
9696
"type": "AddKnowledgeModelEditorWebSocketEvent",
9797
"uuid": "6e081af8-a7a5-4523-9c83-f2c23f8561bf",

‎cypress/e2e/knowledge-models/deprecated.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ describe('Deprecated KM', () => {
1212
before(() => {
1313
cy.putDefaultAppConfig()
1414

15-
cy.task('questionnaire:delete')
15+
cy.task('project:delete')
1616
cy.task('knowledgeModelPackage:delete', { km_id: kmId })
1717
cy.clearServerCache()
1818

‎cypress/e2e/knowledge-models/latest.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ describe('Latest version', () => {
77

88
before(() => {
99
cy.task('knowledgeModelPackage:delete', { km_id: kmId })
10-
cy.task('questionnaire:delete')
10+
cy.task('project:delete')
1111
cy.clearServerCache()
1212

1313
cy.importKM('km-migration/dsw_parent-km_1.11.0')

‎cypress/e2e/projects/anonymous.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ describe('Anonymous projects', () => {
2222
})
2323

2424
beforeEach(() => {
25-
cy.task('questionnaire:delete')
25+
cy.task('project:delete')
2626
cy.clearServerCache()
2727
cy.putDefaultAppConfig()
2828

‎cypress/e2e/projects/clone.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ describe('Project Clone', () => {
1515

1616

1717
beforeEach(() => {
18-
cy.task('questionnaire:delete')
18+
cy.task('project:delete')
1919
cy.clearServerCache()
2020

2121
cy.loginAs('researcher')
@@ -24,7 +24,7 @@ describe('Project Clone', () => {
2424

2525
it('can clone project', () => {
2626
// create a new questionnaire
27-
cy.createQuestionnaire({
27+
cy.createProject({
2828
visibility: project.VisibleView,
2929
sharing: project.Restricted,
3030
name: projectName,

‎cypress/e2e/projects/crud.spec.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ describe('Project CRUD', () => {
1717

1818

1919
beforeEach(() => {
20-
cy.task('questionnaire:delete')
20+
cy.task('project:delete')
2121
cy.clearServerCache()
2222

2323
cy.loginAs('researcher')
@@ -48,7 +48,7 @@ describe('Project CRUD', () => {
4848
knowledgeModelPackageId
4949
}
5050

51-
cy.createQuestionnaire(p)
51+
cy.createProject(p)
5252
project.open(otherProjectName)
5353
project.openSettings()
5454

@@ -69,7 +69,7 @@ describe('Project CRUD', () => {
6969
name: projectName,
7070
knowledgeModelPackageId
7171
}
72-
cy.createQuestionnaire(p)
72+
cy.createProject(p)
7373
project.open(projectName)
7474
project.openSettings()
7575

‎cypress/e2e/projects/detail/comments.spec.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ describe('Comments', () => {
1818
beforeEach(() => {
1919
cy.clearLocalStorage()
2020

21-
cy.task('questionnaire:delete')
21+
cy.task('project:delete')
2222
cy.clearServerCache()
2323

24-
cy.createQuestionnaire({
24+
cy.createProject({
2525
visibility: project.VisibleView,
2626
sharing: project.Restricted,
2727
name: projectName,
@@ -37,7 +37,7 @@ describe('Comments', () => {
3737
project.openCommentsFor('Options Question 1')
3838
project.startNewCommentThread('This is a new thread')
3939
project.expectCommentCount(1)
40-
cy.clearCurrentQuestionnaireSidePanelLocalStorage()
40+
cy.clearCurrentProjectSidePanelLocalStorage()
4141
cy.reload()
4242
project.expectCommentCount(1)
4343
}
@@ -50,15 +50,15 @@ describe('Comments', () => {
5050
project.openPrivateNotesFor('Options Question 1')
5151
project.startNewPrivateNotesThread('This is a new thread')
5252
project.expectCommentCount(2)
53-
cy.clearCurrentQuestionnaireSidePanelLocalStorage()
53+
cy.clearCurrentProjectSidePanelLocalStorage()
5454
cy.reload()
5555
project.expectCommentCount(2)
5656
}
5757

5858
const testNoPrivateNotes = () => {
5959
project.openCommentsFor('Options Question 1')
6060
cy.getCy('comments_nav_private-notes').should('not.exist')
61-
cy.clearCurrentQuestionnaireSidePanelLocalStorage()
61+
cy.clearCurrentProjectSidePanelLocalStorage()
6262
}
6363

6464
it('as Admin', () => {
@@ -308,7 +308,7 @@ describe('Comments', () => {
308308
project.setProjectSharing(project.AnyoneWithLinkEdit)
309309

310310
const msg = {
311-
type: 'SetContent_ClientQuestionnaireAction',
311+
type: 'SetContent_ClientProjectMessage',
312312
data: {
313313
type: 'AddCommentEvent',
314314
uuid: 'd805310f-62f4-4559-88b2-df425c9ded5d',
@@ -323,7 +323,7 @@ describe('Comments', () => {
323323

324324
project.open(projectName)
325325
project.expectCommentCount(0)
326-
cy.wsSend(`/questionnaires/${projectUuid}/websocket`, msg)
326+
cy.wsSend(`/projects/${projectUuid}/websocket`, msg)
327327
project.openCommentsFor('Options Question 1')
328328
cy.get('.Comment_MD').contains('This is a comment').should('exist')
329329
})

‎cypress/e2e/projects/detail/documents.spec.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ describe('Documents', () => {
3737
})
3838

3939
beforeEach(() => {
40-
cy.task('questionnaire:delete')
40+
cy.task('project:delete')
4141
cy.clearServerCache()
4242

4343
cy.loginAs('researcher')
4444

45-
cy.createQuestionnaire({
45+
cy.createProject({
4646
visibility: project.Private,
4747
sharing: project.Restricted,
4848
name: projectName,
@@ -51,7 +51,7 @@ describe('Documents', () => {
5151
documentTemplateId
5252
}).then((resp) => {
5353
cy.fixture(`${kmId}-questionnaire-content`).then((req) => {
54-
cy.updateQuestionnaireContent(resp.body.uuid, req)
54+
cy.updateProjectContent(resp.body.uuid, req)
5555
projectUuid = resp.body.uuid
5656
})
5757
})

0 commit comments

Comments
 (0)