From 1007b1103207b0132e38136de4bac833d3a35ba8 Mon Sep 17 00:00:00 2001
From: Robert Knight <robertknight@gmail.com>
Date: Sun, 10 Jan 2016 12:55:25 +0000
Subject: [PATCH] Use CommonJS-style requires for rewire

In order for rewire calls to be correctly handled like
require() calls by Webpack, rewire currently needs
to be imported using CommonJS style syntax.

See https://github.com/jhnns/rewire-webpack/issues/12
for a discussion and explanation.
---
 package.json            | 4 ++--
 tests/TweetItem_test.js | 8 +++++++-
 tests/TweetList_test.js | 3 ++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 01d0e6b..707507c 100644
--- a/package.json
+++ b/package.json
@@ -38,8 +38,8 @@
     "mocha-loader": "^0.7.1",
     "null-loader": "^0.1.1",
     "react-addons-test-utils": "^0.14.6",
-    "rewire": "^2.3.1",
-    "rewire-webpack": "^1.0.0",
+    "rewire": "^2.5.1",
+    "rewire-webpack": "^1.0.1",
     "rx": "^2.4.3",
     "webpack": "^1.7.3",
     "webpack-dev-server": "^1.7.0"
diff --git a/tests/TweetItem_test.js b/tests/TweetItem_test.js
index 54972ad..d41e584 100644
--- a/tests/TweetItem_test.js
+++ b/tests/TweetItem_test.js
@@ -2,12 +2,18 @@ import React from 'react';
 import {renderIntoDocument} from 'react-addons-test-utils';
 
 import {expect} from 'chai';
-import rewire from 'rewire';
 
 import setup from './setup';
 
 import TweetItem from '../src/TweetItem';
 
+// CommonJS syntax is used for importing rewire for compatibility
+// with babel-loader.
+//
+// See https://github.com/jhnns/rewire-webpack/issues/12#issuecomment-95797024
+// for an explanation
+var rewire = require('rewire');
+
 const TEST_TWEET = {
   id: 'tweet-1',
   user: {
diff --git a/tests/TweetList_test.js b/tests/TweetList_test.js
index d5a9f5b..f9881c4 100644
--- a/tests/TweetList_test.js
+++ b/tests/TweetList_test.js
@@ -1,13 +1,14 @@
 import React, {Component} from 'react';
 import {findDOMNode, render} from 'react-dom';
 import {createRenderer, scryRenderedComponentsWithType, renderIntoDocument} from 'react-addons-test-utils';
-import rewire from 'rewire';
 import {expect} from 'chai';
 
 import * as utils from './utils';
 
 import TweetItem from '../src/TweetItem';
 
+var rewire = require('rewire');
+
 const TEST_TWEETS = [{
   id: 'tweet-1',
   user: {