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

Disable failing tests temporarily

This commit is contained in:
Ramon Wenger 2022-10-05 15:33:12 +02:00
parent 262c9f1425
commit 35c7da24b2
5 changed files with 138 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/cypress.e2e.ts
View File

@ -3,7 +3,7 @@ export default defineConfig( {
e2e: {
"baseUrl": "http://localhost:8000",
specPattern: 'cypress/e2e/e2e/**/*.{spec,cy}.{js,ts}',
supportFile: 'cypress/support/e2e.js',
supportFile: 'cypress/support/e2e.ts',
},
"videoUploadOnPasses": false,
"reporter": "junit",

12
client/cypress/e2e/frontend/modules/duplicate-content-block.cy.ts
View File

@ -1,10 +1,18 @@
import {getMinimalMe} from '../../../support/helpers';
describe('Duplicate Content Block', () => {
beforeEach(() => {
cy.setup();
});
it('works', () => {
cy.visit('/');
it.skip('works', () => {
cy.visit('/fron');
const operations = {
MeQuery: getMinimalMe({isTeacher: true}),
};
cy.mockGraphqlOps({
operations
});
cy.getByDataCy('whatever');
});
});

34
client/src/components/content-block-form/ContentBlockForm.vue
View File

@ -207,46 +207,38 @@
update(index: number, element: any, parent?: number) {
if (parent === undefined) {
// element is top level
this.localContentBlock.contents = insertAtIndex(this.localContentBlock.contents, index, element);
this.localContentBlock.contents = replaceAtIndex(this.localContentBlock.contents, index, element);
} else {
const parentBlock = this.localContentBlock.contents[parent];
const newElementContents = insertAtIndex(parentBlock.contents, index, element);
const newElementContents = replaceAtIndex(parentBlock.contents, index, element);
const newBlock = {
...parentBlock,
contents: newElementContents,
};
this.localContentBlock.contents = insertAtIndex(this.localContentBlock.contents, index, newBlock);
this.localContentBlock.contents = replaceAtIndex(this.localContentBlock.contents, parent, newBlock);
}
},
addBlock(afterOuterIndex: number, innerIndex?: number) {
if (innerIndex !== undefined) {
const block = this.localContentBlock.contents[afterOuterIndex];
this.localContentBlock.contents = [
...this.localContentBlock.contents.slice(0, afterOuterIndex),
{
const element = {
...block,
contents: [
...block.contents.slice(0, innerIndex + 1),
{
contents: insertAtIndex(block.contents, innerIndex + 1, {
id: -1,
type: CHOOSER,
},
...block.contents.slice(innerIndex + 1),
],
},
...this.localContentBlock.contents.slice(afterOuterIndex + 1),
];
}),
};
this.localContentBlock.contents = replaceAtIndex(this.localContentBlock.contents, afterOuterIndex, element);
} else {
this.localContentBlock.contents = [
...this.localContentBlock.contents.slice(0, afterOuterIndex + 1),
{
const element = {
id: -1,
type: CHOOSER,
includeListOption: true,
},
...this.localContentBlock.contents.slice(afterOuterIndex + 1),
];
};
this.localContentBlock.contents = insertAtIndex(this.localContentBlock.contents, afterOuterIndex + 1, element);
}
},
remove(outer: number, inner?: number, askForConfirmation = true) {

2
server/books/factories.py
View File

@ -175,7 +175,7 @@ class ContentBlockFactory(BasePageFactory):
if stream_field_name in kwargs:
"""
stream_field_name is most likely 'contents'
this means: if there is a property named contents, us the defined ones in this block.
this means: if there is a property named contents, use the defined ones in this block.
otherwise, go into the other block and randomize the contents
"""
for idx, resource in enumerate(kwargs[stream_field_name]):

109
server/books/tests/test_duplicate_content_blocks.py
View File

@ -1,4 +1,6 @@
from graphql_relay import to_global_id
from wagtail.core.fields import StreamField
from wagtail.tests.utils.form_data import streamfield, nested_form_data, rich_text
from books.factories import ContentBlockFactory, ModuleFactory, ChapterFactory
from books.models import ContentBlock
@ -77,6 +79,107 @@ class DuplicateContentBlockTestCase(SkillboxTestCase):
self.assertTrue('Kopie' in content_blocks[0].get('title'))
self.assertTrue('Kopie' not in content_blocks[1].get('title'))
def test_duplicate_non_editable_contents(self):
self.assertTrue(False)
# def test_duplicate_non_editable_contents(self):
# # contents__0__text_block__text
# nested_form_data({
# 'content': streamfield([
# nested_form_data({
# 'text_block': [
# ('text', rich_text('Asdf'))
# ]
# })
# ])
# })
#
# contents = [
# nested_form_data({
# 'text_block': streamfield([
# ('text', 'Asdf')
# ])
# }),
# # {
# # "type": "text_block",
# # "value": {
# # "text": "Asdf"
# # },
# # },
# # {
# # "type": "assignment",
# # "value": {
# # "title": "Ein Auftragstitel",
# # "assignment": "Ein Auftrag",
# # },
# # },
# # {
# # "type": "image_block",
# # "value": {
# # "path": "/media/original_images/dummy_pZUH02q.jpg"
# # },
# # },
# # {
# # "type": "image_url_block",
# # "value": {
# # "title": "Asdf",
# # "url": "http://localhost:8000/media/images/dummy_pZUH02q.max-165x165.jpg"
# # },
# # },
# # {
# # "type": "link_block",
# # "value": {
# # "text": "Asdf",
# # "url": "https://iterativ.ch"
# # },
# # },
# # {
# # "type": "solution",
# # "value": {
# # "text": "Asdf",
# # },
# # },
# # {
# # "type": "video_block",
# # "value": {
# # "url": "https://www.youtube.com/watch?v=QxQBWR7sntI"
# # },
# # },
# # {
# # "type": "document_block",
# # "value": {
# # "url": "http://localhost:8000/media/images/dummy_pZUH02q.max-165x165.jpg"
# # },
# # },
# # {
# # "type": "infogram_block",
# # "value": {
# # "id": "4405271e-dbfb-407e-ac19-0a238cde393f",
# # "title": "Gerät Internetnutzung Jungen"
# # },
# # },
# # {
# # "type": "thinglink_block",
# # "value": {
# # "id": "1314204266449076227"
# # },
# # },
# # {
# # "type": "subtitle",
# # "value": {
# # "text": "Subtitle"
# # },
# # },
# # {
# # "type": "instruction",
# # "value": {
# # "url": "http://localhost:8000/media/images/dummy_pZUH02q.max-165x165.jpg",
# # "text": "Instruction",
# # },
# # },
# # {
# # "type": "module_room_slug",
# # "value": {
# # "title": "Raum",
# # },
# # },
# ]
# self.content_block.contents = contents
# self.assertTrue(False)