From 6e391cd7c7262514ccaedc33bd21b57d97b2ffb3 Mon Sep 17 00:00:00 2001
From: "robinwilliam.hundt" <robinwilliam.hundt@stud.uni-goettingen.de>
Date: Thu, 10 Oct 2019 15:59:02 +0200
Subject: [PATCH] Bumped Min. req. Hektor version of import to 4.0.0
---
core/tests/test_import_views.py | 2 +-
functional_tests/data/hektor.json | 2 +-
functional_tests/util.py | 1 +
util/importer.py | 6 +++---
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/core/tests/test_import_views.py b/core/tests/test_import_views.py
index 3d78b199..3784b85f 100644
--- a/core/tests/test_import_views.py
+++ b/core/tests/test_import_views.py
@@ -6,7 +6,7 @@ from util.factories import GradyUserFactory
test_data = {
"meta": {
- "version": "3.0.0"
+ "version": "4.0.0"
},
"module": {
"module_reference": "test",
diff --git a/functional_tests/data/hektor.json b/functional_tests/data/hektor.json
index 19ecbb0a..571ab05f 100644
--- a/functional_tests/data/hektor.json
+++ b/functional_tests/data/hektor.json
@@ -1,6 +1,6 @@
{
"meta": {
- "version": "3.0.0"
+ "version": "4.0.0"
},
"module": {
"module_reference": "B.Inf.1801",
diff --git a/functional_tests/util.py b/functional_tests/util.py
index b83992ae..42911a3e 100644
--- a/functional_tests/util.py
+++ b/functional_tests/util.py
@@ -18,6 +18,7 @@ def create_browser() -> webdriver.Firefox:
options = Options()
options.headless = bool(os.environ.get('HEADLESS_TESTS', False))
options.set_capability('unhandledPromptBehavior', 'accept')
+ options.set_capability('strictFileInteractability', False)
profile = FirefoxProfile()
profile.set_preference("dom.disable_beforeunload", True)
profile.set_preference("browser.download.folderList", 2)
diff --git a/util/importer.py b/util/importer.py
index 70b8a810..21fa74e7 100644
--- a/util/importer.py
+++ b/util/importer.py
@@ -29,8 +29,8 @@ PASSWORDS = '.importer_passwords'
YES = 'Y/n'
NO = 'y/N'
-RUSTY_HEKTOR_MIN_VER = ">=3.0.0"
-RUSTY_HEKTOR_MAX_VER = "<4.0.0"
+RUSTY_HEKTOR_MIN_VER = ">=4.0.0"
+RUSTY_HEKTOR_MAX_VER = "<5.0.0"
valid = {"yes": True, "y": True, "ye": True, "no": False, "n": False}
@@ -158,7 +158,7 @@ def load_reviewers():
store_pw=True)
-def add_submission(student_obj, code, tests, type=None):
+def add_submission(student_obj, code, tests, type=None, display_code=None):
submission_type_obj = SubmissionType.objects.get(name=type)
submission_obj, _ = Submission.objects.update_or_create(
--
GitLab