tests

Author: lerouxb

packages/compass-connections/src/components/legacy-connections.spec.tsx

@@ -288,7 +288,9 @@ describe.skip('Connections Component', function () {
         });
 
         it('should enable the connect button', function () {
-          const connectButton = screen.getByText('Connect');
+          const connectButton = screen.getByRole('button', {
+            name: 'Save & Connect',
+          });
           expect(connectButton).to.not.match('disabled');
         });
 

packages/connection-form/src/components/connection-form-modal-actions.spec.tsx

@@ -30,7 +30,7 @@ describe('<ConnectionFormModalActions />', function () {
     expect(screen.getByText('Error!')).to.be.visible;
   });
 
-  describe('Connect Button', function () {
+  describe('Save&Connect Button', function () {
     it('should call onSaveAndConnect function', function () {
       const onSaveAndConnectSpy = sinon.spy();
       render(
@@ -41,7 +41,9 @@ describe('<ConnectionFormModalActions />', function () {
           onSaveAndConnect={onSaveAndConnectSpy}
         ></ConnectionFormModalActions>
       );
-      const connectButton = screen.getByRole('button', { name: 'Connect' });
+      const connectButton = screen.getByRole('button', {
+        name: 'Save & Connect',
+      });
       userEvent.click(connectButton);
 
       expect(onSaveAndConnectSpy).to.have.been.calledOnce;
@@ -54,7 +56,8 @@ describe('<ConnectionFormModalActions />', function () {
           warnings={[]}
         ></ConnectionFormModalActions>
       );
-      expect(screen.queryByRole('button', { name: 'Connect' })).to.not.exist;
+      expect(screen.queryByRole('button', { name: 'Save & Connect' })).to.not
+        .exist;
     });
   });
 

packages/connection-form/src/components/connection-form.spec.tsx

@@ -39,7 +39,6 @@ describe('ConnectionForm Component', function () {
             connectionString: 'mongodb://pineapple:orangutans@localhost:27019',
           },
         }}
-        onSaveClicked={noop}
         {...props}
       />
     );
@@ -54,10 +53,55 @@ describe('ConnectionForm Component', function () {
     expect(screen.getByText('New Connection')).to.exist;
   });
 
-  it('should show the connect button', function () {
+  it('should show no save or connect buttons by default', function () {
     renderForm();
-    const button = screen.getByText('Connect').closest('button');
+    expect(screen.queryByRole('button', { name: 'Save' })).to.be.null;
+    expect(screen.queryByRole('button', { name: 'Connect' })).to.be.null;
+    expect(screen.queryByRole('button', { name: 'Save & Connect' })).to.be.null;
+  });
+
+  it('should show the save button if onSaveClicked is specified', function () {
+    const onSaveClicked = Sinon.spy();
+    renderForm({
+      onSaveClicked: onSaveClicked,
+    });
+    const button = screen
+      .getByRole('button', { name: 'Save' })
+      .closest('button');
     expect(button?.getAttribute('aria-disabled')).to.not.equal('true');
+
+    button?.click();
+    expect(onSaveClicked.callCount).to.equal(1);
+  });
+
+  it('should show the connect button if onConnectClicked is specified', function () {
+    const onConnectClicked = Sinon.spy();
+
+    renderForm({
+      onConnectClicked,
+    });
+    const button = screen
+      .getByRole('button', { name: 'Connect' })
+      .closest('button');
+    expect(button?.getAttribute('aria-disabled')).to.not.equal('true');
+
+    button?.click();
+    expect(onConnectClicked.callCount).to.equal(1);
+  });
+
+  it('should show the save & connect button if onSaveAndConnectClicked is specified', function () {
+    const onSaveAndConnectClicked = Sinon.spy();
+
+    renderForm({
+      onSaveAndConnectClicked,
+    });
+    const button = screen
+      .getByRole('button', { name: 'Save & Connect' })
+      .closest('button');
+    expect(button?.getAttribute('aria-disabled')).to.not.equal('true');
+
+    button?.click();
+    expect(onSaveAndConnectClicked.callCount).to.equal(1);
   });
 
   it('should render the connection string textbox', function () {
@@ -103,6 +147,9 @@ describe('ConnectionForm Component', function () {
           screen.getByTestId('advanced-connection-options')
         ).to.throw;
         expect(() => screen.getByRole('button', { name: 'Connect' })).to.throw;
+        expect(() =>
+          screen.getByRole('button', { name: 'Save & Connect' })
+        ).to.throw;
 
         // pressing enter calls onSubmit which saves
         fireEvent.submit(screen.getByRole('form'));
@@ -137,6 +184,7 @@ describe('ConnectionForm Component', function () {
         expect(screen.getByTestId('toggle-edit-connection-string')).to.exist;
         expect(screen.getByTestId('advanced-connection-options')).to.exist;
         expect(screen.getByRole('button', { name: 'Connect' })).to.exist;
+        expect(screen.getByRole('button', { name: 'Save & Connect' })).to.exist;
 
         // pressing enter calls onSubmit which saves and connects (the default)
         fireEvent.submit(screen.getByRole('form'));