From f901064a59ff1cf0f74eed9bcaf1963b212c6005 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Mon, 10 Feb 2020 17:10:39 +0100 Subject: [PATCH 1/2] [misc] update the build scripts to 1.3.5 --- services/notifications/.eslintrc | 15 +++------------ services/notifications/.prettierrc | 2 +- services/notifications/Dockerfile | 10 +++++----- services/notifications/Makefile | 7 ++++++- services/notifications/buildscript.txt | 2 +- services/notifications/docker-compose.ci.yml | 4 ++-- services/notifications/docker-compose.yml | 4 ++-- 7 files changed, 20 insertions(+), 24 deletions(-) diff --git a/services/notifications/.eslintrc b/services/notifications/.eslintrc index 0e4b23dc44..42a4b5cace 100644 --- a/services/notifications/.eslintrc +++ b/services/notifications/.eslintrc @@ -1,7 +1,7 @@ // this file was auto-generated, do not edit it directly. // instead run bin/update_build_scripts from // https://github.com/sharelatex/sharelatex-dev-environment -// Version: 1.3.1 +// Version: 1.3.5 { "extends": [ "standard", @@ -28,7 +28,7 @@ "overrides": [ { // Test specific rules - "files": ["**/test/*/src/**/*.js"], + "files": ["test/**/*.js"], "globals": { "expect": true }, @@ -53,18 +53,9 @@ "mocha/prefer-arrow-callback": "error" } }, - { - // Frontend test specific rules - "files": ["**/test/frontend/**/*.js"], - "globals": { - "expect": true, - "define": true, - "$": true - } - }, { // Backend specific rules - "files": ["**/app/src/**/*.js"], + "files": ["app/**/*.js", "app.js", "index.js"], "rules": { // don't allow console.log in backend code "no-console": "error" diff --git a/services/notifications/.prettierrc b/services/notifications/.prettierrc index 159e073fd4..5845b82113 100644 --- a/services/notifications/.prettierrc +++ b/services/notifications/.prettierrc @@ -1,7 +1,7 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.3.1 +# Version: 1.3.5 { "semi": false, "singleQuote": true diff --git a/services/notifications/Dockerfile b/services/notifications/Dockerfile index c4d1e38c4d..2d8b097e26 100644 --- a/services/notifications/Dockerfile +++ b/services/notifications/Dockerfile @@ -1,12 +1,14 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.3.1 +# Version: 1.3.5 -FROM node:10.19.0 as app +FROM node:10.19.0 as base WORKDIR /app +FROM base as app + #wildcard as some files may not be in all repos COPY package*.json npm-shrink*.json /app/ @@ -16,11 +18,9 @@ COPY . /app -FROM node:10.19.0 +FROM base COPY --from=app /app /app - -WORKDIR /app USER node CMD ["node", "--expose-gc", "app.js"] diff --git a/services/notifications/Makefile b/services/notifications/Makefile index 7655f8a79f..66610502e9 100644 --- a/services/notifications/Makefile +++ b/services/notifications/Makefile @@ -1,7 +1,7 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.3.1 +# Version: 1.3.5 BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) @@ -33,9 +33,14 @@ test_unit: test_acceptance: test_clean test_acceptance_pre_run test_acceptance_run +test_acceptance_debug: test_clean test_acceptance_pre_run test_acceptance_run_debug + test_acceptance_run: @[ ! -d test/acceptance ] && echo "notifications has no acceptance tests" || $(DOCKER_COMPOSE) run --rm test_acceptance +test_acceptance_run_debug: + @[ ! -d test/acceptance ] && echo "notifications has no acceptance tests" || $(DOCKER_COMPOSE) run -p 127.0.0.9:19999:19999 --rm test_acceptance npm run test:acceptance -- --inspect=0.0.0.0:19999 --inspect-brk + test_clean: $(DOCKER_COMPOSE) down -v -t 0 diff --git a/services/notifications/buildscript.txt b/services/notifications/buildscript.txt index dd1e8290c2..c913d1ce84 100644 --- a/services/notifications/buildscript.txt +++ b/services/notifications/buildscript.txt @@ -7,4 +7,4 @@ notifications --dependencies=mongo,redis --docker-repos=gcr.io/overleaf-ops --env-pass-through= ---script-version=1.3.1 +--script-version=1.3.5 diff --git a/services/notifications/docker-compose.ci.yml b/services/notifications/docker-compose.ci.yml index 66470736dc..b99da9b18e 100644 --- a/services/notifications/docker-compose.ci.yml +++ b/services/notifications/docker-compose.ci.yml @@ -1,9 +1,9 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.3.1 +# Version: 1.3.5 -version: "2.1" +version: "2.3" services: test_unit: diff --git a/services/notifications/docker-compose.yml b/services/notifications/docker-compose.yml index b478b2666e..6a1bbb1005 100644 --- a/services/notifications/docker-compose.yml +++ b/services/notifications/docker-compose.yml @@ -1,9 +1,9 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.3.1 +# Version: 1.3.5 -version: "2.1" +version: "2.3" services: test_unit: From 00e15a383f1e40db7f7fa5eb4e345e8f790fb1ec Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Tue, 11 Feb 2020 10:08:35 +0100 Subject: [PATCH 2/2] [misc] fix prettier-eslint errors --- .../notifications/app/js/Notifications.js | 1 - .../unit/js/NotificationsControllerTest.js | 35 +++++++++++-------- .../test/unit/js/NotificationsTests.js | 35 +++++++++++-------- 3 files changed, 40 insertions(+), 31 deletions(-) diff --git a/services/notifications/app/js/Notifications.js b/services/notifications/app/js/Notifications.js index ec4007e50f..56cf979e72 100644 --- a/services/notifications/app/js/Notifications.js +++ b/services/notifications/app/js/Notifications.js @@ -124,7 +124,6 @@ module.exports = Notifications = { return db.notifications.remove(searchOps, { justOne: true }, callback) } } - ;['getUserNotifications', 'addNotification'].map(method => metrics.timeAsyncMethod(Notifications, method, 'mongo.Notifications', logger) ) diff --git a/services/notifications/test/unit/js/NotificationsControllerTest.js b/services/notifications/test/unit/js/NotificationsControllerTest.js index 219a72573a..f62b2c3c01 100644 --- a/services/notifications/test/unit/js/NotificationsControllerTest.js +++ b/services/notifications/test/unit/js/NotificationsControllerTest.js @@ -44,8 +44,8 @@ describe('Notifications Controller', function() { ]) }) - describe('getUserNotifications', () => - it('should ask the notifications for the users notifications', function(done) { + describe('getUserNotifications', function() { + return it('should ask the notifications for the users notifications', function(done) { this.notifications.getUserNotifications = sinon .stub() .callsArgWith(1, null, this.stubbedNotification) @@ -63,10 +63,11 @@ describe('Notifications Controller', function() { return done() } }) - })) + }) + }) - describe('addNotification', () => - it('should tell the notifications to add the notification for the user', function(done) { + describe('addNotification', function() { + return it('should tell the notifications to add the notification for the user', function(done) { this.notifications.addNotification = sinon.stub().callsArgWith(2) const req = { params: { @@ -82,10 +83,11 @@ describe('Notifications Controller', function() { return done() } }) - })) + }) + }) - describe('removeNotificationId', () => - it('should tell the notifications to mark the notification Id as read', function(done) { + describe('removeNotificationId', function() { + return it('should tell the notifications to mark the notification Id as read', function(done) { this.notifications.removeNotificationId = sinon.stub().callsArgWith(2) const req = { params: { @@ -101,10 +103,11 @@ describe('Notifications Controller', function() { return done() } }) - })) + }) + }) - describe('removeNotificationKey', () => - it('should tell the notifications to mark the notification Key as read', function(done) { + describe('removeNotificationKey', function() { + return it('should tell the notifications to mark the notification Key as read', function(done) { this.notifications.removeNotificationKey = sinon.stub().callsArgWith(2) const req = { params: { @@ -120,10 +123,11 @@ describe('Notifications Controller', function() { return done() } }) - })) + }) + }) - return describe('removeNotificationByKeyOnly', () => - it('should tell the notifications to mark the notification Key as read', function(done) { + return describe('removeNotificationByKeyOnly', function() { + return it('should tell the notifications to mark the notification Key as read', function(done) { this.notifications.removeNotificationByKeyOnly = sinon .stub() .callsArgWith(1) @@ -140,5 +144,6 @@ describe('Notifications Controller', function() { return done() } }) - })) + }) + }) }) diff --git a/services/notifications/test/unit/js/NotificationsTests.js b/services/notifications/test/unit/js/NotificationsTests.js index 3c2166f302..5683a0c47d 100644 --- a/services/notifications/test/unit/js/NotificationsTests.js +++ b/services/notifications/test/unit/js/NotificationsTests.js @@ -71,8 +71,8 @@ describe('Notifications Tests', function() { return (this.stubbedNotificationArray = [this.stubbedNotification]) }) - describe('getUserNotifications', () => - it('should find all notifications and return i', function(done) { + describe('getUserNotifications', function() { + return it('should find all notifications and return i', function(done) { this.findStub.callsArgWith(1, null, this.stubbedNotificationArray) return this.notifications.getUserNotifications( user_id, @@ -85,7 +85,8 @@ describe('Notifications Tests', function() { return done() } ) - })) + }) + }) describe('addNotification', function() { beforeEach(function() { @@ -234,8 +235,8 @@ describe('Notifications Tests', function() { }) }) - describe('removeNotificationId', () => - it('should mark the notification id as read', function(done) { + describe('removeNotificationId', function() { + return it('should mark the notification id as read', function(done) { this.updateStub.callsArgWith(2, null) return this.notifications.removeNotificationId( @@ -254,10 +255,11 @@ describe('Notifications Tests', function() { return done() } ) - })) + }) + }) - describe('removeNotificationKey', () => - it('should mark the notification key as read', function(done) { + describe('removeNotificationKey', function() { + return it('should mark the notification key as read', function(done) { this.updateStub.callsArgWith(2, null) return this.notifications.removeNotificationKey( @@ -276,10 +278,11 @@ describe('Notifications Tests', function() { return done() } ) - })) + }) + }) - describe('removeNotificationByKeyOnly', () => - it('should mark the notification key as read', function(done) { + describe('removeNotificationByKeyOnly', function() { + return it('should mark the notification key as read', function(done) { this.updateStub.callsArgWith(2, null) return this.notifications.removeNotificationByKeyOnly( @@ -292,10 +295,11 @@ describe('Notifications Tests', function() { return done() } ) - })) + }) + }) - return describe('deleteNotificationByKeyOnly', () => - it('should completely remove the notification', function(done) { + return describe('deleteNotificationByKeyOnly', function() { + return it('should completely remove the notification', function(done) { this.removeStub.callsArgWith(2, null) return this.notifications.deleteNotificationByKeyOnly( @@ -308,5 +312,6 @@ describe('Notifications Tests', function() { return done() } ) - })) + }) + }) })