Merge pull request #5 from erikras/fixed-alpha-bug

Fixed alpha bug

Author: erikras

src/__tests__/addModifier.spec.js

@@ -3,12 +3,14 @@ import Color from 'color'
 import addModifer from '../addModifier'
 import methods from '../colorMethods'
 
-const selector = () => new Color('#2A2A2A').hex()
+const selector = () => new Color('#2A2A2A').toString()
 
 const testModifier = (modifier, ...args) => {
   const modified = addModifer(selector, modifier, ...args)
   expect(modified).toBeA('function')
-  expect(modified()).toEqual(new Color(selector())[modifier](...args).hex())
+  expect(modified()).toEqual(
+    new Color(selector())[modifier](...args).toString()
+  )
 }
 
 describe('addModifier', () => {

src/__tests__/decorateSelector.spec.js

@@ -10,7 +10,7 @@ const testHasAllMethods = selector =>
 describe('decorateSelector', () => {
   colorMethods.forEach(method => {
     it(`adds ${method} method`, () => {
-      const selector = () => new Color('#2A2A2A').hex()
+      const selector = () => new Color('#2A2A2A').toString()
       decorateSelector(selector)
       expect(selector[method]).toBeA('function')
       testHasAllMethods(selector[method]())
@@ -19,7 +19,7 @@ describe('decorateSelector', () => {
   Object.keys(aliases).forEach(method => {
     aliases[method].forEach(alias => {
       it(`adds ${alias} alias for ${method}`, () => {
-        const selector = () => new Color('#2A2A2A').hex()
+        const selector = () => new Color('#2A2A2A').toString()
         decorateSelector(selector)
         expect(selector[alias]).toBeA('function')
         testHasAllMethods(selector[alias]())

src/__tests__/index.spec.js

@@ -32,10 +32,10 @@ describe('makeTheme', () => {
     const darkerRed = redSelector.darken(0.1)
 
     expect(lighterGray(themeFromProvider)).toBe(
-      new Color(colors.gray).lighten(0.4).hex()
+      new Color(colors.gray).lighten(0.4).toString()
     )
     expect(darkerRed(themeFromProvider)).toBe(
-      new Color(colors.red).darken(0.1).hex()
+      new Color(colors.red).darken(0.1).toString()
     )
   })
 })

src/addModifier.js

@@ -6,6 +6,6 @@ import Color from 'color'
  * color string.
  */
 const addModifier = (fn, method, ...modifierArgs) => (...args) =>
-  new Color(fn(...args))[method](...modifierArgs).hex()
+  new Color(fn(...args))[method](...modifierArgs).toString()
 
 export default addModifier

src/decorateSelector.js

@@ -3,7 +3,7 @@ import addModifier from './addModifier'
 import aliases from './aliases'
 
 /**
- * Add useful methods directly to selector function, as well as put an hex() call at the end
+ * Add useful methods directly to selector function, as well as put an toString() call at the end
  * @param selector
  */
 const decorateSelector = selector => {