Introduced 'static' key for muiTheme object.

Fixed unit tests to use new theming code.
mui · Sep 22, 2015 · d9bfeb0 · d9bfeb0
1 parent 75848a8
commit d9bfeb0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/styles/theme-manager.js b/src/styles/theme-manager.js
@@ -196,9 +196,12 @@ module.exports = {
     returnObj.raisedButton.disabledTextColor = ColorManipulator.fade(returnObj.raisedButton.textColor, 0.3);
     returnObj.toggle.trackRequiredColor = ColorManipulator.fade(returnObj.toggle.thumbRequiredColor, 0.5);
 
-    //finally, append the raw theme object to 'returnObj'
+    //append the raw theme object to 'returnObj'
     returnObj.rawTheme = rawTheme;
 
+    //set 'static' key as true (by default) on return object. This is to support the ContextPure mixin.
+    returnObj.static = true;
+
     return returnObj;
   },
 

diff --git a/test/fixtures/inject-theme.jsx b/test/fixtures/inject-theme.jsx
@@ -1,11 +1,9 @@
 import stubContext from 'react-stub-context';
 import ThemeManager from 'styles/theme-manager';
-
-const Manager = new ThemeManager();
-
+import DefaultRawTheme from 'styles/raw-themes/light-raw-theme';
 
 function injectTheme(Component, theme) {
-  let injectedTheme = theme || Manager.getCurrentTheme();
+  let injectedTheme = theme || ThemeManager.getMuiTheme(DefaultRawTheme);
   return stubContext(Component, {muiTheme: injectedTheme});
 }
 

diff --git a/test/mixin-context-pure-spec.js b/test/mixin-context-pure-spec.js
@@ -1,6 +1,7 @@
 import React from 'react/addons';
 import ContextPure from 'mixins/context-pure';
 import ThemeManager from 'styles/theme-manager';
+import DefaultRawTheme from 'styles/raw-themes/light-raw-theme';
 
 const TestUtils = React.addons.TestUtils;
 const update = React.addons.update;
@@ -98,7 +99,7 @@ const ParentComponent = React.createClass({
 
   getChildContext() {
     return {
-      muiTheme: this.theme.getCurrentTheme(),
+      muiTheme: this.theme,
     };
   },
 
@@ -109,7 +110,7 @@ const ParentComponent = React.createClass({
   },
 
   componentWillMount() {
-    this.theme = new ThemeManager();
+    this.theme = ThemeManager.getMuiTheme(DefaultRawTheme);
     this.theme.static = this.props.staticTheme;
     this.theme.childThemeProp = 0;
     this.theme.grandChildThemeProp = 0;