Replace happy path single connection test with test for all connectio…

…n types

ui/tests/acceptance/secrets/backend/database/secret-test.js

@@ -52,7 +52,6 @@ const connectionTests = [
       assert.dom('[data-test-input="write_concern').exists(`Write concern field exists for ${name}`);
       assert.dom('[data-test-toggle-group="TLS options"]').exists('TLS options toggle exists');
     },
-    showFields: async name => {},
   },
   {
     name: 'mssql-connection',
@@ -71,7 +70,6 @@ const connectionTests = [
         .dom('[data-test-input="max_connection_lifetime"]')
         .exists(`Max connection lifetime exists for ${name}`);
     },
-    showFields: async name => {},
   },
 ];
 
@@ -128,23 +126,27 @@ module('Acceptance | secrets/database/*', function(hooks) {
         currentURL().startsWith(`/vault/secrets/${backend}/show/${testCase.name}`),
         `Saves connection and takes you to show page for ${testCase.name}`
       );
-      testCase.showFields(testCase.name);
+      assert
+        .dom(`[data-test-row-value="Password"]`)
+        .doesNotExist(`Does not show Password value on show page for ${testCase.name}`);
       await connectionPage.edit();
       assert.ok(
         currentURL().startsWith(`/vault/secrets/${backend}/edit/${testCase.name}`),
         `Edit connection button and takes you to edit page for ${testCase.name}`
       );
       assert.dom(`[data-test-input="name"]`).hasAttribute('readonly');
       assert.dom(`[data-test-input="plugin_name"]`).hasAttribute('readonly');
-      assert.dom('[data-test-input="password"]').doesNotExist('Password is not available for edit');
+      assert.dom('[data-test-input="password"]').doesNotExist('Password is not displayed on edit form');
       assert.dom('[data-test-toggle-input="show-password"]').exists('Update password toggle exists');
       await connectionPage.toggleVerify();
       await connectionPage.save();
+      // click "Add Role"
       await connectionPage.addRole();
+      await settled();
       assert.equal(
-        currentURL(),
-        `/vault/secrets/${backend}/create?itemType=role`,
-        'Add role links to new role page'
+        searchSelectComponent.selectedOptions[0].text,
+        testCase.name,
+        'Database connection is pre-selected on the form'
       );
     }
   });
@@ -212,70 +214,6 @@ module('Acceptance | secrets/database/*', function(hooks) {
       .hasText('No connections in this backend', 'No connections listed because it was deleted');
   });
 
-  test('Connection edit form happy path works as expected', async function(assert) {
-    await mount();
-    const connectionDetails = {
-      plugin: 'mongodb-database-plugin',
-      id: 'horses-db',
-      fields: [
-        { label: 'Connection Name', name: 'name', value: 'horses-db' },
-        { label: 'Connection url', name: 'connection_url', value: 'mongodb://127.0.0.1:235/horses' },
-        { label: 'Username', name: 'username', value: 'user', hideOnShow: true },
-        { label: 'Password', name: 'password', password: 'so-secure', hideOnShow: true },
-        { label: 'Write concern', name: 'write_concern' },
-      ],
-    };
-    await connectionPage.createLink();
-    await connectionPage.dbPlugin(connectionDetails.plugin);
-    connectionDetails.fields.forEach(async ({ name, value }) => {
-      assert
-        .dom(`[data-test-input="${name}"]`)
-        .exists(`Field ${name} exists for ${connectionDetails.plugin}`);
-      if (value) {
-        await fillIn(`[data-test-input="${name}"]`, value);
-      }
-    });
-    // uncheck verify for the save step to work
-    await connectionPage.toggleVerify();
-    await connectionPage.save();
-    assert
-      .dom('[data-test-modal-title]')
-      .hasText('Rotate your root credentials?', 'Modal appears asking to ');
-    await connectionPage.enable();
-    connectionDetails.fields.forEach(({ label, name, value, hideOnShow }) => {
-      if (hideOnShow) {
-        assert
-          .dom(`[data-test-row-value="${label}"]`)
-          .doesNotExist(`Does not show ${name} value on show page for ${connectionDetails.plugin}`);
-      } else if (!value) {
-        assert.dom(`[data-test-row-value="${label}"]`).hasText('Default');
-      } else {
-        assert.dom(`[data-test-row-value="${label}"]`).hasText(value);
-      }
-    });
-    // go back and edit write_concern
-    await connectionPage.edit();
-    assert.dom(`[data-test-input="name"]`).hasAttribute('readonly');
-    assert.dom(`[data-test-input="plugin_name"]`).hasAttribute('readonly');
-    // assert password is hidden
-    assert.dom('[data-test-input="password"]').doesNotExist('Password field is not shown on edit');
-    findAll('.CodeMirror')[0].CodeMirror.setValue(JSON.stringify({ wtimeout: 5000 }));
-    // uncheck verify for the save step to work
-    await connectionPage.toggleVerify();
-    await connectionPage.save();
-    assert
-      .dom(`[data-test-row-value="Write concern"]`)
-      .hasText('{ "wtimeout": 5000 }', 'Write concern is now showing on the table');
-    // click "Add Role"
-    await click('[data-test-secret-create="true"]');
-    await settled();
-    assert.equal(
-      searchSelectComponent.selectedOptions[0].text,
-      connectionDetails.id,
-      'Database connection is pre-selected on the form'
-    );
-  });
-
   test('buttons show up for managing connection', async function(assert) {
     const backend = await mount();
     const connection = await newConnection(backend);

ui/tests/pages/secrets/backend/database/connection.js

@@ -12,7 +12,7 @@ export default create({
   toggleVerify: clickable('[data-test-input="verify_connection"]'),
   url: fillable('[data-test-input="connection_url"'),
   save: clickable('[data-test-secret-save=""]'),
-  addRole: clickable('[data-test-secret-create="true"]'),
+  addRole: clickable('[data-test-secret-create="true"]'), // only from connection show
   enable: clickable('[data-test-enable-connection=""]'),
   edit: clickable('[data-test-edit-link="true"]'),
   delete: clickable('[data-test-database-connection-delete]'),