[Libreoffice-commits] online.git: 2 commits - cypress_test/integration_tests cypress_test/Makefile.am

[Tamás Zolnai (via logerrit)]

 cypress_test/Makefile.am                                           |    2 -
 cypress_test/integration_tests/mobile/writer/spellchecking_spec.js |   14 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit f49783b7beb9bf02765fcdec458ca5c7153e75cf
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Thu Mar 12 19:01:14 2020 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Thu Mar 12 19:02:32 2020 +0100

    cypress: add package.json as a dependency of local npm installation.
    
    So packages will be reinstalled, when packages.json changes.
    
    Change-Id: I4731b4995bc969a474ea3fcd36e1135ed03ec62c

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 3750c8a97..fb209bf1f 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -211,7 +211,7 @@ NODE_BINS = \
 
 $(NODE_BINS): $(NPM_INSTALLED);
 
-$(NPM_INSTALLED):
+$(NPM_INSTALLED): package.json
 	@npm install
 	@mkdir -p $(dir $(NPM_INSTALLED))
 	@touch $(NPM_INSTALLED)
commit 25e3beb65ec0f8399130d0ce89be75e46da577b0
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Thu Mar 12 18:57:21 2020 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Thu Mar 12 19:02:32 2020 +0100

    cypress: fix tests failing with the new cypress version.
    
    Change-Id: I0a5b307b7770e0150304329ba136f4ed059c6928

diff --git a/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js b/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js
index 595dc63bc..c62349b52 100644
--- a/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js
@@ -81,7 +81,7 @@ describe('Spell checking menu.', function() {
 
 		// TODO: Why we have a non-breaking space here?
 		cy.get('.context-menu-link')
-			.contains('Ignore\u00a0All')
+			.contains('Ignore All')
 			.click();
 
 		openContextMenu();
@@ -100,7 +100,7 @@ describe('Spell checking menu.', function() {
 
 		// English is selected
 		cy.get('.menu-entry-checked')
-			.contains('English\u00a0(USA)');
+			.contains('English (USA)');
 	});
 
 	it('Set None Language for selection.', function() {
@@ -112,13 +112,13 @@ describe('Spell checking menu.', function() {
 
 		// English is selected
 		cy.get('.menu-entry-checked')
-			.contains('English\u00a0(USA)');
+			.contains('English (USA)');
 
 		openContextMenu();
 
 		// We don't get the spell check context menu any more
 		cy.get('.context-menu-link')
-			.contains('None\u00a0(Do not check spelling)');
+			.contains('None (Do not check spelling)');
 	});
 
 	it('Check language status for paragraph.', function() {
@@ -130,7 +130,7 @@ describe('Spell checking menu.', function() {
 
 		// English is selected
 		cy.get('.menu-entry-checked')
-			.contains('English\u00a0(USA)');
+			.contains('English (USA)');
 	});
 
 	it('Set None Language for paragraph.', function() {
@@ -142,12 +142,12 @@ describe('Spell checking menu.', function() {
 
 		// English is selected
 		cy.get('.menu-entry-checked')
-			.contains('English\u00a0(USA)');
+			.contains('English (USA)');
 
 		openContextMenu();
 
 		// We don't get the spell check context menu any more
 		cy.get('.context-menu-link')
-			.contains('None\u00a0(Do not check spelling)');
+			.contains('None (Do not check spelling)');
 	});
 });