Merge pull request #4510 from nextcloud/fix/direct-editing-save

nextcloud · Jul 27, 2023 · 6d2ee51 · 6d2ee51
2 parents a235396 + 0447b45
commit 6d2ee51
Show file tree

Hide file tree

Showing 14 changed files with 78 additions and 22 deletions.
diff --git a/cypress/e2e/directediting.spec.js b/cypress/e2e/directediting.spec.js
@@ -49,45 +49,101 @@ const createDirectEditingLinkForNewFile = (user, file) => {
 }
 
 describe('direct editing', function() {
+
+	const visitHooks = {
+		onBeforeLoad(win) {
+			win.DirectEditingMobileInterface = {
+				close() {},
+			}
+		},
+	}
 	before(function() {
 		initUserAndFiles(user, 'test.md', 'empty.md', 'empty.txt')
 	})
 
 	it('Open an existing file, edit it', () => {
+		cy.intercept({ method: 'POST', url: '**/session/close' }).as('closeRequest')
+		cy.intercept({ method: 'POST', url: '**/session/push' }).as('push')
+		cy.intercept({ method: 'POST', url: '**/session/sync' }).as('sync')
+
 		createDirectEditingLink(user, 'empty.md')
 			.then((token) => {
 				cy.logout()
-				cy.visit(token)
+				cy.visit(token, visitHooks)
 			})
 		cy.getContent().type('# This is a headline')
 		cy.getContent().type('{enter}')
 		cy.getContent().type('Some text')
 		cy.getContent().type('{enter}')
+		cy.getContent().type('{ctrl+s}')
+
+		cy.wait('@push')
+		cy.wait('@sync')
+
+		cy.get('button.icon-close').click()
+		cy.wait('@closeRequest')
+			.then(() => {
+				cy.getFileContent('empty.md').then((content) => {
+					expect(content).to.equal('# This is a headline\n\nSome text')
+				})
+			})
 	})
 
 	it('Create a file, edit it', () => {
+		cy.intercept({ method: 'POST', url: '**/session/close' }).as('closeRequest')
+		cy.intercept({ method: 'POST', url: '**/session/push' }).as('push')
+		cy.intercept({ method: 'POST', url: '**/session/sync' }).as('sync')
+
 		createDirectEditingLinkForNewFile(user, 'newfile.md')
 			.then((token) => {
 				cy.logout()
-				cy.visit(token)
+				cy.visit(token, visitHooks)
 			})
 
 		cy.getContent().type('# This is a headline')
 		cy.getContent().type('{enter}')
 		cy.getContent().type('Some text')
 		cy.getContent().type('{enter}')
+		cy.getContent().type('{ctrl+s}')
+
+		cy.wait('@push')
+		cy.wait('@sync')
+
+		cy.get('button.icon-close').click()
+		cy.wait('@closeRequest')
+			.then(() => {
+				cy.getFileContent('newfile.md').then((content) => {
+					expect(content).to.equal('# This is a headline\n\nSome text')
+				})
+			})
 	})
 
 	it('Open an existing plain text file, edit it', () => {
+		cy.intercept({ method: 'POST', url: '**/session/close' }).as('closeRequest')
+		cy.intercept({ method: 'POST', url: '**/session/push' }).as('push')
+		cy.intercept({ method: 'POST', url: '**/session/sync' }).as('sync')
+
 		createDirectEditingLink(user, 'empty.txt')
 			.then((token) => {
 				cy.logout()
-				cy.visit(token)
+				cy.visit(token, visitHooks)
 			})
 
 		cy.getContent().type('# This is a headline')
 		cy.getContent().type('{enter}')
 		cy.getContent().type('Some text')
 		cy.getContent().type('{enter}')
+		cy.getContent().type('{ctrl+s}')
+
+		cy.wait('@push')
+		cy.wait('@sync')
+
+		cy.get('button.icon-close').click()
+		cy.wait('@closeRequest')
+			.then(() => {
+				cy.getFileContent('empty.txt').then((content) => {
+					expect(content).to.equal('# This is a headline\nSome text\n')
+				})
+			})
 	})
 })
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/text-editors.js b/js/text-editors.js
diff --git a/js/text-editors.js.map b/js/text-editors.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/src/views/DirectEditing.vue b/src/views/DirectEditing.vue
@@ -119,7 +119,7 @@ export default {
 		async close() {
 			this.saving = true
 			setTimeout(async () => {
-				await this.$refs.editor.close()
+				await this.$refs.editor.$destroy()
 				callMobileMessage('close')
 			}, 0)
 		},