From bf369955a905e7d26f76247b2fc1e336764047e1 Mon Sep 17 00:00:00 2001
From: Jake Craige <jake@poeticsystems.com>
Date: Fri, 14 Nov 2014 13:20:59 -0600
Subject: [PATCH] put fixtures on window.fixtures instead of proxyFixtures to
 not conflict with instance of proxyFixtues

---
 index.js           | 4 ++--
 lib/test-loader.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/index.js b/index.js
index e5a1848..fd07640 100644
--- a/index.js
+++ b/index.js
@@ -25,8 +25,8 @@ module.exports = {
       mkdirp.sync(proxyFixturesPath);
     }
     var proxyTree = jsonConcat(proxyFixturesPath, {
-      outputFile: 'proxyFixtures.js',
-      variableName: 'window.proxyFixtures'
+      outputFile: 'fixtures.js',
+      variableName: 'window.fixtures'
     });
 
     var lib = this.treeGenerator(path.join(__dirname, 'lib'));
diff --git a/lib/test-loader.js b/lib/test-loader.js
index 49032a0..dc879e9 100644
--- a/lib/test-loader.js
+++ b/lib/test-loader.js
@@ -1,2 +1,2 @@
-var proxyFixtures = new QUnit.ProxyFixtures('proxyFixtures');
+var proxyFixtures = new QUnit.ProxyFixtures('fixtures');
 proxyFixtures.hookIntoQUnit();