diff --git a/.gitignore b/.gitignore
index ce917dd756..10dd2b4a9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,7 @@ packages/driver/test/cypress/videos
packages/server/.cy
packages/server/.projects
packages/server/support
+packages/server/test/support/fixtures/server/imgs
packages/server/test/support/fixtures/server/libs
# CLI tool
diff --git a/packages/server/__snapshots__/2_form_submissions_spec.coffee.js b/packages/server/__snapshots__/2_form_submissions_spec.coffee.js
index 541c285709..a7d21c781f 100644
--- a/packages/server/__snapshots__/2_form_submissions_spec.coffee.js
+++ b/packages/server/__snapshots__/2_form_submissions_spec.coffee.js
@@ -1,4 +1,4 @@
-exports['e2e form submissions passing 1'] = `
+exports['e2e forms
+
+
+ """
+
+onServer = (app) ->
+ app.post "/verify-attachment", (req, res) ->
+ form = new multiparty.Form()
+
+ form.parse req, (err, fields, files) ->
+ fixturePath = path.resolve(e2ePath, "cypress", "fixtures", fields["foo"][0])
+ filePath = files["bar"][0].path
+
+ Promise.props({
+ fixture: fs.readFileAsync(fixturePath),
+ upload: fs.readFileAsync(filePath)
+ })
+ .then ({ fixture, upload }) ->
+ ret = fixture.compare(upload)
+
+ if ret is 0
+ return res.send('files match')
+
+ res.send(
+ """
+ file did not match. file at #{fixturePath} did not match #{filePath}.
+
+
+ buffer compare yielded: #{ret}
+ """
+ )
+
+ ## all routes below this point will have bodies parsed
+ app.use(bodyParser.text({
+ type: '*/*' ## parse any content-type
+ }))
+
+ app.get "/", (req, res) ->
+ res
+ .type('html')
+ .send(getFormHtml('action="/dump-body"'))
+
+ app.get "/multipart-form-data", (req, res) ->
+ res
+ .type('html')
+ .send(getFormHtml('action="/dump-body" enctype="multipart/form-data"'))
+
+ app.get "/multipart-with-attachment", (req, res) ->
+ res
+ .type('html')
+ .send(getFormHtml('action="/verify-attachment" enctype="multipart/form-data"', req.query.fixturePath))
+
+ app.post "/dump-body", (req, res) ->
+ res
+ .type('html')
+ .send(req.body)
+
+describe "e2e forms", ->
+ context "submissions with jquery XHR POST", ->
+ e2e.setup()
+
+ it "passing", ->
+ e2e.exec(@, {
+ spec: "form_submission_passing_spec.coffee"
+ snapshot: true
+ expectedExitCode: 0
+ })
+
+ it "failing", ->
+ e2e.exec(@, {
+ spec: "form_submission_failing_spec.coffee"
+ snapshot: true
+ expectedExitCode: 1
+ })
+
+ context "")
+ res.send(
+ """
+
+
+
+
+
+ """
+ )
printBodyThirdTime: (req, res) ->
console.log(req.body)
res.type('html')
- if counts[req.url] == 3
+
+ if counts[req.url] is 3
return res.send(JSON.stringify(req.body))
req.socket.destroy()
diff --git a/packages/server/test/support/fixtures/projects/e2e/cypress/fixtures/bigger-sample.pdf b/packages/server/test/support/fixtures/projects/e2e/cypress/fixtures/bigger-sample.pdf
new file mode 100644
index 0000000000..b7f1de7f22
Binary files /dev/null and b/packages/server/test/support/fixtures/projects/e2e/cypress/fixtures/bigger-sample.pdf differ
diff --git a/packages/server/test/support/fixtures/projects/e2e/cypress/fixtures/sample.jpg b/packages/server/test/support/fixtures/projects/e2e/cypress/fixtures/sample.jpg
new file mode 100644
index 0000000000..f77abf0a77
Binary files /dev/null and b/packages/server/test/support/fixtures/projects/e2e/cypress/fixtures/sample.jpg differ
diff --git a/packages/server/test/support/fixtures/projects/e2e/cypress/fixtures/sample.pdf b/packages/server/test/support/fixtures/projects/e2e/cypress/fixtures/sample.pdf
new file mode 100644
index 0000000000..f698ff53d4
Binary files /dev/null and b/packages/server/test/support/fixtures/projects/e2e/cypress/fixtures/sample.pdf differ
diff --git a/packages/server/test/support/fixtures/projects/e2e/cypress/integration/form_submission_multipart_spec.coffee b/packages/server/test/support/fixtures/projects/e2e/cypress/integration/form_submission_multipart_spec.coffee
new file mode 100644
index 0000000000..20f7bb960a
--- /dev/null
+++ b/packages/server/test/support/fixtures/projects/e2e/cypress/integration/form_submission_multipart_spec.coffee
@@ -0,0 +1,77 @@
+{ Blob, _ } = Cypress
+
+Cypress.Commands.add 'setFile', { prevSubject: "element" }, (element, filePath) ->
+ mimeTypes = {
+ jpeg: "image/jpeg"
+ jpg: "image/jpeg"
+ png: "image/png"
+ pdf: "application/pdf"
+ }
+
+ filePathSplitted = filePath.split('.').pop()
+ mimeType = if mimeTypes[filePathSplitted] != undefined then mimeTypes[filePathSplitted] else null
+
+ fixtureOrReadFile = (filePath) ->
+ if _.startsWith(filePath, "/")
+ return cy.readFile(filePath, "base64")
+
+ return cy.fixture(filePath, "base64")
+
+ return fixtureOrReadFile(filePath).then (image) ->
+ return Blob.base64StringToBlob(image).then (blob) ->
+ elementNode = element[0]
+ file = new File([ blob ], filePath, type: mimeType)
+ dataTransfer = new DataTransfer
+ dataTransfer.items.add(file)
+ elementNode.files = dataTransfer.files
+ elementNode.dispatchEvent new Event("change", { bubbles: true })
+
+describe "
-
\ No newline at end of file
+
diff --git a/packages/server/test/unit/stream_buffer_spec.js b/packages/server/test/unit/stream_buffer_spec.js
index 09af953c53..be48f473b4 100644
--- a/packages/server/test/unit/stream_buffer_spec.js
+++ b/packages/server/test/unit/stream_buffer_spec.js
@@ -1,116 +1,225 @@
-const { describe, it } = require('mocha')
-const { expect } = require('chai')
+require('../spec_helper')
+
+const _ = require('lodash')
const fs = require('fs')
-const streamBuffer = require('../../lib/util/stream_buffer')
const stream = require('stream')
+const Promise = require('bluebird')
+const concatStream = require('concat-stream')
+const { streamBuffer } = require('../../lib/util/stream_buffer')
function drain (stream) {
- let buf = ''
- let chunk
-
- while ((chunk = stream.read())) {
- buf += chunk
- }
-
- return buf
+ return new Promise((resolve) => {
+ return stream.pipe(concatStream((buf) => {
+ resolve(buf.toString())
+ }))
+ })
}
-describe('lib/util/stream_buffer', function () {
- it('reads out no matter when we write', function () {
+describe('lib/util/stream_buffer', () => {
+ it('reads out no matter when we write', function (done) {
+ done = _.after(2, done)
const pt = stream.PassThrough()
- const sb = streamBuffer.streamBuffer()
+ const sb = streamBuffer()
pt.pipe(sb)
- pt.write('test')
- pt.write('test 2')
+ pt.write('1')
+ pt.write(' 2')
- const reader = sb.reader()
+ const tickWrite = (chunk) => {
+ process.nextTick(() => {
+ pt.write(chunk)
+ })
+ }
- let buf = drain(reader)
+ const readable = sb.createReadStream()
- expect(buf).to.eq('testtest 2')
+ readable.once('data', (data2) => {
+ expect(data2.toString()).to.eq('1 2')
- pt.write('test 3')
+ tickWrite(' 3')
- buf += drain(reader)
+ readable.once('data', (data3) => {
+ expect(data3.toString()).to.eq(' 3')
- expect(buf).to.eq('testtest 2test 3')
+ tickWrite(' 4')
- pt.write('test 4')
+ const readable2 = sb.createReadStream()
- const reader2 = sb.reader()
+ readable.once('data', (data4) => {
+ expect(data4.toString()).to.eq(' 4')
+ })
- let buf2 = drain(reader2)
+ readable2.once('data', (data) => {
+ expect(data.toString()).to.eq('1 2 3 4')
- expect(buf2).to.eq('testtest 2test 3test 4')
+ tickWrite(' 5')
- pt.write('test 5')
+ readable2.once('data', (data5) => {
+ expect(data5.toString()).to.eq(' 5')
- buf += drain(reader)
- expect(buf).to.eq('testtest 2test 3test 4test 5')
+ done()
+ })
- buf2 += drain(reader2)
- expect(buf2).to.eq('testtest 2test 3test 4test 5')
+ readable.once('data', (data5) => {
+ expect(data5.toString()).to.eq(' 5')
+
+ done()
+ })
+ })
+ })
+ })
})
- it('on overflow, enlarges the internal buffer by the smallest power of 2 that can fit the chunk', function () {
- const sb = streamBuffer.streamBuffer(64)
+ it('on overflow, enlarges the internal buffer by the smallest power of 2 that can fit the chunk', () => {
+ const sb = streamBuffer(64)
sb.write('A'.repeat(65))
expect(sb._buffer().length).to.eq(128)
- sb.write('A'.repeat(1024))
+ sb.end('A'.repeat(1024))
expect(sb._buffer().length).to.eq(2048)
- const reader = sb.reader()
- const buf = drain(reader)
+ const readable = sb.createReadStream()
- expect(buf).to.eq('A'.repeat(1089))
+ return drain(readable)
+ .then((buf) => {
+ expect(buf).to.eq('A'.repeat(1089))
+ })
})
- it('finishes when buffer stream closes while still allowing data to be drained', function () {
- const sb = streamBuffer.streamBuffer()
-
- sb.pipe(sb)
+ it('finishes when buffer stream closes while still allowing data to be drained', (done) => {
+ const sb = streamBuffer()
sb.write('foo')
sb.write('bar')
expect(sb._finished()).to.be.false
- sb.end()
- expect(sb._finished()).to.be.true
+ sb.end(() => {
+ expect(sb._finished()).to.be.true
- const reader = sb.reader()
- const buf = drain(reader)
+ const readable = sb.createReadStream()
- expect(buf).to.eq('foobar')
+ return drain(readable)
+ .then((buf) => {
+ expect(buf).to.eq('foobar')
- const reader2 = sb.reader()
- const buf2 = drain(reader2)
+ const readable2 = sb.createReadStream()
- expect(buf2).to.eq('foobar')
+ return drain(readable2)
+ .then((buf2) => {
+ expect(buf2).to.eq('foobar')
+
+ done()
+ })
+ })
+ })
})
it('can be piped into and then read from', function (done) {
const expected = fs.readFileSync(__filename).toString()
const rs = fs.createReadStream(__filename)
- const ws = fs.createWriteStream('/dev/null')
- const sb = streamBuffer.streamBuffer()
+ const sb = streamBuffer()
- rs.pipe(sb).pipe(ws)
+ rs.pipe(sb)
- const reader = sb.reader()
+ const readable = sb.createReadStream()
rs.on('end', () => {
- const buf = drain(reader)
+ return drain(readable)
+ .then((buf) => {
+ expect(buf).to.eq(expected)
- expect(buf).to.eq(expected)
-
- done()
+ done()
+ })
})
})
+ it('readable recursively pushes until it returns false', (done) => {
+ const sb = streamBuffer()
+ const readable = sb.createReadStream()
+ const writeable = stream.Writable({
+ final () {
+ expect(readable.push).to.be.calledTwice
+ expect(readable.push.firstCall).to.be.calledWith(buf)
+ expect(readable.push.secondCall).to.be.calledWith(null)
+ done()
+ },
+ write (chunk, enc, cb) {
+ cb()
+ },
+ })
+
+ sinon.spy(readable, 'push')
+
+ readable.pipe(writeable)
+
+ const size = 64 * 1024 // 64 kb
+ const buf = Buffer.alloc(size, '!')
+
+ sb.end(buf)
+ })
+
+ it('readable pipes do not end until the writeable ends', function (done) {
+ const sb = streamBuffer()
+ const readable = sb.createReadStream()
+ const writeable = stream.Writable({
+ final () {
+ expect(sb.writable).to.be.false
+ expect(sb._writableState).to.have.property('ended', true)
+ done()
+ },
+ write (chunk, enc, cb) {
+ process.nextTick(() => {
+ if (sb.writable) {
+ sb.end('asdf')
+ }
+ })
+
+ cb()
+ },
+ })
+
+ readable.pipe(writeable)
+
+ const size = 64 * 1024 // 64 kb
+ const buf = Buffer.alloc(size, '!')
+
+ sb.write(buf)
+ })
+
+ it('can handle a massive req body', function (done) {
+ const size = 16 * 1024 // 16 kb
+ const repeat = 3
+
+ const body = Buffer.alloc(size, '!')
+ const sb = streamBuffer()
+
+ const pt = new stream.PassThrough({
+ highWaterMark: Number.MAX_SAFE_INTEGER,
+ })
+
+ pt.pipe(sb, { end: true })
+
+ pt.write(Buffer.alloc(size, '!'))
+ pt.write(Buffer.alloc(size, '!'))
+ pt.write(Buffer.alloc(size, '!'))
+
+ pt.on('end', () => {
+ const readable = sb.createReadStream()
+
+ drain(readable)
+ .then((buf) => {
+ expect(buf.length).to.eq(body.length * repeat)
+
+ expect(buf).to.eq(body.toString().repeat(repeat))
+ done()
+ })
+ })
+
+ pt.end()
+ })
+
})