diff --git a/client/cypress/integration/bookmarks.spec.js b/client/cypress/integration/bookmarks.spec.js
new file mode 100644
index 00000000..4ea14296
--- /dev/null
+++ b/client/cypress/integration/bookmarks.spec.js
@@ -0,0 +1,39 @@
+describe('Survey', () => {
+ beforeEach(() => {
+ cy.exec("python ../server/manage.py prepare_bookmarks_for_cypress");
+
+ cy.viewport('macbook-15');
+ cy.startGraphQLCapture();
+ cy.login('rahel.cueni', 'test', true);
+ cy.get('body').contains('Neues Wissen erwerben');
+ });
+
+ it('should bookmark content block', () => {
+ cy.visit('/module/lohn-und-budget/');
+
+ cy.get('.content-component').contains('Das folgende Interview').parent().parent().as('interviewContent');
+
+ cy.get('@interviewContent').within(() => {
+ cy.get('.bookmark-actions__bookmark').click();
+ cy.get('.bookmark-actions__add-note').click();
+ });
+
+ cy.get('[data-cy=bookmark-note]').within(() => {
+ cy.get('.skillbox-input').type('Hallo Velo');
+ });
+
+ cy.get('[data-cy=modal-save-button]').click();
+
+ cy.get('@interviewContent').within(() => {
+ cy.get('.bookmark-actions__edit-note').click();
+
+ });
+
+ cy.get('[data-cy=bookmark-note]').within(() => {
+ cy.get('.skillbox-input').clear().type('Hello Bike');
+ });
+
+ cy.get('[data-cy=modal-save-button]').click();
+ });
+
+});
diff --git a/client/cypress/support/commands.js b/client/cypress/support/commands.js
index f76b462c..b454f50c 100644
--- a/client/cypress/support/commands.js
+++ b/client/cypress/support/commands.js
@@ -24,6 +24,7 @@
// -- This is will overwrite an existing command --
// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
+// todo: replace with apollo call
Cypress.Commands.add("login", (username, password, visitLogin=false) => {
if (visitLogin) {
cy.visit('/login');
diff --git a/client/src/App.vue b/client/src/App.vue
index bdf12aba..b4cf809e 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -13,7 +13,7 @@
import FullScreenLayout from '@/layouts/FullScreenLayout';
import PublicLayout from '@/layouts/PublicLayout';
import Modal from '@/components/Modal';
- import MobileNavigation from '@/components/MobileNavigation';
+ import MobileNavigation from '@/components/book-navigation/MobileNavigation';
import NewContentBlockWizard from '@/components/content-block-form/NewContentBlockWizard';
import EditContentBlockWizard from '@/components/content-block-form/EditContentBlockWizard';
import NewRoomEntryWizard from '@/components/rooms/room-entries/NewRoomEntryWizard';
diff --git a/client/src/components/AssignmentWithSubmissions.vue b/client/src/components/AssignmentWithSubmissions.vue
index 9381c655..f058086c 100644
--- a/client/src/components/AssignmentWithSubmissions.vue
+++ b/client/src/components/AssignmentWithSubmissions.vue
@@ -1,24 +1,35 @@
{{assignment.assignment}} {{assignment.solution}} Zu diesem Auftrag sind noch keine Ergebnisse vorhanden Zu diesem Auftrag sind noch keine Ergebnisse vorhanden Lernende Ergebnisse FeedbackAufgabe
-
Lösung
{{chapter.description}}
@@ -18,15 +26,20 @@ diff --git a/client/src/components/book-navigation/BookTopicNavigation.vue b/client/src/components/book-navigation/BookTopicNavigation.vue index edf1ddb7..83671191 100644 --- a/client/src/components/book-navigation/BookTopicNavigation.vue +++ b/client/src/components/book-navigation/BookTopicNavigation.vue @@ -1,11 +1,12 @@