diff --git a/.gitignore b/.gitignore index 85e3cf3f7..1d0565198 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ /.github - -cypress/videos -cypress/screenshots/ diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index de984cc66..000000000 --- a/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -language: node_js -node_js: - - "10" -cache: - yarn: true - directories: - - node_modules -services: - - docker - -env: - - 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 - - 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 - -script: - - docker-compose -f Nitro-Backend/docker-compose.yml exec backend yarn run db:seed > /dev/null - - wait-on http://localhost:3000 - - cypress run --record --key $CYPRESS_TOKEN diff --git a/Nitro-Backend b/Nitro-Backend index bed0f819f..99a9d5159 160000 --- a/Nitro-Backend +++ b/Nitro-Backend @@ -1 +1 @@ -Subproject commit bed0f819ffcc8c3a28042e13cecc52d42a0eb143 +Subproject commit 99a9d51596a8f3575d8637754af45a01992a37a0 diff --git a/Nitro-Web b/Nitro-Web index 6f782efbf..64abd767e 160000 --- a/Nitro-Web +++ b/Nitro-Web @@ -1 +1 @@ -Subproject commit 6f782efbfbecb20e5957533430ec27520538aa49 +Subproject commit 64abd767e2bae0579ae776dba70d23db4b978c10 diff --git a/cypress.json b/cypress.json deleted file mode 100644 index 1f453389b..000000000 --- a/cypress.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "projectId": "qa7fe2" -} diff --git a/cypress/fixtures/example.json b/cypress/fixtures/example.json deleted file mode 100644 index da18d9352..000000000 --- a/cypress/fixtures/example.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 33054bb7d..000000000 --- a/cypress/integration/login/login.spec.js +++ /dev/null @@ -1,73 +0,0 @@ -/// - -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 deleted file mode 100644 index fd170fba6..000000000 --- a/cypress/plugins/index.js +++ /dev/null @@ -1,17 +0,0 @@ -// *********************************************************** -// 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 deleted file mode 100644 index c1f5a772e..000000000 --- a/cypress/support/commands.js +++ /dev/null @@ -1,25 +0,0 @@ -// *********************************************** -// 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 deleted file mode 100644 index d68db96df..000000000 --- a/cypress/support/index.js +++ /dev/null @@ -1,20 +0,0 @@ -// *********************************************************** -// 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') diff --git a/scripts/trigger_build.sh b/scripts/trigger_build.sh deleted file mode 100755 index 53519dda4..000000000 --- a/scripts/trigger_build.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -body=$(cat<< EOF -{ - "request": { - "message": "Triggered by \`$TRAVIS_REPO_SLUG\` on \`$TRAVIS_BRANCH\`", - "config": { - "merge_mode": "deep_merge", - "env": { - "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