From 097e4552a3f47a38bc4ae97eb53993f13106904e Mon Sep 17 00:00:00 2001
From: Robert Jackson <robert.w.jackson@me.com>
Date: Wed, 9 Sep 2015 22:57:07 -0400
Subject: [PATCH] Use addModuleIncludeMatcher instead of prototype mutation.

---
 vendor/ember-cli-qunit/test-loader.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/vendor/ember-cli-qunit/test-loader.js b/vendor/ember-cli-qunit/test-loader.js
index 3d3006cf..6a703e83 100644
--- a/vendor/ember-cli-qunit/test-loader.js
+++ b/vendor/ember-cli-qunit/test-loader.js
@@ -1,10 +1,19 @@
 /* globals jQuery,QUnit */
 
 jQuery(document).ready(function() {
-  var TestLoader = require('ember-cli/test-loader')['default'];
-  TestLoader.prototype.shouldLoadModule = function(moduleName) {
+  var TestLoaderModule = require('ember-cli/test-loader');
+  var TestLoader = TestLoaderModule['default'];
+  var addModuleIncludeMatcher = TestLoaderModule['addModuleIncludeMatcher'];
+
+  function moduleMatcher(moduleName) {
     return moduleName.match(/\/.*[-_]test$/) || (!QUnit.urlParams.nojshint && moduleName.match(/\.jshint$/));
-  };
+  }
+
+  if (addModuleIncludeMatcher) {
+    addModuleIncludeMatcher(moduleMatcher);
+  } else {
+    TestLoader.prototype.shouldLoadModule = moduleMatcher;
+  }
 
   TestLoader.prototype.moduleLoadFailure = function(moduleName, error) {
     QUnit.module('TestLoader Failures');