Merge pull request #75 from becklocey/master

eatrocks · web-flow · commit 236b435e59be · 2017-05-16T11:10:19.000-06:00
Resolved Button unit test error, and renamed Button test file. Fixed …
diff --git a/package.json b/package.json
@@ -73,6 +73,7 @@
     "postcss-import": "^9.1.0",
     "postcss-loader": "^1.2.2",
     "react-addons-test-utils": "^15.0.1",
+    "sinon": "^2.2.0",
     "style-loader": "^0.13.0",
     "tap-spec": "^4.1.1",
     "tape": "^4.4.0",
diff --git a/src/app/components/Button/Button.css b/src/app/components/Button/Button.css
@@ -1,4 +1,4 @@
-@import 'variables.css';
+@import '../../variables.css';
 
 .button {
     background-color: var(--white, white);
diff --git a/src/app/components/Button/Button.spec.js b/src/app/components/Button/Button.spec.js

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@import 'variables.css';`
	`1`	`+@import '../../variables.css';`
`2`	`2`
`3`	`3`	`.button {`
`4`	`4`	`background-color: var(--white, white);`