Merge branch 'release-48.0.0'

oat-sa · Nov 6, 2023 · 45e87f2 · 45e87f2
2 parents 1a43d17 + 2e0a70e
commit 45e87f2
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 26 deletions.
diff --git a/models/classes/export/AbstractQtiTestExporter.php b/models/classes/export/AbstractQtiTestExporter.php
@@ -159,6 +159,10 @@ protected function preProcessing(): void
     /** Export the test definition and all its dependencies (media, items, ...) into the related ZIP archive. */
     public function export(array $options = []): Report
     {
+        if ($options['manifest']) {
+            $this->setManifest($options['manifest']);
+        }
+
         $this->preProcessing();
 
         // 1. Export the items bound to the test.

diff --git a/models/classes/export/AbstractTestExport.php b/models/classes/export/AbstractTestExport.php
@@ -111,8 +111,10 @@ public function export($formValues, $destination): Report
             throw new common_Exception(sprintf('Unable to create ZIP archive for QTI Test at location "%s".', $path));
         }
 
+        $manifest = $this->getServiceManager()->get(QtiTestUtils::SERVICE_ID)->emptyImsManifest(static::VERSION);
+
         foreach ($instances as $instance) {
-            $subReport = $this->getTestExporter($this->getResource($instance))->export();
+            $subReport = $this->getTestExporter($this->getResource($instance))->export(['manifest' => $manifest]);
             if (
                 $report->getType() !== ReportInterface::TYPE_ERROR &&
                 ($subReport->containsError() || $subReport->getType() === ReportInterface::TYPE_ERROR)
@@ -151,7 +153,7 @@ protected function getExportingFileName(string $userDefinedName): string
         return sprintf('%s_%d.zip', $userDefinedName, time());
     }
 
-    protected function getManifest()
+    protected function getEmptyManifest()
     {
         return $this->getServiceManager()->get(QtiTestUtils::SERVICE_ID)->emptyImsManifest(static::VERSION);
     }

diff --git a/models/classes/export/Formats/Package2p1/TestPackageExport.php b/models/classes/export/Formats/Package2p1/TestPackageExport.php
@@ -46,7 +46,7 @@ protected function getFormTitle(): string
      */
     protected function getTestExporter(Resource $test): QtiTestExporterInterface
     {
-        return new QtiTestExporter($test, $this->getZip(), $this->getManifest());
+        return new QtiTestExporter($test, $this->getZip(), $this->getEmptyManifest());
     }
 }
 

diff --git a/models/classes/export/Formats/Package2p2/TestPackageExport.php b/models/classes/export/Formats/Package2p2/TestPackageExport.php
@@ -46,7 +46,7 @@ protected function getFormTitle(): string
      */
     protected function getTestExporter(Resource $test): QtiTestExporterInterface
     {
-        return new QtiTestExporter($test, $this->getZip(), $this->getManifest());
+        return new QtiTestExporter($test, $this->getZip(), $this->getEmptyManifest());
     }
 }
 

diff --git a/views/css/new-test-runner.css b/views/css/new-test-runner.css
diff --git a/views/css/new-test-runner.css.map b/views/css/new-test-runner.css.map
diff --git a/views/css/test-runner.css b/views/css/test-runner.css
diff --git a/views/css/test-runner.css.map b/views/css/test-runner.css.map
diff --git a/views/js/loader/taoQtiTest.min.js b/views/js/loader/taoQtiTest.min.js
diff --git a/views/js/loader/taoQtiTest.min.js.map b/views/js/loader/taoQtiTest.min.js.map
diff --git a/views/js/loader/taoQtiTestRunner.min.js b/views/js/loader/taoQtiTestRunner.min.js
diff --git a/views/js/loader/taoQtiTestRunner.min.js.map b/views/js/loader/taoQtiTestRunner.min.js.map
diff --git a/views/js/loader/testPlugins.min.js b/views/js/loader/testPlugins.min.js
diff --git a/views/js/loader/testPlugins.min.js.map b/views/js/loader/testPlugins.min.js.map
diff --git a/views/package-lock.json b/views/package-lock.json
diff --git a/views/package.json b/views/package.json
@@ -8,7 +8,7 @@
     },
     "license": "GPL-2.0",
     "dependencies": {
-        "@oat-sa/tao-test-runner": "^0.9.1",
-        "@oat-sa/tao-test-runner-qti": "^3.0.0"
+        "@oat-sa/tao-test-runner": "^1.0.0",
+        "@oat-sa/tao-test-runner-qti": "^4.0.0"
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,7 +46,7 @@ protected function getFormTitle(): string @@
          */
         protected function getTestExporter(Resource $test): QtiTestExporterInterface
         {
-            return new QtiTestExporter($test, $this->getZip(), $this->getManifest());
+            return new QtiTestExporter($test, $this->getZip(), $this->getEmptyManifest());
         }
     }
@@ Expand Down @@