Update test suite to use stream payloads

ruiquelhas · Jul 6, 2016 · 28ab18d · 28ab18d
1 parent 560cd99
commit 28ab18d
Showing 1 changed file with 14 additions and 28 deletions.
diff --git a/test/index.js b/test/index.js
@@ -5,7 +5,7 @@ const Os = require('os');
 const Path = require('path');
 
 const Code = require('code');
-const Form = require('multi-part').buffer;
+const Form = require('multi-part');
 const Hapi = require('hapi');
 const Lab = require('lab');
 
@@ -53,23 +53,16 @@ lab.experiment('copperfield', () => {
         form.append('file3', Fs.createReadStream(gif));
         form.append('foo', 'bar');
 
-        form.getWithOptions((err, data) => {
+        server.inject({ headers: form.getHeaders(), method: 'POST', payload: form.get(), url: '/' }, (response) => {
 
-            if (err) {
-                return done(err);
-            }
-
-            server.inject({ headers: data.headers, method: 'POST', payload: data.body, url: '/' }, (response) => {
-
-                Code.expect(response.statusCode).to.equal(400);
-                Code.expect(response.headers['content-validation']).to.equal('failure');
-                Code.expect(response.result).to.include(['message', 'validation']);
-                Code.expect(response.result.message).to.equal('child \"file1\" fails because [\"file1\" type is not allowed]');
-                Code.expect(response.result.validation).to.include(['source', 'keys']);
-                Code.expect(response.result.validation.source).to.equal('payload');
-                Code.expect(response.result.validation.keys).to.include('file1');
-                done();
-            });
+            Code.expect(response.statusCode).to.equal(400);
+            Code.expect(response.headers['content-validation']).to.equal('failure');
+            Code.expect(response.result).to.include(['message', 'validation']);
+            Code.expect(response.result.message).to.equal('child \"file1\" fails because [\"file1\" type is not allowed]');
+            Code.expect(response.result.validation).to.include(['source', 'keys']);
+            Code.expect(response.result.validation.source).to.equal('payload');
+            Code.expect(response.result.validation.keys).to.include('file1');
+            done();
         });
     });
 
@@ -83,18 +76,11 @@ lab.experiment('copperfield', () => {
         form.append('file2', Fs.createReadStream(png));
         form.append('foo', 'bar');
 
-        form.getWithOptions((err, data) => {
-
-            if (err) {
-                return done(err);
-            }
-
-            server.inject({ headers: data.headers, method: 'POST', payload: data.body, url: '/' }, (response) => {
+        server.inject({ headers: form.getHeaders(), method: 'POST', payload: form.get(), url: '/' }, (response) => {
 
-                Code.expect(response.statusCode).to.equal(200);
-                Code.expect(response.headers['content-validation']).to.equal('success');
-                done();
-            });
+            Code.expect(response.statusCode).to.equal(200);
+            Code.expect(response.headers['content-validation']).to.equal('success');
+            done();
         });
     });
 });