updating tests

Author: zamoore

ui/tests/acceptance/job-definition-test.js

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: BUSL-1.1
  */
 
-import { click, currentURL } from '@ember/test-helpers';
+import { click, currentURL, waitFor } from '@ember/test-helpers';
 import percySnapshot from '@percy/ember';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
@@ -99,9 +99,12 @@ module('Acceptance | job definition', function (hooks) {
 
   test('when changes are submitted, the site redirects to the job overview page', async function (assert) {
     await Definition.edit();
+    await waitFor('.cm-editor');
 
     const cm = getCodeMirrorInstance(['data-test-editor']);
-    cm.setValue(`{}`);
+    cm.dispatch({
+      changes: { from: 0, to: cm.state.doc.length, insert: '{}' },
+    });
 
     await click('[data-test-plan]');
     await Definition.editor.run();

ui/tests/acceptance/job-dispatch-test.js

@@ -13,7 +13,7 @@ import setupCodeMirror from 'nomad-ui/tests/helpers/codemirror';
 import JobDispatch from 'nomad-ui/tests/pages/jobs/dispatch';
 import JobDetail from 'nomad-ui/tests/pages/jobs/detail';
 import a11yAudit from 'nomad-ui/tests/helpers/a11y-audit';
-import { currentURL } from '@ember/test-helpers';
+import { currentURL, waitFor } from '@ember/test-helpers';
 
 const REQUIRED_INDICATOR = '*';
 
@@ -201,10 +201,21 @@ function moduleForJobDispatch(title, jobFactory) {
       }
 
       await JobDispatch.visit({ id: `${job.id}@${namespace.name}` });
+      await waitFor('.cm-editor');
+
+      const cmEditor = document.querySelector('[data-test-payload-editor]');
+      const cmEditorInstance = cmEditor.editor;
 
       // Fill form.
       JobDispatch.metaFields.map((f) => f.field.input('meta value'));
-      JobDispatch.payload.editor.fillIn('payload');
+
+      cmEditorInstance.dispatch({
+        changes: {
+          from: 0,
+          to: cmEditorInstance.state.doc.length,
+          insert: 'payload',
+        },
+      });
 
       const childrenCountBefore = countDispatchChildren();
       await JobDispatch.dispatchButton.click();

ui/tests/acceptance/variables-test.js

@@ -11,6 +11,7 @@ import {
   findAll,
   typeIn,
   visit,
+  waitFor,
 } from '@ember/test-helpers';
 import { setupMirage } from 'ember-cli-mirage/test-support';
 import { clickToggle, clickOption } from 'nomad-ui/tests/helpers/helios';
@@ -543,24 +544,27 @@ module('Acceptance | variables', function (hooks) {
       assert
         .dom('.related-entities-hint')
         .exists('Shows a hint about related entities by default');
-      assert.dom('.CodeMirror').doesNotExist();
+      assert.dom('.cm-editor').doesNotExist();
+
       await typeIn('[data-test-path-input]', 'nomad/job-templates/hello-world');
       assert
         .dom('.related-entities-hint')
         .doesNotExist('Hides the hint when editing a job template variable');
       assert
         .dom('[data-test-job-template-hint]')
         .exists('Shows a hint about job templates');
+
+      await waitFor('.cm-editor');
       assert
-        .dom('.CodeMirror')
+        .dom('.cm-editor')
         .exists('Shows a custom editor for job templates');
 
       document.querySelector('[data-test-path-input]').value = ''; // clear current input
       await typeIn('[data-test-path-input]', 'hello-world-non-template');
       assert
         .dom('.related-entities-hint')
         .exists('Shows a hint about related entities by default');
-      assert.dom('.CodeMirror').doesNotExist();
+      assert.dom('.cm-editor').doesNotExist();
       // Reset Token
       window.localStorage.nomadTokenSecret = null;
     });

ui/tests/integration/components/scale-events-accordion-test.js

@@ -163,10 +163,8 @@ module('Integration | Component | scale-events-accordion', function (hooks) {
     await click('[data-test-accordion-toggle]');
     assert.ok(find('[data-test-accordion-body]'));
 
-    assert.equal(
-      getCodeMirrorInstance('[data-test-json-viewer]').getValue(),
-      JSON.stringify(meta, null, 2)
-    );
+    const codeValue = find('[data-test-json-viewer]').textContent;
+    assert.equal(codeValue.replace(/\s+/g, ''), JSON.stringify(meta));
     await componentA11yAudit(this.element, assert);
   });
 });

ui/tests/integration/components/scale-events-chart-test.js

@@ -86,9 +86,11 @@ module('Integration | Component | scale-events-chart', function (hooks) {
       moment(annotation.time).format('MMM DD HH:mm:ss ZZ')
     );
     assert.equal(find('[data-test-message]').textContent, annotation.message);
+
+    const codeValue = find('[data-test-json-viewer]').textContent;
     assert.equal(
-      getCodeMirrorInstance('[data-test-json-viewer]').getValue(),
-      JSON.stringify(annotation.meta, null, 2)
+      codeValue.replace(/\s+/g, ''),
+      JSON.stringify(annotation.meta)
     );
 
     await componentA11yAudit(this.element, assert);

ui/tests/integration/components/variable-form-test.js

@@ -7,7 +7,14 @@ import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { hbs } from 'ember-cli-htmlbars';
 import { componentA11yAudit } from 'nomad-ui/tests/helpers/a11y-audit';
-import { click, typeIn, find, findAll, render } from '@ember/test-helpers';
+import {
+  click,
+  typeIn,
+  find,
+  findAll,
+  render,
+  waitFor,
+} from '@ember/test-helpers';
 import { setupMirage } from 'ember-cli-mirage/test-support';
 import setupCodeMirror from 'nomad-ui/tests/helpers/codemirror';
 import { codeFillable, code } from 'nomad-ui/tests/pages/helpers/codemirror';
@@ -422,11 +429,13 @@ module('Integration | Component | variable-form', function (hooks) {
         hbs`<VariableForm @model={{this.mockedModel}} @existingVariables={{this.existingVariables}} @view={{this.view}} />`
       );
       assert.dom('.key-value').exists();
-      assert.dom('.CodeMirror').doesNotExist();
+      assert.dom('.cm-editor').doesNotExist();
 
       this.set('view', 'json');
       assert.dom('.key-value').doesNotExist();
-      assert.dom('.CodeMirror').exists();
+
+      await waitFor('.cm-editor');
+      assert.dom('.cm-editor').exists();
     });
 
     test('Persists Key/Values table data to JSON', async function (assert) {
@@ -457,8 +466,11 @@ module('Integration | Component | variable-form', function (hooks) {
         return acc;
       }, {});
 
+      let editorElement = document.querySelector('[data-test-json-editor]');
+      let codeMirrorInstance = editorElement.editor;
+
       assert.equal(
-        code('.editor-wrapper').get(),
+        codeMirrorInstance.state.doc.toString(),
         JSON.stringify(keyValuesAsJSON, null, 2),
         'JSON editor contains the key values, stringified, by default'
       );
@@ -472,8 +484,12 @@ module('Integration | Component | variable-form', function (hooks) {
 
       this.set('view', 'json');
 
+      await waitFor('.cm-editor');
+      editorElement = document.querySelector('[data-test-json-editor]');
+      codeMirrorInstance = editorElement.editor;
+
       assert.ok(
-        code('[data-test-json-editor]').get().includes('"howdy": "partner"'),
+        codeMirrorInstance.state.doc.toString().includes('"howdy": "partner"'),
         'JSON editor contains the new key value'
       );
     });