Merge branch 'vnext' into sw

test/frontend/tests/workflow-tests.js

@@ -135,6 +135,27 @@ describe('Upload / Download flow', function() {
     }
   });
 
+  it('can cancel and not increase download count', async function() {
+    const fs = new FileSender(blob);
+    const file = await fs.upload();
+    const fr = new FileReceiver({
+      secretKey: file.toJSON().secretKey,
+      id: file.id,
+      nonce: file.keychain.nonce,
+      requiresPassword: false
+    });
+    await fr.getMetadata();
+    fr.once('progress', () => fr.cancel());
+
+    try {
+      await fr.download(noSave);
+      assert.fail('not cancelled');
+    } catch (e) {
+      await file.updateDownloadCount();
+      assert.equal(file.dtotal, 0);
+    }
+  });
+
   it('can allow multiple downloads', async function() {
     const fs = new FileSender(blob);
     const file = await fs.upload();

test/integration/requirements.txt

@@ -1,8 +1,8 @@
-selenium==3.12.0
+selenium==3.13.0
 flake8==3.5.0
 flake8-isort==2.5
 PyPOM==2.0.0
-pytest==3.6.0
-pytest-html==1.18.0
+pytest==3.6.3
+pytest-html==1.19.0
 pytest-selenium==1.13.0
 pytest-xdist==1.22.2