Merge remote-tracking branch 'origin/beta'

lib/tasks/test.js

@@ -27,12 +27,14 @@ class TestTask extends Task {
     });
   }
 
-  addonMiddlewares() {
+  addonMiddlewares(options) {
     this.project.initializeAddons();
 
     return this.project.addons.reduce((addons, addon) => {
       if (addon.testemMiddleware) {
-        addons.push(addon.testemMiddleware.bind(addon));
+        addons.push(function () {
+          addon.testemMiddleware(...arguments, options);
+        });
       }
 
       return addons;
@@ -54,7 +56,7 @@ class TestTask extends Task {
       port: options.port,
       debug: options.testemDebug,
       reporter: options.reporter,
-      middleware: this.addonMiddlewares(),
+      middleware: this.addonMiddlewares(options),
       launch: options.launch,
       file: options.configFile,
       /* eslint-disable camelcase */
@@ -67,7 +69,6 @@ class TestTask extends Task {
       transformed.key = options.sslKey;
       transformed.cert = options.sslCert;
     }
-
     return transformed;
   }
 

tests/fixtures/tasks/testem-config/testem-dummy.json

@@ -0,0 +1,9 @@
+{
+  "framework": "qunit",
+  "launch": "Dummy",
+  "launchers": {
+    "Dummy" : {
+      "command": "exit"
+    }
+  }
+}

tests/unit/tasks/test-test.js

@@ -7,6 +7,32 @@ const MockProject = require('../../helpers/mock-project');
 describe('test task test', function () {
   let subject;
 
+  it('call testem middleware with options', async function () {
+    let testemMiddlewareOptions;
+    let project = new MockProject();
+
+    project.initializeAddons = function () {};
+    project.addons = [
+      {
+        testemMiddleware(_, options) {
+          testemMiddlewareOptions = options;
+        },
+      },
+    ];
+
+    let options = {
+      reporter: 'xunit',
+      configFile: 'tests/fixtures/tasks/testem-config/testem-dummy.json',
+      path: 'dist',
+      ssl: false,
+    };
+
+    subject = new TestTask({ project });
+    await subject.run(options);
+    expect(testemMiddlewareOptions).to.deep.equal(options);
+    expect(testemMiddlewareOptions.path).to.equal('dist');
+  });
+
   it('transforms options for testem configuration', function () {
     subject = new TestTask({
       project: new MockProject(),