[gjs/test-ci: 26/26] test ci

[Philip Chimento <pchimento src gnome org>]

commit 32219c8539851d42c77224ef49fa7ed46309afa3
Author: Philip Chimento <philip chimento gmail com>
Date:   Wed May 6 18:27:12 2020 -0700

    test ci

 .gitlab-ci.yml            | 24 ++++++++++++------------
 modules/cairo-context.cpp |  8 +++-----
 modules/script/_legacy.js |  3 +--
 3 files changed, 16 insertions(+), 19 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b5acf45..de5633a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ stages:
 - deploy
 
 .coverage: &coverage
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68
+  image: registry.gitlab.gnome.org/ptomato/gjs:fedora.mozjs68
   variables:
     TASK_ID: "coverage"
     coverage: '/^  lines.*(\d+\.\d+\%)/'
@@ -48,7 +48,7 @@ stages:
 build_recommended:
   <<: *build
   stage: source_check
-  image: registry.gitlab.gnome.org/gnome/gjs:job-559848_fedora.mozjs68-debug  # pinned on purpose
+  image: registry.gitlab.gnome.org/ptomato/gjs:fedora.mozjs68-debug
   variables:
     TASK_ID: "fedora-x86_64-gcc-debug-default-check"
     TEST_OPTS: --verbose --no-stdsplit --print-errorlogs
@@ -60,7 +60,7 @@ sanitizer_gcc:
   stage: test
   tags:
     - privileged  # LSAN needs CAP_SYS_PTRACE
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68
+  image: registry.gitlab.gnome.org/ptomato/gjs:fedora.mozjs68
   variables:
     TASK_ID: "fedora-x86_64-gcc-default-ubsan_asan-check"
     CONFIG_OPTS: -Db_sanitize=address,undefined
@@ -73,7 +73,7 @@ sanitizer_gcc:
 build_maximal:
   <<: *build
   stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68-debug
+  image: registry.gitlab.gnome.org/ptomato/gjs:fedora.mozjs68-debug
   variables:
     TASK_ID: "fedora-x86_64-clang-default-maximal-check"
     CC: clang
@@ -89,7 +89,7 @@ build_maximal:
 build_minimal:
   <<: *build
   stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68
+  image: registry.gitlab.gnome.org/ptomato/gjs:fedora.mozjs68
   variables:
     TASK_ID: "ubuntu-x86_64-gcc-default-minimal-check"
     CONFIG_OPTS: >-
@@ -152,7 +152,7 @@ cppcheck:
 cpplint:
   when: on_success
   stage: source_check
-  image: registry.gitlab.gnome.org/gnome/gjs:alpine.cpplint
+  image: registry.gitlab.gnome.org/ptomato/gjs:alpine.cpplint
   variables:
     TASK_ID: "cpplint"
   script:
@@ -204,7 +204,7 @@ sanitizer_clang:
   stage: manual
   tags:
     - privileged  # LSAN needs CAP_SYS_PTRACE
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68
+  image: registry.gitlab.gnome.org/ptomato/gjs:fedora.mozjs68
   variables:
     TASK_ID: "fedora-x86_64-clang_ubsan_asan-default-default-check"
     CC: clang
@@ -216,7 +216,7 @@ sanitizer_clang:
 installed_tests:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68
+  image: registry.gitlab.gnome.org/ptomato/gjs:fedora.mozjs68
   variables:
     TASK_ID: "fedora-x86_64-gcc-default-default-installed_tests"
     CONFIG_OPTS: -Dinstalled_tests=true -Dprefix=/usr
@@ -233,7 +233,7 @@ installed_tests:
 valgrind:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68
+  image: registry.gitlab.gnome.org/ptomato/gjs:fedora.mozjs68
   variables:
     TASK_ID: "fedora-x86_64-gcc-default-default-valgrind_check"
     TEST_OPTS: --setup=valgrind
@@ -246,7 +246,7 @@ valgrind:
 zeal_2:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68-debug
+  image: registry.gitlab.gnome.org/ptomato/gjs:fedora.mozjs68-debug
   variables:
     TASK_ID: "fedora-x86_64-gcc-debug-default-check_zeal2"
     TEST_OPTS: --setup=extra_gc
@@ -257,7 +257,7 @@ zeal_2:
 zeal_4:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68-debug
+  image: registry.gitlab.gnome.org/ptomato/gjs:fedora.mozjs68-debug
   variables:
     TASK_ID: "fedora-x86_64-gcc-debug-default-check_zeal4"
     TEST_OPTS: --setup=pre_verify
@@ -268,7 +268,7 @@ zeal_4:
 zeal_11:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs68-debug
+  image: registry.gitlab.gnome.org/ptomato/gjs:fedora.mozjs68-debug
   variables:
     TASK_ID: "fedora-x86_64-gcc-debug-default-check_zeal11"
     TEST_OPTS: --setup=post_verify
diff --git a/modules/cairo-context.cpp b/modules/cairo-context.cpp
index f82acc9f..b52e78d6 100644
--- a/modules/cairo-context.cpp
+++ b/modules/cairo-context.cpp
@@ -255,11 +255,9 @@ GJS_DEFINE_PROTO_WITH_GTYPE("Context", cairo_context,
                             JSCLASS_BACKGROUND_FINALIZE)
 GJS_DEFINE_PRIV_FROM_JS(GjsCairoContext, gjs_cairo_context_class);
 
-static void
-_gjs_cairo_context_construct_internal(JSContext       *context,
-                                      JS::HandleObject obj,
-                                      cairo_t         *cr)
-{
+static void _gjs_cairo_context_construct_internal(JSContext* context,
+                                                  JS::HandleObject obj,
+                                                  cairo_t* cr) {
     GjsCairoContext *priv;
 
     priv = g_slice_new0(GjsCairoContext);
diff --git a/modules/script/_legacy.js b/modules/script/_legacy.js
index 46c3b4c7..b20cd504 100644
--- a/modules/script/_legacy.js
+++ b/modules/script/_legacy.js
@@ -207,8 +207,7 @@ Class.prototype._init = function (params) {
     });
 
     Object.getOwnPropertyNames(params)
-    .filter(name =>
-        ['Name', 'Extends', 'Abstract', 'Implements'].indexOf(name) === -1)
+    .filter(name => !['Name', 'Extends', 'Abstract', 'Implements'].includes(name))
     .concat(Object.getOwnPropertySymbols(params))
     .forEach(this._copyPropertyDescriptor.bind(this, params, propertyObj));