From 75076b7d5af52db38f22cc2a65b98af342c410d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 14:54:39 +0100 Subject: [PATCH 01/37] Add Nitro-Web and Nitro-Backend as submodules --- .gitmodules | 6 ++++++ Nitro-Backend | 1 + Nitro-Web | 1 + 3 files changed, 8 insertions(+) create mode 160000 Nitro-Backend create mode 160000 Nitro-Web diff --git a/.gitmodules b/.gitmodules index 8161c1c4e..51e69c525 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,9 @@ [submodule "API"] path = API url = https://github.com/Human-Connection/API.git +[submodule "Nitro-Web"] + path = Nitro-Web + url = git@github.com:Human-Connection/Nitro-Web.git +[submodule "Nitro-Backend"] + path = Nitro-Backend + url = git@github.com:Human-Connection/Nitro-Backend.git diff --git a/Nitro-Backend b/Nitro-Backend new file mode 160000 index 000000000..4a8d3a67a --- /dev/null +++ b/Nitro-Backend @@ -0,0 +1 @@ +Subproject commit 4a8d3a67ad2cd57a3e37027a65be38c9896689bf diff --git a/Nitro-Web b/Nitro-Web new file mode 160000 index 000000000..8f42a1872 --- /dev/null +++ b/Nitro-Web @@ -0,0 +1 @@ +Subproject commit 8f42a1872993f9bfc9c47610d251889fdeb6a65e From cf48aa86d7c2541721383df881516e498050c8f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 14:55:45 +0100 Subject: [PATCH 02/37] Update API and WebApp submodules --- API | 2 +- WebApp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/API b/API index 8ea42b5b4..02dcc2285 160000 --- a/API +++ b/API @@ -1 +1 @@ -Subproject commit 8ea42b5b40dd16958b0887eb7bb9a70ec76909e6 +Subproject commit 02dcc2285c71ce8010ec0952a303e9a9f5e05798 diff --git a/WebApp b/WebApp index 6f88ca733..fa26d7c65 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit 6f88ca733fb09a4506fe12bb89c4557ce501e98d +Subproject commit fa26d7c65406220dcd617275d89f4a804911874c From b0bd5b8174564bfac8f339b8f65d6173f48ab063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 15:24:49 +0100 Subject: [PATCH 03/37] Coyp over files from webapp repository --- .gitignore | 3 + cypress/fixtures/example.json | 5 ++ cypress/integration/login/login.spec.js | 73 +++++++++++++++++++++++++ cypress/plugins/index.js | 17 ++++++ cypress/support/commands.js | 25 +++++++++ cypress/support/index.js | 20 +++++++ 6 files changed, 143 insertions(+) create mode 100644 cypress/fixtures/example.json create mode 100644 cypress/integration/login/login.spec.js create mode 100644 cypress/plugins/index.js create mode 100644 cypress/support/commands.js create mode 100644 cypress/support/index.js diff --git a/.gitignore b/.gitignore index 1d0565198..85e3cf3f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ /.github + +cypress/videos +cypress/screenshots/ diff --git a/cypress/fixtures/example.json b/cypress/fixtures/example.json new file mode 100644 index 000000000..da18d9352 --- /dev/null +++ b/cypress/fixtures/example.json @@ -0,0 +1,5 @@ +{ + "name": "Using fixtures to represent data", + "email": "hello@cypress.io", + "body": "Fixtures are a great way to mock data for responses to routes" +} \ No newline at end of file diff --git a/cypress/integration/login/login.spec.js b/cypress/integration/login/login.spec.js new file mode 100644 index 000000000..33054bb7d --- /dev/null +++ b/cypress/integration/login/login.spec.js @@ -0,0 +1,73 @@ +/// + +const loginTestUser = function () { + // Visiting our app before each test removes any state build up from + cy.visit('http://localhost:3000/') + .get('.layout-blank') + .should('be.visible') + + cy.location('pathname') + .should('contain', '/login') + + cy.get('input[name=email]') + .as('inputEmail') + .should('be.empty') + .and('have.attr', 'placeholder', 'Deine E-Mail') + .trigger('focus') + .type('user@example.org') + + cy.get('input[name=password]') + .as('inputPassword') + .should('be.empty') + // .and('have.attr', 'placeholder', 'Dein Passwort') + .trigger('focus') + .type('1234') + + cy.get('button[name=submit]') + .as('submitButton') + .should('be.visible') + .and('not.be.disabled') + .click() + + cy.get('@submitButton') + .should('be.disabled') + // .next('.snackbar') + + cy.get('.layout-default') + + cy.location('pathname') + .should('eq', '/') +} + +const logout = function () { + cy.visit('http://localhost:3000/logout') + + cy.location('pathname') + .should('contain', '/login') + + cy.get('.layout-blank') + .should('be.visible') +} + +context('Authentication', () => { + it('Login Testuser', loginTestUser) + + it('Login & Logout', function () { + // login + loginTestUser() + + // logout + logout() + }) + + it('Still logged in after page-reload', function () { + // login + loginTestUser() + + cy.reload() + .get('.layout-default') + + // logout + // logout() + }) +}) diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js new file mode 100644 index 000000000..fd170fba6 --- /dev/null +++ b/cypress/plugins/index.js @@ -0,0 +1,17 @@ +// *********************************************************** +// This example plugins/index.js can be used to load plugins +// +// You can change the location of this file or turn off loading +// the plugins file with the 'pluginsFile' configuration option. +// +// You can read more here: +// https://on.cypress.io/plugins-guide +// *********************************************************** + +// This function is called when a project is opened or re-opened (e.g. due to +// the project's config changing) + +module.exports = (on, config) => { + // `on` is used to hook into various events Cypress emits + // `config` is the resolved Cypress config +} diff --git a/cypress/support/commands.js b/cypress/support/commands.js new file mode 100644 index 000000000..c1f5a772e --- /dev/null +++ b/cypress/support/commands.js @@ -0,0 +1,25 @@ +// *********************************************** +// This example commands.js shows you how to +// create various custom commands and overwrite +// existing commands. +// +// For more comprehensive examples of custom +// commands please read more here: +// https://on.cypress.io/custom-commands +// *********************************************** +// +// +// -- This is a parent command -- +// Cypress.Commands.add("login", (email, password) => { ... }) +// +// +// -- This is a child command -- +// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... }) +// +// +// -- This is a dual command -- +// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... }) +// +// +// -- This is will overwrite an existing command -- +// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... }) diff --git a/cypress/support/index.js b/cypress/support/index.js new file mode 100644 index 000000000..d68db96df --- /dev/null +++ b/cypress/support/index.js @@ -0,0 +1,20 @@ +// *********************************************************** +// This example support/index.js is processed and +// loaded automatically before your test files. +// +// This is a great place to put global configuration and +// behavior that modifies Cypress. +// +// You can change the location of this file or turn off +// automatically serving support files with the +// 'supportFile' configuration option. +// +// You can read more here: +// https://on.cypress.io/configuration +// *********************************************************** + +// Import commands.js using ES2015 syntax: +import './commands' + +// Alternatively you can use CommonJS syntax: +// require('./commands') From 0243bfbec2aac27d855eebb8bf5857418c4fd9bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 15:26:07 +0100 Subject: [PATCH 04/37] Start with a .travis.yml and cypress run Build failures are expected --- .travis.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..6387d429d --- /dev/null +++ b/.travis.yml @@ -0,0 +1,17 @@ +language: node_js +node_js: + - "10" +cache: + yarn: true + directories: + - node_modules +services: + - docker + - neo4j + +install: + - git submodule update --remote --merge + - yarn global add cypress + +script: + - cypress run From 2d346448b37e84a6c177642110a09b00c74f81c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 15:44:35 +0100 Subject: [PATCH 05/37] Use https for submodules to avoid SSH key exchange --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 51e69c525..b2bde5a9f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,7 @@ url = https://github.com/Human-Connection/API.git [submodule "Nitro-Web"] path = Nitro-Web - url = git@github.com:Human-Connection/Nitro-Web.git + url = https://github.com/Human-Connection/Nitro-Web.git [submodule "Nitro-Backend"] path = Nitro-Backend - url = git@github.com:Human-Connection/Nitro-Backend.git + url = https://github.com/Human-Connection/Nitro-Backend.git From 3b807c5d050b8a3404cc8cb68cc0aec8d280ae97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 15:50:33 +0100 Subject: [PATCH 06/37] Add missing cypress.json --- cypress.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 cypress.json diff --git a/cypress.json b/cypress.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/cypress.json @@ -0,0 +1 @@ +{} From 203ab4b0c5aa1832d1debe2dfbb4cd0e0a5e86e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 15:53:42 +0100 Subject: [PATCH 07/37] Starting docker-containers in both repos --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6387d429d..68532110b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,5 +13,9 @@ install: - git submodule update --remote --merge - yarn global add cypress +before_install: + - cd Nitro-Backend && docker-compose start + - cd Nitro-Web && docker-compose start + script: - cypress run From 54b92c465f6046810202d2f554a273119d3b0001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 15:58:03 +0100 Subject: [PATCH 08/37] Update docker-compose on Travis CI --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml index 68532110b..ff610266c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,16 @@ services: - docker - neo4j +env: + - DOCKER_COMPOSE_VERSION=1.23.2 + +before_install: + - sudo rm /usr/local/bin/docker-compose + - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose + - chmod +x docker-compose + - sudo mv docker-compose /usr/local/bin + + install: - git submodule update --remote --merge - yarn global add cypress From e783acf97c377d8d84f41a2dccf44eb21a744f47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 16:00:51 +0100 Subject: [PATCH 09/37] Fix .yaml format --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff610266c..98e2b320f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,14 +18,12 @@ before_install: - chmod +x docker-compose - sudo mv docker-compose /usr/local/bin - install: - git submodule update --remote --merge - - yarn global add cypress - -before_install: - cd Nitro-Backend && docker-compose start - cd Nitro-Web && docker-compose start + - yarn global add cypress + script: - cypress run From fa617955d3c670465d1f4fb3d2d1086b1e28899d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 00:19:42 +0100 Subject: [PATCH 10/37] Up the containers and send to background --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 98e2b320f..d10012b19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,8 @@ before_install: install: - git submodule update --remote --merge - - cd Nitro-Backend && docker-compose start - - cd Nitro-Web && docker-compose start + - cd Nitro-Backend && docker-compose up -d + - cd Nitro-Web && docker-compose up -d - yarn global add cypress From 255f563206d5529385550584f4e6131298656df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 00:22:39 +0100 Subject: [PATCH 11/37] Ok, don't run neo4j to keep port 7687 up --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d10012b19..d9af5f64b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ cache: - node_modules services: - docker - - neo4j env: - DOCKER_COMPOSE_VERSION=1.23.2 From ce07ece4d61b0fc5ddd61dee9a5f572833f2504c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 00:29:39 +0100 Subject: [PATCH 12/37] Go back the directory tree --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d9af5f64b..9c10fced9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ before_install: install: - git submodule update --remote --merge - - cd Nitro-Backend && docker-compose up -d + - cd Nitro-Backend && docker-compose up -d && cd .. - cd Nitro-Web && docker-compose up -d - yarn global add cypress From e1137bd03f3606e2393474e93a585c52e28fa236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 00:47:58 +0100 Subject: [PATCH 13/37] Again one level up --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9c10fced9..d6245e739 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ before_install: install: - git submodule update --remote --merge - cd Nitro-Backend && docker-compose up -d && cd .. - - cd Nitro-Web && docker-compose up -d + - cd Nitro-Web && docker-compose up -d && cd .. - yarn global add cypress From 9b4279c162651d96fdd6d754c8278c8b35476fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 01:39:55 +0100 Subject: [PATCH 14/37] Wait on port 3000 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d6245e739..427b99d9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,8 @@ install: - cd Nitro-Backend && docker-compose up -d && cd .. - cd Nitro-Web && docker-compose up -d && cd .. - yarn global add cypress - + - yarn global add wait-on script: + - wait-on tcp:3000 - cypress run From cb215b850a2d0e6d9a713a16855f765e8273c9e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 01:51:13 +0100 Subject: [PATCH 15/37] Maybe `localhost` is not available on Travis CI? --- cypress/integration/login/login.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/integration/login/login.spec.js b/cypress/integration/login/login.spec.js index 33054bb7d..b608cfc4c 100644 --- a/cypress/integration/login/login.spec.js +++ b/cypress/integration/login/login.spec.js @@ -2,7 +2,7 @@ const loginTestUser = function () { // Visiting our app before each test removes any state build up from - cy.visit('http://localhost:3000/') + cy.visit('http://127.0.0.1:3000/') .get('.layout-blank') .should('be.visible') @@ -40,7 +40,7 @@ const loginTestUser = function () { } const logout = function () { - cy.visit('http://localhost:3000/logout') + cy.visit('http://127.0.0.1:3000/logout') cy.location('pathname') .should('contain', '/login') From 8ce9dedc0631dec13c462d659b2ef494e662afa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 01:54:23 +0100 Subject: [PATCH 16/37] Remove one `&` to increase build time? --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 427b99d9a..0042a49a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,8 @@ before_install: install: - git submodule update --remote --merge - - cd Nitro-Backend && docker-compose up -d && cd .. - - cd Nitro-Web && docker-compose up -d && cd .. + - cd Nitro-Backend && docker-compose up -d & cd .. + - cd Nitro-Web && docker-compose up -d & & cd .. - yarn global add cypress - yarn global add wait-on From 61e1a474a80615a90a041dc078eaf55a956baf94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 01:56:54 +0100 Subject: [PATCH 17/37] Merge all docker-compose files --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0042a49a3..6200fc5a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,7 @@ before_install: install: - git submodule update --remote --merge - - cd Nitro-Backend && docker-compose up -d & cd .. - - cd Nitro-Web && docker-compose up -d & & cd .. + - docker-compose -f Nitro-Backend/docker-compose.yml -f Nitro-Web/docker-compose.yml up -d - yarn global add cypress - yarn global add wait-on From d801e679e6e5e122afa5f9db43ddbe7c7ec00e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 02:19:22 +0100 Subject: [PATCH 18/37] Current dir relative to first docker-compose.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6200fc5a0..6a05a11b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,8 @@ before_install: install: - git submodule update --remote --merge - - docker-compose -f Nitro-Backend/docker-compose.yml -f Nitro-Web/docker-compose.yml up -d + - docker-compose -f Nitro-Backend/docker-compose.yml up -d + - docker-compose -f Nitro-Web/docker-compose.yml up -d - yarn global add cypress - yarn global add wait-on From 266072bcc9cb8eca7695d6f4c0fa63d516e9aab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 02:32:46 +0100 Subject: [PATCH 19/37] Wait for http connection instead of tcp --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6a05a11b9..bf28e8fb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,9 +21,8 @@ install: - git submodule update --remote --merge - docker-compose -f Nitro-Backend/docker-compose.yml up -d - docker-compose -f Nitro-Web/docker-compose.yml up -d - - yarn global add cypress - - yarn global add wait-on + - yarn global add cypress wait-on script: - - wait-on tcp:3000 + - wait-on http://localhost:3000 - cypress run From d2cde2154f0a002f7cbd087ca0f7bf7d2b45e09c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 11:46:51 +0100 Subject: [PATCH 20/37] Update submodules Backend is now on a commit that has npm-run-all which allows to run seed data in docker-compose. --- Nitro-Backend | 2 +- Nitro-Web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Nitro-Backend b/Nitro-Backend index 4a8d3a67a..46080fff9 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 4a8d3a67ad2cd57a3e37027a65be38c9896689bf +Subproject commit 46080fff98d5faae49d73beb1e19f0889a415642 diff --git a/Nitro-Web b/Nitro-Web index 8f42a1872..987fa33d5 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 8f42a1872993f9bfc9c47610d251889fdeb6a65e +Subproject commit 987fa33d58ea1708528f926511245a83eb221fce From 6ce9406188f41f0f745e95a67912f8fcad362f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 11:48:34 +0100 Subject: [PATCH 21/37] And run seed data on Travis CI --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index bf28e8fb2..b6d929be6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,5 +24,6 @@ install: - yarn global add cypress wait-on script: + - docker-compose -f Nitro-Backend/docker-compose.yml exec backend yarn run db:seed - wait-on http://localhost:3000 - cypress run From 287aa96a3fa9354bb170cdeeb471dc2dcc30eab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 11:55:34 +0100 Subject: [PATCH 22/37] Don't update submodules --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b6d929be6..293294218 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,6 @@ before_install: - sudo mv docker-compose /usr/local/bin install: - - git submodule update --remote --merge - docker-compose -f Nitro-Backend/docker-compose.yml up -d - docker-compose -f Nitro-Web/docker-compose.yml up -d - yarn global add cypress wait-on From 4b8ac0836c1eb34ea579b0f2120469e9b46467a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 12:08:27 +0100 Subject: [PATCH 23/37] Revert "Maybe `localhost` is not available on Travis CI?" This reverts commit cb215b850a2d0e6d9a713a16855f765e8273c9e5. --- cypress/integration/login/login.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/integration/login/login.spec.js b/cypress/integration/login/login.spec.js index b608cfc4c..33054bb7d 100644 --- a/cypress/integration/login/login.spec.js +++ b/cypress/integration/login/login.spec.js @@ -2,7 +2,7 @@ const loginTestUser = function () { // Visiting our app before each test removes any state build up from - cy.visit('http://127.0.0.1:3000/') + cy.visit('http://localhost:3000/') .get('.layout-blank') .should('be.visible') @@ -40,7 +40,7 @@ const loginTestUser = function () { } const logout = function () { - cy.visit('http://127.0.0.1:3000/logout') + cy.visit('http://localhost:3000/logout') cy.location('pathname') .should('contain', '/login') From 0abdb80b00fa8f2369c44b22e69dff268b2e18ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 12:54:04 +0100 Subject: [PATCH 24/37] Update Nitro-Web so cypress can find email input --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index 987fa33d5..8f02861b7 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 987fa33d58ea1708528f926511245a83eb221fce +Subproject commit 8f02861b7418b0e8931d4c5b347406b8a2d97b6e From bc5d75261bc5e59572902f582fdd16eac65978a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 13:26:28 +0100 Subject: [PATCH 25/37] Wire frontend and backend together --- Nitro-Backend | 2 +- Nitro-Web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Nitro-Backend b/Nitro-Backend index 46080fff9..94dbe5bf8 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 46080fff98d5faae49d73beb1e19f0889a415642 +Subproject commit 94dbe5bf82d276f95b37ab758366d52b78aa2bb2 diff --git a/Nitro-Web b/Nitro-Web index 8f02861b7..3f435194d 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 8f02861b7418b0e8931d4c5b347406b8a2d97b6e +Subproject commit 3f435194d1862e64e26ab57ddc133a49d260b364 From ef816b2d10835ef141d55eedc96cb2a0a571d5d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 13:37:42 +0100 Subject: [PATCH 26/37] Wrong network name in Nitro-Backend --- Nitro-Backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Backend b/Nitro-Backend index 94dbe5bf8..d8e326d8f 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 94dbe5bf82d276f95b37ab758366d52b78aa2bb2 +Subproject commit d8e326d8f8a7b0c00e350b64f13da7b9fe9e8299 From e102b6e3fe6b31d635bfd6612a94b7709e6f81a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 22:12:04 +0100 Subject: [PATCH 27/37] Update submodules --- Nitro-Backend | 2 +- Nitro-Web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Nitro-Backend b/Nitro-Backend index d8e326d8f..99a9d5159 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit d8e326d8f8a7b0c00e350b64f13da7b9fe9e8299 +Subproject commit 99a9d51596a8f3575d8637754af45a01992a37a0 diff --git a/Nitro-Web b/Nitro-Web index 3f435194d..d4d0eb88c 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 3f435194d1862e64e26ab57ddc133a49d260b364 +Subproject commit d4d0eb88cf369d5afa71faf04dc29d6aa8c1385d From 01497dddaafbdde0a3872df5f1e9fc3f487ca613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 22:47:43 +0100 Subject: [PATCH 28/37] Reduce verbosity of database seeding --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 293294218..95cce90b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,6 @@ install: - yarn global add cypress wait-on script: - - docker-compose -f Nitro-Backend/docker-compose.yml exec backend yarn run db:seed + - docker-compose -f Nitro-Backend/docker-compose.yml exec backend yarn run db:seed > /dev/null - wait-on http://localhost:3000 - cypress run From d461238d2e77cc5c3b2224e7fdf8f0335170bd5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 8 Dec 2018 23:19:13 +0100 Subject: [PATCH 29/37] This should be the first green build --- Nitro-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nitro-Web b/Nitro-Web index d4d0eb88c..64abd767e 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit d4d0eb88cf369d5afa71faf04dc29d6aa8c1385d +Subproject commit 64abd767e2bae0579ae776dba70d23db4b978c10 From 3802780ffde83fd4951840006d5a542fa9f57bd3 Mon Sep 17 00:00:00 2001 From: Grzegorz Leoniec Date: Sun, 9 Dec 2018 18:02:00 +0100 Subject: [PATCH 30/37] record test runs to https://dashboard.cypress.io/#/projects/qa7fe2/runs --- .travis.yml | 2 +- cypress.json | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 95cce90b5..25e9ad58c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,4 +25,4 @@ install: script: - docker-compose -f Nitro-Backend/docker-compose.yml exec backend yarn run db:seed > /dev/null - wait-on http://localhost:3000 - - cypress run + - cypress run --record --key $CYPRESS_TOKEN diff --git a/cypress.json b/cypress.json index 0967ef424..1f453389b 100644 --- a/cypress.json +++ b/cypress.json @@ -1 +1,3 @@ -{} +{ + "projectId": "qa7fe2" +} From 33290c32e0ad25d390fc1800850c274ceeea47fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 14:54:39 +0100 Subject: [PATCH 31/37] Add Nitro-Web and Nitro-Backend as submodules --- .gitmodules | 6 ++++++ API | 2 +- Nitro-Backend | 1 + Nitro-Web | 1 + WebApp | 2 +- 5 files changed, 10 insertions(+), 2 deletions(-) create mode 160000 Nitro-Backend create mode 160000 Nitro-Web diff --git a/.gitmodules b/.gitmodules index 8161c1c4e..51e69c525 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,9 @@ [submodule "API"] path = API url = https://github.com/Human-Connection/API.git +[submodule "Nitro-Web"] + path = Nitro-Web + url = git@github.com:Human-Connection/Nitro-Web.git +[submodule "Nitro-Backend"] + path = Nitro-Backend + url = git@github.com:Human-Connection/Nitro-Backend.git diff --git a/API b/API index 8ea42b5b4..02dcc2285 160000 --- a/API +++ b/API @@ -1 +1 @@ -Subproject commit 8ea42b5b40dd16958b0887eb7bb9a70ec76909e6 +Subproject commit 02dcc2285c71ce8010ec0952a303e9a9f5e05798 diff --git a/Nitro-Backend b/Nitro-Backend new file mode 160000 index 000000000..4a8d3a67a --- /dev/null +++ b/Nitro-Backend @@ -0,0 +1 @@ +Subproject commit 4a8d3a67ad2cd57a3e37027a65be38c9896689bf diff --git a/Nitro-Web b/Nitro-Web new file mode 160000 index 000000000..8f42a1872 --- /dev/null +++ b/Nitro-Web @@ -0,0 +1 @@ +Subproject commit 8f42a1872993f9bfc9c47610d251889fdeb6a65e diff --git a/WebApp b/WebApp index 6f88ca733..fa26d7c65 160000 --- a/WebApp +++ b/WebApp @@ -1 +1 @@ -Subproject commit 6f88ca733fb09a4506fe12bb89c4557ce501e98d +Subproject commit fa26d7c65406220dcd617275d89f4a804911874c From 579cc3492c40d8453865e3fda08971961b277580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 6 Dec 2018 15:24:49 +0100 Subject: [PATCH 32/37] Coyp over files from webapp repository --- .gitignore | 3 + .gitmodules | 4 +- .travis.yml | 28 ++++++++++ Nitro-Backend | 2 +- Nitro-Web | 2 +- cypress.json | 1 + cypress/fixtures/example.json | 5 ++ cypress/integration/login/login.spec.js | 73 +++++++++++++++++++++++++ cypress/plugins/index.js | 17 ++++++ cypress/support/commands.js | 25 +++++++++ cypress/support/index.js | 20 +++++++ 11 files changed, 176 insertions(+), 4 deletions(-) create mode 100644 .travis.yml create mode 100644 cypress.json create mode 100644 cypress/fixtures/example.json create mode 100644 cypress/integration/login/login.spec.js create mode 100644 cypress/plugins/index.js create mode 100644 cypress/support/commands.js create mode 100644 cypress/support/index.js diff --git a/.gitignore b/.gitignore index 1d0565198..85e3cf3f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ /.github + +cypress/videos +cypress/screenshots/ diff --git a/.gitmodules b/.gitmodules index 51e69c525..b2bde5a9f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,7 @@ url = https://github.com/Human-Connection/API.git [submodule "Nitro-Web"] path = Nitro-Web - url = git@github.com:Human-Connection/Nitro-Web.git + url = https://github.com/Human-Connection/Nitro-Web.git [submodule "Nitro-Backend"] path = Nitro-Backend - url = git@github.com:Human-Connection/Nitro-Backend.git + url = https://github.com/Human-Connection/Nitro-Backend.git diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..95cce90b5 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,28 @@ +language: node_js +node_js: + - "10" +cache: + yarn: true + directories: + - node_modules +services: + - docker + +env: + - DOCKER_COMPOSE_VERSION=1.23.2 + +before_install: + - sudo rm /usr/local/bin/docker-compose + - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose + - chmod +x docker-compose + - sudo mv docker-compose /usr/local/bin + +install: + - docker-compose -f Nitro-Backend/docker-compose.yml up -d + - docker-compose -f Nitro-Web/docker-compose.yml up -d + - yarn global add cypress wait-on + +script: + - docker-compose -f Nitro-Backend/docker-compose.yml exec backend yarn run db:seed > /dev/null + - wait-on http://localhost:3000 + - cypress run diff --git a/Nitro-Backend b/Nitro-Backend index 4a8d3a67a..99a9d5159 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit 4a8d3a67ad2cd57a3e37027a65be38c9896689bf +Subproject commit 99a9d51596a8f3575d8637754af45a01992a37a0 diff --git a/Nitro-Web b/Nitro-Web index 8f42a1872..64abd767e 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 8f42a1872993f9bfc9c47610d251889fdeb6a65e +Subproject commit 64abd767e2bae0579ae776dba70d23db4b978c10 diff --git a/cypress.json b/cypress.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/cypress.json @@ -0,0 +1 @@ +{} diff --git a/cypress/fixtures/example.json b/cypress/fixtures/example.json new file mode 100644 index 000000000..da18d9352 --- /dev/null +++ b/cypress/fixtures/example.json @@ -0,0 +1,5 @@ +{ + "name": "Using fixtures to represent data", + "email": "hello@cypress.io", + "body": "Fixtures are a great way to mock data for responses to routes" +} \ No newline at end of file diff --git a/cypress/integration/login/login.spec.js b/cypress/integration/login/login.spec.js new file mode 100644 index 000000000..33054bb7d --- /dev/null +++ b/cypress/integration/login/login.spec.js @@ -0,0 +1,73 @@ +/// + +const loginTestUser = function () { + // Visiting our app before each test removes any state build up from + cy.visit('http://localhost:3000/') + .get('.layout-blank') + .should('be.visible') + + cy.location('pathname') + .should('contain', '/login') + + cy.get('input[name=email]') + .as('inputEmail') + .should('be.empty') + .and('have.attr', 'placeholder', 'Deine E-Mail') + .trigger('focus') + .type('user@example.org') + + cy.get('input[name=password]') + .as('inputPassword') + .should('be.empty') + // .and('have.attr', 'placeholder', 'Dein Passwort') + .trigger('focus') + .type('1234') + + cy.get('button[name=submit]') + .as('submitButton') + .should('be.visible') + .and('not.be.disabled') + .click() + + cy.get('@submitButton') + .should('be.disabled') + // .next('.snackbar') + + cy.get('.layout-default') + + cy.location('pathname') + .should('eq', '/') +} + +const logout = function () { + cy.visit('http://localhost:3000/logout') + + cy.location('pathname') + .should('contain', '/login') + + cy.get('.layout-blank') + .should('be.visible') +} + +context('Authentication', () => { + it('Login Testuser', loginTestUser) + + it('Login & Logout', function () { + // login + loginTestUser() + + // logout + logout() + }) + + it('Still logged in after page-reload', function () { + // login + loginTestUser() + + cy.reload() + .get('.layout-default') + + // logout + // logout() + }) +}) diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js new file mode 100644 index 000000000..fd170fba6 --- /dev/null +++ b/cypress/plugins/index.js @@ -0,0 +1,17 @@ +// *********************************************************** +// This example plugins/index.js can be used to load plugins +// +// You can change the location of this file or turn off loading +// the plugins file with the 'pluginsFile' configuration option. +// +// You can read more here: +// https://on.cypress.io/plugins-guide +// *********************************************************** + +// This function is called when a project is opened or re-opened (e.g. due to +// the project's config changing) + +module.exports = (on, config) => { + // `on` is used to hook into various events Cypress emits + // `config` is the resolved Cypress config +} diff --git a/cypress/support/commands.js b/cypress/support/commands.js new file mode 100644 index 000000000..c1f5a772e --- /dev/null +++ b/cypress/support/commands.js @@ -0,0 +1,25 @@ +// *********************************************** +// This example commands.js shows you how to +// create various custom commands and overwrite +// existing commands. +// +// For more comprehensive examples of custom +// commands please read more here: +// https://on.cypress.io/custom-commands +// *********************************************** +// +// +// -- This is a parent command -- +// Cypress.Commands.add("login", (email, password) => { ... }) +// +// +// -- This is a child command -- +// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... }) +// +// +// -- This is a dual command -- +// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... }) +// +// +// -- This is will overwrite an existing command -- +// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... }) diff --git a/cypress/support/index.js b/cypress/support/index.js new file mode 100644 index 000000000..d68db96df --- /dev/null +++ b/cypress/support/index.js @@ -0,0 +1,20 @@ +// *********************************************************** +// This example support/index.js is processed and +// loaded automatically before your test files. +// +// This is a great place to put global configuration and +// behavior that modifies Cypress. +// +// You can change the location of this file or turn off +// automatically serving support files with the +// 'supportFile' configuration option. +// +// You can read more here: +// https://on.cypress.io/configuration +// *********************************************************** + +// Import commands.js using ES2015 syntax: +import './commands' + +// Alternatively you can use CommonJS syntax: +// require('./commands') From f43458ba3d42eceb6d9c2c7c0243a2c90849020d Mon Sep 17 00:00:00 2001 From: Grzegorz Leoniec Date: Sun, 9 Dec 2018 18:02:00 +0100 Subject: [PATCH 33/37] record test runs to https://dashboard.cypress.io/#/projects/qa7fe2/runs --- .travis.yml | 2 +- cypress.json | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 95cce90b5..25e9ad58c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,4 +25,4 @@ install: script: - docker-compose -f Nitro-Backend/docker-compose.yml exec backend yarn run db:seed > /dev/null - wait-on http://localhost:3000 - - cypress run + - cypress run --record --key $CYPRESS_TOKEN diff --git a/cypress.json b/cypress.json index 0967ef424..1f453389b 100644 --- a/cypress.json +++ b/cypress.json @@ -1 +1,3 @@ -{} +{ + "projectId": "qa7fe2" +} From 0a8aadbb2dae438de0c2692d11efeaa8019db1b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sun, 9 Dec 2018 23:23:36 +0100 Subject: [PATCH 34/37] Check out a common branch through environment var This will be useful if we trigger the build through the Travis CI API where we can alter the environment variables in the request. --- .travis.yml | 5 ++++- scripts/trigger.sh | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100755 scripts/trigger.sh diff --git a/.travis.yml b/.travis.yml index 25e9ad58c..489d0cc75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,9 @@ services: - docker env: - - DOCKER_COMPOSE_VERSION=1.23.2 + global: + - DOCKER_COMPOSE_VERSION=1.23.2 + - COMMON_BRANCH=master before_install: - sudo rm /usr/local/bin/docker-compose @@ -18,6 +20,7 @@ before_install: - sudo mv docker-compose /usr/local/bin install: + - git submodule foreach "git checkout $COMMON_BRANCH || echo 'Branch \`$COMMON_BRANCH\` does not exist, falling back to master.'" - docker-compose -f Nitro-Backend/docker-compose.yml up -d - docker-compose -f Nitro-Web/docker-compose.yml up -d - yarn global add cypress wait-on diff --git a/scripts/trigger.sh b/scripts/trigger.sh new file mode 100755 index 000000000..ef430dc2c --- /dev/null +++ b/scripts/trigger.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +body=$(cat<< EOF +{ + "request": { + "branch":"e2e", + "message": "Triggered by \`$TRAVIS_REPO_SLUG\` on \`$TRAVIS_BRANCH\`", + "config": { + "merge_mode": "deep_merge", + "env": { + "global": { + "DOCKER_COMPOSE_VERSION":"1.23.2", + "COMMON_BRANCH": "$TRAVIS_BRANCH" + } + } + } + } +} +EOF +) + +curl -s -X POST \ + -H "Content-Type: application/json" \ + -H "Accept: application/json" \ + -H "Travis-API-Version: 3" \ + -H "Authorization: token $TRAVIS_TOKEN" \ + -d "$body" \ + https://api.travis-ci.com/repo/Human-Connection%2FHuman-Connection/requests From 4489bbe662c2caf3e5be06d425d3a147c05fd57b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Mon, 10 Dec 2018 00:27:55 +0100 Subject: [PATCH 35/37] Use `export` for Travis variable for convenience This way, we don't need to set the environment variable in the `trigger_build.sh` script. --- .travis.yml | 5 ++--- scripts/{trigger.sh => trigger_build.sh} | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) rename scripts/{trigger.sh => trigger_build.sh} (81%) mode change 100755 => 100644 diff --git a/.travis.yml b/.travis.yml index 489d0cc75..de984cc66 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,11 +9,10 @@ services: - docker env: - global: - - DOCKER_COMPOSE_VERSION=1.23.2 - - COMMON_BRANCH=master + - COMMON_BRANCH=master before_install: + - export DOCKER_COMPOSE_VERSION=1.23.2 - sudo rm /usr/local/bin/docker-compose - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose - chmod +x docker-compose diff --git a/scripts/trigger.sh b/scripts/trigger_build.sh old mode 100755 new mode 100644 similarity index 81% rename from scripts/trigger.sh rename to scripts/trigger_build.sh index ef430dc2c..bac40e3a0 --- a/scripts/trigger.sh +++ b/scripts/trigger_build.sh @@ -8,10 +8,7 @@ body=$(cat<< EOF "config": { "merge_mode": "deep_merge", "env": { - "global": { - "DOCKER_COMPOSE_VERSION":"1.23.2", - "COMMON_BRANCH": "$TRAVIS_BRANCH" - } + "COMMON_BRANCH": "$TRAVIS_BRANCH" } } } From 6e9348a6d3580afff8051e4228fa9551606c058c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Mon, 10 Dec 2018 00:30:31 +0100 Subject: [PATCH 36/37] Set executable permission on `trigger_build.sh` --- scripts/trigger_build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/trigger_build.sh diff --git a/scripts/trigger_build.sh b/scripts/trigger_build.sh old mode 100644 new mode 100755 From 2d330e5b85bfae216c627b40f040d1215f23a933 Mon Sep 17 00:00:00 2001 From: Grzegorz Leoniec Date: Mon, 10 Dec 2018 13:24:55 +0100 Subject: [PATCH 37/37] removed fixed branch in triffer_build.sh --- scripts/trigger_build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/trigger_build.sh b/scripts/trigger_build.sh index bac40e3a0..53519dda4 100755 --- a/scripts/trigger_build.sh +++ b/scripts/trigger_build.sh @@ -3,7 +3,6 @@ body=$(cat<< EOF { "request": { - "branch":"e2e", "message": "Triggered by \`$TRAVIS_REPO_SLUG\` on \`$TRAVIS_BRANCH\`", "config": { "merge_mode": "deep_merge",