diff options
| -rw-r--r-- | cypress_test/.gitignore | 6 | ||||
| -rw-r--r-- | cypress_test/Makefile.am | 10 | ||||
| -rw-r--r-- | cypress_test/plugins/index.js (renamed from cypress_test/cypress/plugins/index.js) | 0 | ||||
| -rw-r--r-- | cypress_test/plugins/tasks.js (renamed from cypress_test/cypress/plugins/tasks.js) | 0 |
4 files changed, 4 insertions, 12 deletions
diff --git a/cypress_test/.gitignore b/cypress_test/.gitignore index 007b3cfbea..3e5e8dbd26 100644 --- a/cypress_test/.gitignore +++ b/cypress_test/.gitignore @@ -1,8 +1,4 @@ node_modules -cypress/fixtures -cypress/integration -cypress/screenshots -cypress/support -cypress/videos +cypress package-lock.json workdir diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am index 4a6e779309..4efdfea240 100644 --- a/cypress_test/Makefile.am +++ b/cypress_test/Makefile.am @@ -24,7 +24,7 @@ check-local: @JAILS_PATH@ @echo "Running cypress desktop tests..." @echo $(CYPRESS_BINARY) run --browser chrome \ - --config integrationFolder=$(DESKTOP_TEST_FOLDER),video=false \ + --config integrationFolder=$(DESKTOP_TEST_FOLDER),video=false,pluginsFile=plugins/index.js \ --headless \ --env DATA_FOLDER=$(abs_top_srcdir)/cypress_test/data/desktop/,WORKDIR=$(abs_top_srcdir)/cypress_test/workdir/desktop/ || \ (pkill loolwsd && false) @@ -32,7 +32,7 @@ check-local: @JAILS_PATH@ @echo "Running cypress mobile tests..." @echo $(CYPRESS_BINARY) run --browser chrome \ - --config integrationFolder=$(MOBILE_TEST_FOLDER),video=false,userAgent=$(MOBILE_USER_AGENT) \ + --config integrationFolder=$(MOBILE_TEST_FOLDER),video=false,userAgent=$(MOBILE_USER_AGENT),pluginsFile=plugins/index.js \ --headless \ --env DATA_FOLDER=$(abs_top_srcdir)/cypress_test/data/mobile/,WORKDIR=$(abs_top_srcdir)/cypress_test/workdir/mobile/ || \ (pkill loolwsd && false) @@ -42,8 +42,4 @@ endif clean-local: rm -rf node_modules rm -rf workdir - rm -rf cypress/fixtures - rm -rf cypress/integration - rm -rf cypress/screenshots - rm -rf cypress/support - rm -rf cypress/videos + rm -rf cypress diff --git a/cypress_test/cypress/plugins/index.js b/cypress_test/plugins/index.js index 60070efcba..60070efcba 100644 --- a/cypress_test/cypress/plugins/index.js +++ b/cypress_test/plugins/index.js diff --git a/cypress_test/cypress/plugins/tasks.js b/cypress_test/plugins/tasks.js index 2488d610c2..2488d610c2 100644 --- a/cypress_test/cypress/plugins/tasks.js +++ b/cypress_test/plugins/tasks.js |