From 56e9f98bd05de8ae26f653d15eec4304f0c72155 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Thu, 2 Nov 2017 09:45:59 -0230
Subject: More lint fixes

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 28f35914f..1fea3656c 100644
--- a/package.json
+++ b/package.json
@@ -190,6 +190,7 @@
     "enzyme": "^2.8.2",
     "eslint-plugin-chai": "0.0.1",
     "eslint-plugin-mocha": "^4.9.0",
+    "eslint-plugin-react": "^7.4.0",
     "eth-json-rpc-middleware": "^1.2.7",
     "fs-promise": "^2.0.3",
     "gulp": "github:gulpjs/gulp#4.0",
-- 
cgit 


From b7653e82079b60078b921776b169518d13c7e806 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Thu, 2 Nov 2017 14:58:41 -0230
Subject: Get current NewUI-flat tests working.

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 1fea3656c..bbf4c772c 100644
--- a/package.json
+++ b/package.json
@@ -227,6 +227,7 @@
     "react-addons-test-utils": "^15.5.1",
     "react-test-renderer": "^15.5.4",
     "react-testutils-additions": "^15.2.0",
+    "redux-test-utils": "^0.1.3",
     "sinon": "^4.0.0",
     "stylelint-config-standard": "^17.0.0",
     "tape": "^4.5.1",
-- 
cgit 


From acc973d543ac65f8db980c0007c248c509345411 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Thu, 2 Nov 2017 17:15:45 -0230
Subject: Update classnames for integration tests and add output/index.css to
 integration test for ci

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index bbf4c772c..12c839739 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "test": "npm run lint && npm run test:coverage && npm run test:integration",
     "test:unit": "METAMASK_ENV=test mocha --compilers js:babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"",
     "test:single": "METAMASK_ENV=test mocha --require test/helper.js",
-    "test:integration": "npm run test:flat && npm run test:mascara",
+    "test:integration": "gulp build:scss && npm run test:flat && npm run test:mascara",
     "test:coverage": "nyc npm run test:unit && npm run test:coveralls-upload",
     "test:coveralls-upload": "if [ $COVERALLS_REPO_TOKEN ]; then nyc report --reporter=text-lcov | coveralls; fi",
     "test:flat": "npm run test:flat:build && karma start test/flat.conf.js",
-- 
cgit