Merge pull request #330 from IBMa/archive-path

Change archive paths for engine to use path from json
IBMa · Mar 3, 2021 · adfecde · adfecde
2 parents 43f9928 + 4aba9d0
commit adfecde
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/accessibility-checker/src-ts/lib/ACEngineManager.ts b/accessibility-checker/src-ts/lib/ACEngineManager.ts
@@ -33,7 +33,7 @@ export class ACEngineManager {
                 } catch (e) {
                     return Promise.reject(e);
                 }
-            }, `${config.ruleServer}/archives/${config.ruleArchive}/js/ace.js`);
+            }, `${config.rulePack}/ace.js`);
             return ACEngineManager.loadEngineLocal();
         } else if (ACEngineManager.isSelenium(content)) {
             config.DEBUG && console.log("[INFO] aChecker.loadEngine detected Selenium");
@@ -47,7 +47,7 @@ try {
         let script = document.createElement('script');
         script.setAttribute('type', 'text/javascript');
         script.setAttribute('aChecker', 'ACE');
-        script.setAttribute('src', '${config.ruleServer}/archives/${config.ruleArchive}/js/ace.js');
+        script.setAttribute('src', '${config.rulePack}/ace.js');
         script.addEventListener('load', function() {
             cb();
         });
@@ -95,9 +95,9 @@ try {
         let config = await ACConfigManager.getConfigUnsupported();
 
         return new Promise<void>((resolve, reject) => {
-            request.get(`${config.ruleServer}/archives/${config.ruleArchive}/js/ace-node.js`, function (err, data) {
+            request.get(`${config.rulePack}/ace-node.js`, function (err, data) {
                 if (!data) {
-                    console.log("Cannot read: " + `${config.ruleServer}/archives/${config.ruleArchive}/js/ace.js`);
+                    console.log("Cannot read: " + `${config.rulePack}/ace-node.js`);
                 }
                 data = data.body;
                 let engineDir = path.join(__dirname, "engine");

diff --git a/accessibility-checker/src-ts/lib/ACHelper.ts b/accessibility-checker/src-ts/lib/ACHelper.ts
@@ -33,14 +33,14 @@ try {
     // If cucumber is the platform...
     let {AfterAll} = require('cucumber');
     AfterAll(function (done) {
-        const rulePack = `${Config.ruleServer}/archives/${Config.ruleArchive}/js`;
+        const rulePack = `${Config.rulePack}`;
         initialize().then(() => ACReportManager.metricsLogger.sendLogsV2(() => ACBrowserManager.close().then(done), rulePack));
     });
 } catch (e) {
     if (typeof (after) !== "undefined") {
         after(function (done) {
             if (Config) {
-                const rulePack = `${Config.ruleServer}/archives/${Config.ruleArchive}/js`;
+                const rulePack = `${Config.rulePack}/ace`;
                 initialize().then(() => ACReportManager.metricsLogger.sendLogsV2(() => ACBrowserManager.close().then(done), rulePack));
             } else {
                 done();
@@ -49,7 +49,7 @@ try {
     } else {
         process.on('beforeExit', async function () {
             if (Config) {
-                const rulePack = `${Config.ruleServer}/archives/${Config.ruleArchive}/js`;
+                const rulePack = `${Config.rulePack}/ace`;
                 initialize().then(() => ACReportManager.metricsLogger.sendLogsV2(null, rulePack));
                 ACBrowserManager.close();
             }

diff --git a/accessibility-checker/src-ts/lib/api/IChecker.ts b/accessibility-checker/src-ts/lib/api/IChecker.ts
@@ -87,6 +87,8 @@ export type IConfigUnsupported = IConfig & {
      */
     ruleServer?: string
 
+    rulePack?: string
+
     /**
      * (optional) If the tool allows, should we capture screenshots
      */
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,6 +87,8 @@ export type IConfigUnsupported = IConfig & { @@
          */
         ruleServer?: string
+        rulePack?: string
         /**
          * (optional) If the tool allows, should we capture screenshots
          */
@@ Expand Down @@