Fix and refactor code editor acceptance test

Author: calcaide

ui/admin/tests/acceptance/credential-store/create-test.js

@@ -104,9 +104,9 @@ module('Acceptance | credential-stores | create', function (hooks) {
 
     await fillIn(commonSelectors.FIELD_NAME, commonSelectors.FIELD_NAME_VALUE);
     await click(selectors.TYPE_VAULT);
-    await waitFor(selectors.CODE_EDITOR_CM_LOADED);
+    await waitFor(commonSelectors.CODE_EDITOR_CM);
 
-    const editorElement = find(selectors.CODE_EDITOR_BODY);
+    const editorElement = find(commonSelectors.CODE_EDITOR_CODE);
     const editorView = editorElement.editor;
     editorView.dispatch({
       changes: {
@@ -117,7 +117,7 @@ module('Acceptance | credential-stores | create', function (hooks) {
 
     await click(commonSelectors.SAVE_BTN);
 
-    assert.dom(selectors.CODE_BLOCK_BODY).doesNotExist();
+    assert.dom(commonSelectors.CODE_EDITOR).doesNotExist();
     assert.strictEqual(getVaultCredentialStoresCount(), count + 1);
   });
 

ui/admin/tests/acceptance/credential-store/credentials/create-test.js

@@ -203,21 +203,24 @@ module(
       await click(commonSelectors.HREF(urls.newCredential));
       await click(selectors.FIELD_TYPE_JSON);
 
-      await waitFor('.cm-editor');
+      await waitFor(commonSelectors.CODE_EDITOR_CM);
 
-      const editorElement = find('.hds-code-editor__editor');
+      const editorElement = find(commonSelectors.CODE_EDITOR_CODE);
       const editorView = editorElement.editor;
       editorView.dispatch({
         changes: {
           from: editorView.state.selection.main.from,
-          insert: selectors.FIELD_EDITOR_VALUE,
+          insert: '{"test": "value"}',
         },
       });
-      assert.dom(selectors.EDITOR).includesText(selectors.FIELD_EDITOR_VALUE);
+
+      assert
+        .dom(commonSelectors.CODE_EDITOR_CODE)
+        .includesText('{"test": "value"}');
       await click(selectors.FIELD_TYPE_USERNAME_PASSWORD);
 
       await click(selectors.FIELD_TYPE_JSON);
-      assert.dom(selectors.EDITOR).includesText('{}');
+      assert.dom(commonSelectors.CODE_EDITOR_CODE).includesText('{}');
     });
 
     test('users cannot navigate to new credential route without proper authorization', async function (assert) {

ui/admin/tests/acceptance/credential-store/credentials/selectors.js

@@ -6,15 +6,12 @@
 export const FIELD_TYPE_SSH = '[value=ssh_private_key]';
 export const FIELD_TYPE_USERNAME_PASSWORD = '[value=username_password]';
 export const FIELD_TYPE_JSON = '[value=json]';
-export const FIELD_EDITOR = '[data-test-code-editor-field-editor] textarea';
-export const FIELD_EDITOR_VALUE = '{"test": "value"}';
 export const FIELD_PASSWORD_ERROR = '[data-test-error-message-password]';
 export const FIELD_SSH_PRIVATE_KEY = '[name=private_key]';
 export const FIELD_SSH_PRIVATE_KEY_ERROR =
   '[data-test-error-message-private-key]';
 export const FIELD_SSH_PRIVATE_KEY_PASSPHRASE = '[name=private_key_passphrase]';
 
-export const EDITOR = '[data-test-code-editor-field-editor]';
 export const MANAGE_DROPDOWN = '[data-test-manage-credentials-dropdown] button';
 export const MANAGE_DROPDOWN_DELETE =
   '[data-test-manage-credentials-dropdown] ul li button';

ui/admin/tests/acceptance/credential-store/credentials/update-test.js

@@ -571,7 +571,9 @@ module(
       await click(selectors.REPLACE_SECRET_BTN);
 
       assert.dom(selectors.REPLACE_SECRET_BTN).doesNotExist();
-      await waitUntil(() => assert.dom('.cm-editor').isVisible());
+      await waitUntil(() =>
+        assert.dom(commonSelectors.CODE_EDITOR_CM).isVisible(),
+      );
     });
   },
 );

ui/admin/tests/acceptance/credential-store/selectors.js

@@ -16,8 +16,6 @@ export const DELETE_ACTION =
 // Search filtering selectors
 export const NO_RESULTS_MSG = '[data-test-no-credential-store-results]';
 
-export const CODE_EDITOR_CM_LOADED = '.cm-editor';
-export const CODE_EDITOR_BODY = '.hds-code-editor__editor';
 export const CODE_BLOCK_BODY = '.hds-code-block__code';
 export const EDITOR_WORKER_FILTER_VALUE = '"dev" in "/tags/env"';
 

ui/admin/tests/acceptance/credential-store/update-test.js

@@ -388,9 +388,9 @@ module('Acceptance | credential-stores | update', function (hooks) {
     await click(commonSelectors.HREF(urls.workerFilter));
     await click(selectors.MANAGE_DROPDOWN);
     await click(selectors.EDIT_WORKER_FILTER_ACTION);
-    await waitFor(selectors.CODE_EDITOR_CM_LOADED);
+    await waitFor(commonSelectors.CODE_EDITOR_CM);
 
-    const editorElement = find(selectors.CODE_EDITOR_BODY);
+    const editorElement = find(commonSelectors.CODE_EDITOR_CODE);
     const editorView = editorElement.editor;
     editorView.dispatch({
       changes: {
@@ -400,7 +400,6 @@ module('Acceptance | credential-stores | update', function (hooks) {
     });
 
     await click(commonSelectors.SAVE_BTN);
-
     assert.dom(selectors.CODE_BLOCK_BODY).exists();
     assert.dom(selectors.CODE_BLOCK_BODY).includesText('"bar" in "/tags/foo"');
   });