[Libreoffice-commits] online.git: cypress_test/.eslintrc cypress_test/Makefile.am loleaflet/.eslintrc

[Tamás Zolnai (via logerrit)]

 cypress_test/.eslintrc   |    9 +++++++++
 cypress_test/Makefile.am |    2 +-
 loleaflet/.eslintrc      |    6 ------
 3 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 98e3994e6ac51dfe2e920a656aaf741029a2e1e1
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Apr 24 14:24:59 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri Apr 24 14:41:31 2020 +0200

    cypress: add an own eslint config for the test code.
    
    This parserOptions was added for cypress test so
    move that into the tests' own config:
    b2ec95dcfddac03c9565762d7032c3d36dd53fe6
    
    Change-Id: I3c565d212409cc01621eca97cd59ae7869d852cc
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92857
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/cypress_test/.eslintrc b/cypress_test/.eslintrc
new file mode 100644
index 000000000..bd0576c25
--- /dev/null
+++ b/cypress_test/.eslintrc
@@ -0,0 +1,9 @@
+{
+  "extends": "../loleaflet/.eslintrc",
+  "parserOptions": {
+      "ecmaVersion": 6,
+      "sourceType": "module",
+      "ecmaFeatures": {
+      }
+  },
+}
\ No newline at end of file
diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 5b1f5fd14..c83a15761 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -117,7 +117,7 @@ define run_JS_error_check
 	@echo "Checking for JS errors in test code..."
 	@echo
 	@NODE_PATH=$(abs_dir)/node_modules $(NODE) $(ESLINT_BINARY) $(abs_srcdir) \
-		--ignore-path $(abs_srcdir)/.eslintignore --config $(abs_top_srcdir)/loleaflet/.eslintrc
+		--ignore-path $(abs_srcdir)/.eslintignore --config $(abs_srcdir)/.eslintrc
 	@echo
 endef
 
diff --git a/loleaflet/.eslintrc b/loleaflet/.eslintrc
index 7a0d4747f..f59a4458a 100644
--- a/loleaflet/.eslintrc
+++ b/loleaflet/.eslintrc
@@ -27,10 +27,4 @@
   "env": {
     "browser": true
   },
-  "parserOptions": {
-      "ecmaVersion": 6,
-      "sourceType": "module",
-      "ecmaFeatures": {
-      }
-  },
 }