Merge branch 'master' into dependabot/npm_and_yarn/nodemon-1.18.8

This commit is contained in:
Grzegorz Leoniec 2018-12-12 14:09:05 +01:00 committed by GitHub
commit 61a85f6eea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 172 additions and 6 deletions

View File

@ -6,5 +6,8 @@ npm-debug.log
Dockerfile
docker-compose*.yml
scripts/
.env
cypress/

3
.gitignore vendored
View File

@ -75,3 +75,6 @@ dist
# TEMORIRY
static/uploads
cypress/videos
cypress/screenshots/

View File

@ -1,23 +1,40 @@
language: node_js
node_js:
- "10"
services:
- docker
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 build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT -t humanconnection/nitro-web .
- docker-compose -f docker-compose.yml up -d
- git clone --depth=50 https://github.com/Human-Connection/Nitro-Backend.git ../Nitro-Backend
- git --work-tree=../Nitro-Backend checkout $TRAVIS_BRANCH || echo "Branch \`$TRAVIS_BRANCH\` does not exist, falling back to \`master\`"
- docker-compose -f ../Nitro-Backend/docker-compose.yml up -d
- yarn global add cypress wait-on
script:
- docker run humanconnection/nitro-web yarn run lint
- docker-compose exec webapp yarn run lint
- 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
after_success:
# - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh
# - chmod +x send.sh
# - ./send.sh success $WEBHOOK_URL
- wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh
- chmod +x send.sh
- ./send.sh success $WEBHOOK_URL
- if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_EVENT_TYPE == "push" ]; then
docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD";
docker tag humanconnection/nitro-web humanconnection/nitro-web:latest;

3
cypress.json Normal file
View File

@ -0,0 +1,3 @@
{
"projectId": "qa7fe2"
}

View File

@ -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"
}

View File

@ -0,0 +1,73 @@
/// <reference types="Cypress" />
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()
})
})

17
cypress/plugins/index.js Normal file
View File

@ -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
}

View File

@ -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) => { ... })

20
cypress/support/index.js Normal file
View File

@ -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')