ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Merge branch 'develop' of bitbucket.org:iterativ/skillbox into develop

This commit is contained in:
Christian Cueni 2019-04-16 08:22:39 +02:00
parent 6ae6a7cbdb 83721de7ea
commit d7cd5d2809
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/cypress/integration/current-module.spec.js
View File

@ -2,6 +2,8 @@ describe('Current Module', () => {
it('is set correctly', () => { it('is set correctly', () => {
// cy.route('POST', '/api/graphql/').as('graphQL'); // cy.route('POST', '/api/graphql/').as('graphQL');
cy.startGraphQLCapture(); cy.startGraphQLCapture();
cy.viewport('macbook-15');
cy.login('nico.zickgraf', 'test'); cy.login('nico.zickgraf', 'test');
cy.visit('/module/lohn-und-budget'); cy.visit('/module/lohn-und-budget');

1
client/cypress/integration/solutions.spec.js
View File

@ -19,6 +19,7 @@ describe('Solutions', () => {
// cy.wait('@graphQL'); // cy.wait('@graphQL');
// }); // });
// cy.logout(); // cy.logout();
cy.viewport('macbook-15');
cy.login('rahel.cueni', 'test'); cy.login('rahel.cueni', 'test');
cy.visit('/module/lohn-und-budget'); cy.visit('/module/lohn-und-budget');

2
client/src/components/HeaderBar.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<header class="header-bar"> <header class="header-bar">
<top-navigation></top-navigation> <top-navigation></top-navigation>
<router-link to="/" class="header-bar__logo"><logo></logo></router-link> <router-link to="/" class="header-bar__logo" data-cy="home-link"><logo></logo></router-link>
<div class="user-header"> <div class="user-header">
<user-widget v-bind="me"></user-widget> <user-widget v-bind="me"></user-widget>
<logout-widget></logout-widget> <logout-widget></logout-widget>

2
client/src/components/MobileHeader.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="mobile-header"> <div class="mobile-header">
<router-link to="/" data-cy="home-link"> <router-link to="/" data-cy="mobile-home-link">
<logo></logo> <logo></logo>
</router-link> </router-link>