reformat and rearrange tests

Author: Hweinstock

src/ec2/model.ts

@@ -184,6 +184,7 @@ export class Ec2ConnectionManager {
             this.throwGeneralConnectionError(selection, err as Error)
         }
     }
+
     public async prepareEc2RemoteEnvWithProgress(selection: Ec2Selection, remoteUser: string): Promise<Ec2RemoteEnv> {
         const timeout = new Timeout(60000)
         await showMessageWithCancel('AWS: Opening remote connection...', timeout)

src/test/ec2/model.test.ts

@@ -43,6 +43,45 @@ describe('Ec2ConnectClient', function () {
         })
     })
 
+    describe('hasProperPolicies', async function () {
+        it('correctly determines if proper policies are included', async function () {
+            async function assertAcceptsPolicies(policies: IAM.Policy[], expectedResult: boolean) {
+                sinon.stub(DefaultIamClient.prototype, 'listAttachedRolePolicies').resolves(policies)
+
+                const result = await client.hasProperPolicies('')
+                assert.strictEqual(result, expectedResult)
+
+                sinon.restore()
+            }
+            await assertAcceptsPolicies(
+                [{ PolicyName: 'name' }, { PolicyName: 'name2' }, { PolicyName: 'name3' }],
+                false
+            )
+            await assertAcceptsPolicies(
+                [
+                    { PolicyName: 'AmazonSSMManagedInstanceCore' },
+                    { PolicyName: 'AmazonSSMManagedEC2InstanceDefaultPolicy' },
+                ],
+                true
+            )
+            await assertAcceptsPolicies([{ PolicyName: 'AmazonSSMManagedEC2InstanceDefaultPolicy' }], false)
+            await assertAcceptsPolicies([{ PolicyName: 'AmazonSSMManagedEC2InstanceDefaultPolicy' }], false)
+        })
+
+        it('throws error when sdk throws error', async function () {
+            sinon.stub(DefaultIamClient.prototype, 'listAttachedRolePolicies').throws(new ToolkitError('error'))
+
+            try {
+                await client.hasProperPolicies('')
+                assert.ok(false)
+            } catch {
+                assert.ok(true)
+            }
+
+            sinon.restore()
+        })
+    })
+
     describe('isInstanceRunning', async function () {
         it('only returns true with the instance is running', async function () {
             sinon.stub(Ec2Client.prototype, 'getInstanceStatus').callsFake(async (input: string) => input.split(':')[0])
@@ -118,45 +157,6 @@ describe('Ec2ConnectClient', function () {
         })
     })
 
-    describe('hasProperPolicies', async function () {
-        it('correctly determines if proper policies are included', async function () {
-            async function assertAcceptsPolicies(policies: IAM.Policy[], expectedResult: boolean) {
-                sinon.stub(DefaultIamClient.prototype, 'listAttachedRolePolicies').resolves(policies)
-
-                const result = await client.hasProperPolicies('')
-                assert.strictEqual(result, expectedResult)
-
-                sinon.restore()
-            }
-            await assertAcceptsPolicies(
-                [{ PolicyName: 'name' }, { PolicyName: 'name2' }, { PolicyName: 'name3' }],
-                false
-            )
-            await assertAcceptsPolicies(
-                [
-                    { PolicyName: 'AmazonSSMManagedInstanceCore' },
-                    { PolicyName: 'AmazonSSMManagedEC2InstanceDefaultPolicy' },
-                ],
-                true
-            )
-            await assertAcceptsPolicies([{ PolicyName: 'AmazonSSMManagedEC2InstanceDefaultPolicy' }], false)
-            await assertAcceptsPolicies([{ PolicyName: 'AmazonSSMManagedEC2InstanceDefaultPolicy' }], false)
-        })
-
-        it('throws error when sdk throws error', async function () {
-            sinon.stub(DefaultIamClient.prototype, 'listAttachedRolePolicies').throws(new ToolkitError('error'))
-
-            try {
-                await client.hasProperPolicies('')
-                assert.ok(false)
-            } catch {
-                assert.ok(true)
-            }
-
-            sinon.restore()
-        })
-    })
-
     describe('sendSshKeysToInstance', async function () {
         it('calls the sdk with the proper parameters', async function () {
             const sendCommandStub = sinon.stub(SsmClient.prototype, 'sendCommandAndWait')