Remove minipass as dependency and refactor to make things clearer

services/filestore/test/acceptance/js/FilestoreTests.js

@@ -497,16 +497,16 @@ describe('Filestore', function() {
               )
             })
 
-            it('should fetch the file', async function() {
-              const res = await rp.get(fileUrl)
-              expect(res.body).to.equal(constantFileContent)
-            })
-
             describe('when copyOnMiss is disabled', function() {
               beforeEach(function() {
                 Settings.filestore.fallback.copyOnMiss = false
               })
 
+              it('should fetch the file', async function() {
+                const res = await rp.get(fileUrl)
+                expect(res.body).to.equal(constantFileContent)
+              })
+
               it('should not copy the file to the primary', async function() {
                 await rp.get(fileUrl)
 
@@ -523,6 +523,11 @@ describe('Filestore', function() {
                 Settings.filestore.fallback.copyOnMiss = true
               })
 
+              it('should fetch the file', async function() {
+                const res = await rp.get(fileUrl)
+                expect(res.body).to.equal(constantFileContent)
+              })
+
               it('copies the file to the primary', async function() {
                 await rp.get(fileUrl)
                 // wait for the file to copy in the background
@@ -578,21 +583,51 @@ describe('Filestore', function() {
                 )
               })
 
-              it('should not copy the old file to the new bucket', async function() {
-                await expectPersistorNotToHaveFile(
-                  app.persistor.primaryPersistor,
-                  bucket,
-                  fileKey
-                )
+              describe('when copyOnMiss is false', function() {
+                beforeEach(function() {
+                  Settings.filestore.fallback.copyOnMiss = false
+                })
+
+                it('should create a new file in the new bucket', async function() {
+                  await expectPersistorToHaveFile(
+                    app.persistor.primaryPersistor,
+                    bucket,
+                    newFileKey,
+                    constantFileContent
+                  )
+                })
+
+                it('should not copy the old file to the primary with the old key', async function() {
+                  await expectPersistorNotToHaveFile(
+                    app.persistor.primaryPersistor,
+                    bucket,
+                    fileKey
+                  )
+                })
               })
 
-              it('should create a new file in the new bucket', async function() {
-                await expectPersistorToHaveFile(
-                  app.persistor.primaryPersistor,
-                  bucket,
-                  newFileKey,
-                  constantFileContent
-                )
+              describe('when copyOnMiss is true', function() {
+                beforeEach(function() {
+                  Settings.filestore.fallback.copyOnMiss = true
+                })
+
+                it('should create a new file in the new bucket', async function() {
+                  await expectPersistorToHaveFile(
+                    app.persistor.primaryPersistor,
+                    bucket,
+                    newFileKey,
+                    constantFileContent
+                  )
+                })
+
+                it('should copy the old file to the primary with the old key', async function() {
+                  await expectPersistorToHaveFile(
+                    app.persistor.primaryPersistor,
+                    bucket,
+                    fileKey,
+                    constantFileContent
+                  )
+                })
               })
             })
           })