iss1757 - Fix test. Remove passing of stack_js as no longer needed.

Author: EJMFarrow

corsscripts/ascii/ReadMe.md

@@ -0,0 +1,5 @@
+To run these tests locally, you need to be in this folder with write permissions. Then:
+```
+npm ci   # Installs node modules
+npm run build   # Bundles and minifies 
+```

corsscripts/ascii/stackascii.bundle.js

@@ -20,8 +20,7 @@ import regexall from './extractors/regexall.js';
 
 const extractorlib = { finalfunction, lastexpr, lastblock, lastcalc, regexmatch, regexall };
 
-export default function init(inputIds, operations, stack_js) {
-    const stackJS = stack_js;
+export default function init(inputIds, operations) {
     const markdownContainerId = inputIds[0];
     // inputIds[1..N] correspond to each parsed answer entry in order.
     const alloperations = operations;

corsscripts/ascii/stackascii.bundle.js.map

@@ -128,7 +128,7 @@ public function compile($format, $options): ?MP_Node {
             return 'stack_js.request_access_to_input("' . $item . '"' . $extra . ')';
         }, $inputs, array_keys($inputs)));
         $linkcode = 'Promise.all([' . $answercalls . '])';
-        $linkcode .= ".then((inputIds) => {init(inputIds," . json_encode($operations) . ",stack_js);});";
+        $linkcode .= ".then((inputIds) => {init(inputIds," . json_encode($operations) . ");});";
 
         $r->items[] = new MP_String($linkcode);
         $r->items[] = new MP_String("\n</script>");

corsscripts/ascii/stackascii.js

@@ -117,7 +117,7 @@ public function test_ascii_compile_adds_default_filter_and_input_request(): void
         $strings = $this->get_string_items($compiled);
         $joined = implode("\n", $strings);
         $this->assertStringContainsString('stack_js.request_access_to_input("ans1",true)', $joined);
-        $expectedlinkcode = '{init(inputIds,[{"operation":"filter","type":"markdown","transforms":"latexwrap,boldfilter"}],stack_js);}';
+        $expectedlinkcode = '{init(inputIds,[{"operation":"filter","type":"markdown","transforms":"latexwrap,boldfilter"}]);}';
         $this->assertStringContainsString($expectedlinkcode, $joined);
         $this->assertStringContainsString(
             'id="asciiContainerRow" style="width:calc(100% - 20px);height:calc(400px - 30px);"',
@@ -155,7 +155,7 @@ public function test_ascii_compile_uses_child_filter_and_extractor_operations():
         $this->assertStringContainsString('stack_js.request_access_to_input("ans1",true)', $joined);
         $this->assertStringContainsString('stack_js.request_access_to_input("ans2")', $joined);
         $expectedlinkcode = '{init(inputIds,[{"type":"markdown","transforms":"latexwrap","display":"true","operation":"filter"}' .
-            ',{"type":"lastexpr","targetinput":"ans2","operation":"extractor"}],stack_js);}';
+            ',{"type":"lastexpr","targetinput":"ans2","operation":"extractor"}]);}';
         $this->assertStringContainsString($expectedlinkcode, $joined);
         $this->assertStringContainsString(
             'id="asciiContainerRow" style="width:calc(80% - 20px);height:calc(300px - 30px);"',

stack/cas/castext2/blocks/ascii.block.php

@@ -0,0 +1,5 @@
+To run these tests locally, you need to be in this folder with write permissions. Then:
+```
+npm ci   # Installs node modules
+npm test   # Runs tests
+```

tests/ascii_block_test.php

@@ -128,14 +128,13 @@ describe('stackascii init', () => {
         });
         mockLastexpr.mockImplementation((raw, blocks, op) => `EXTRACT:${raw}:${blocks.map((block) => block.type).join('|')}`);
 
-        const stackJS = { clear_input: jest.fn() };
         const operations = [
             { operation: 'filter', type: 'markdown', reset: 'false', display: 'true' },
             { operation: 'filter', type: 'calculation', reset: 'true'},
             { operation: 'extractor', type: 'unknown' }
         ];
 
-        init(['markdownInput', 'answer1', 'answer2'], operations, stackJS);
+        init(['markdownInput', 'answer1', 'answer2'], operations);
 
         expect(mockMarkdown).toHaveBeenCalledWith('alpha', expect.any(Object), operations[0]);
         expect(mockCalculation).toHaveBeenCalledWith('alpha', expect.any(Object), operations[1]);
@@ -146,7 +145,6 @@ describe('stackascii init', () => {
         expect(env.output.innerHTML).toBe('MD:alpha');
         expect(env.answers[0].value).toBe('EXTRACT:alpha:markdown|calculation');
         expect(env.answers[0].dispatchEvent).toHaveBeenCalledWith({ type: 'change' });
-        expect(stackJS.clear_input).not.toHaveBeenCalled();
         expect(global.MathJax.typesetPromise).toHaveBeenCalledWith([env.output]);
     });
 
@@ -164,15 +162,14 @@ describe('stackascii init', () => {
         mockLastexpr.mockImplementation((raw, blocks, op) => `EXTRACT:${raw}:${blocks.map((block) => block.type).join('|')}`);
         mockLastcalc.mockImplementation((raw, blocks, op) => `EXTRACTCALC:${raw}:${blocks.map((block) => block.type).join('|')}`);
 
-        const stackJS = { clear_input: jest.fn() };
         const operations = [
             { operation: 'filter', type: 'markdown' },
             { operation: 'extractor', type: 'lastexpr' },
             { operation: 'filter', type: 'calculation' },
             { operation: 'extractor', type: 'lastcalc' }
         ];
 
-        init(['markdownInput', 'answer1', 'answer2'], operations, stackJS);
+        init(['markdownInput', 'answer1', 'answer2'], operations);
 
         expect(mockMarkdown).toHaveBeenCalledWith('alpha', expect.any(Object), operations[0]);
         expect(mockLastexpr).toHaveBeenCalledWith('alpha', [
@@ -187,7 +184,6 @@ describe('stackascii init', () => {
         expect(env.answers[0].dispatchEvent).toHaveBeenCalledWith({ type: 'change' });
         expect(env.answers[1].value).toBe('EXTRACTCALC:alpha:calculation');
         expect(env.answers[1].dispatchEvent).toHaveBeenCalledWith({ type: 'change' });
-        expect(stackJS.clear_input).not.toHaveBeenCalled();
         expect(global.MathJax.typesetPromise).toHaveBeenCalledWith([env.output]);
     });
 
@@ -196,15 +192,13 @@ describe('stackascii init', () => {
 
         mockFinalfunction.mockReturnValue('ERROR');
 
-        const stackJS = { clear_input: jest.fn() };
         const operations = [{ operation: 'extractor', type: 'finalfunction' }];
 
-        init(['markdownInput', 'answer1'], operations, stackJS);
+        init(['markdownInput', 'answer1'], operations);
 
         expect(mockFinalfunction).toHaveBeenCalledWith('beta', [], operations[0]);
-        expect(stackJS.clear_input).toHaveBeenCalledWith('answer1');
         expect(env.answers[0].value).toBe('');
-        expect(env.answers[0].dispatchEvent).not.toHaveBeenCalled();
+        expect(env.answers[0].dispatchEvent).toHaveBeenCalledTimes(1);
         expect(env.output.innerHTML).toBe('beta');
     });
 
@@ -213,10 +207,9 @@ describe('stackascii init', () => {
 
         mockMarkdown.mockImplementation((text) => `MD:${text}`);
 
-        const stackJS = { clear_input: jest.fn() };
         const operations = [{ operation: 'filter', type: 'markdown', reset: 'false', display: 'false' }];
 
-        init(['markdownInput'], operations, stackJS);
+        init(['markdownInput'], operations);
 
         expect(env.markdownInput.addEventListener).toHaveBeenCalledWith('change', expect.any(Function));
         expect(mockMarkdown).toHaveBeenCalledTimes(1);