Verified Commit ad6c09ba authored by Peter Stanko's avatar Peter Stanko
Browse files

Fixed tests with nested schemas

parent 685ee27e

docs/prirucka.adoc

+5 −5
Original line number Diff line number Diff line
@@ -181,15 +181,15 @@ flask courses create <course_codename> # voliteľné: vytvorí vzorový kurz s d 


**Vzorové dáta** pre **vývojárske prostredie** obsahujú:



* kurz `TestCourse1`

* kurz `TestCourse2`

* kurz `testcourse1`

* kurz `testcourse2`

* používateľa `student1` (heslo 123456)

** študent kurzu TestCourse1

** študent kurzu testcourse1

* používateľa `student2` (heslo 123456)

** študent oboch kurzov

* používateľa `teacher1` (heslo 123123)

** vyučujúci kurzu TestCourse1

** študent kurzu TestCourse2

** vyučujúci kurzu testcourse1

** študent kurzu testcourse2

* používateľa `teacher2` (heslo 123123)

** vyučujúci oboch kurzov

* používateľa `lecturer1` (heslo 654321)

management/data/data_dev.py

+4 −4
Original line number Diff line number Diff line
@@ -43,9 +43,9 @@ def init_dev_data(app: Flask, db: SQLAlchemy): 


        # courses

        test_course1 = factory.create_course(

            codename='TestCourse1', name='Test Course One')

            codename='testcourse1', name='Test Course One')

        test_course2 = factory.create_course(

            codename='TestCourse2', name='test Course Two')

            codename='testcourse2', name='test Course Two')



        # groups

        tc1_students = factory.create_group(
@@ -61,7 +61,7 @@ def init_dev_data(app: Flask, db: SQLAlchemy): 
        tc1_hw01 = get_project(factory=factory, course=test_course1, num=1)

        tc1_hw03 = get_project(factory=factory, course=test_course1, num=3)

        tc1_hw02 = factory.create_project(

            course=test_course1, name="HW02", config=dict(

            course=test_course1, name="HW02", codename='hw02', config=dict(

                file_whitelist="main.cpp\nfunc.hpp\nfunc.cpp",

                pre_submit_script="python for kontr pre",

                post_submit_script="python for kontr post",
@@ -74,7 +74,7 @@ def init_dev_data(app: Flask, db: SQLAlchemy): 
        )



        tc2_hw01 = factory.create_project(

            course=test_course2, name="HW01", config=dict(

            course=test_course2, name="HW01", codename='hw01', config=dict(

                file_whitelist="main.c", pre_submit_script="python for kontr pre",

                post_submit_script="python for kontr post",

                submission_scheduler_config="python for sub Q",

management/data/data_test.py

+5 −5
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ def init_test_data(app: Flask, db: SQLAlchemy): 


        # courses

        test_course1 = factory.create_course(

            codename='TestCourse1', name='Test Course One')

            codename='testcourse1', name='Test Course One')

        test_course2 = factory.create_course(

            codename='TestCourse2', name='test Course Two')

            codename='testcourse2', name='test Course Two')



        # groups

        tc1_students = factory.create_group(
@@ -42,7 +42,7 @@ def init_test_data(app: Flask, db: SQLAlchemy): 
            course=test_course2, name="teachers")



        tc1_hw01 = factory.create_project(

            course=test_course1, name="HW01", config=dict(

            course=test_course1, name="HW01", codename='hw01', config=dict(

                file_whitelist="main.cpp",

                pre_submit_script="python for kontr pre",

                post_submit_script="python for kontr post",
@@ -54,7 +54,7 @@ def init_test_data(app: Flask, db: SQLAlchemy): 
            )

        )

        tc1_hw02 = factory.create_project(

            course=test_course1, name="HW02", config=dict(

            course=test_course1, name="HW02", codename='HW02', config=dict(

                file_whitelist="main.cpp\nfunc.hpp\nfunc.cpp",

                pre_submit_script="python for kontr pre",

                post_submit_script="python for kontr post",
@@ -67,7 +67,7 @@ def init_test_data(app: Flask, db: SQLAlchemy): 
        )



        tc2_hw01 = factory.create_project(

            course=test_course2, name="HW01", config=dict(

            course=test_course2, name="HW01", codename='hw01', config=dict(

                file_whitelist="main.c", pre_submit_script="python for kontr pre",

                post_submit_script="python for kontr post",

                submission_scheduler_config="python for sub Q",

management/data/shared.py

+2 −5
Original line number Diff line number Diff line
@@ -132,14 +132,11 @@ class DataFactory(object): 
        role.description = desc or f"{name.capitalize()}'s role"

        return role



    def create_project(self, course, name,

                       test_files_source=None, config=None) -> Project:

        test_files_source = test_files_source or f"git://{name}.repo"

    def create_project(self, course, name, codename, config=None) -> Project:

        config = config or {}

        desc = name + "'s description"

        project = self.__create_entity(Project, course=course, name=name,

                                       test_files_source=test_files_source,

                                       description=desc)

                                       codename=codename, description=desc)

        project.set_config(**config)

        return project

portal/rest/components.py

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ class ComponentResource(Resource): 
        permissions.require_sysadmin(client)



        data = rest_helpers.parse_request_data(

            component_schema, action='update', resource='component'

            component_schema, action='update', resource='component', partial=True

        )



        component = find_component(cid)