Merge b5ab7d9 into d58e3a2

test/expects/custom.css

@@ -0,0 +1,21 @@
+@import "imports/section.css";
+
+.ComponentName{
+
+    color: cyan;
+
+    @when stateName{
+
+        color: crimson;
+    }
+}
+
+.ComponentName--modifierName{
+
+    color: yellow;
+}
+
+.ComponentName__descendentName{
+
+    color: navy;
+}

test/expects/custom.sss.css

@@ -0,0 +1,21 @@
+@import "imports/section.sss";;
+
+.ComponentName {
+
+  color: cyan;;
+
+  @when stateName {
+
+    color: crimson;
+  }
+}
+
+.ComponentName--modifierName {
+
+  color: yellow;
+}
+
+.ComponentName__descendentName {
+
+  color: navy;
+}

test/expects/index.css

@@ -1,18 +1,21 @@
-@import "css/section.css";
+@import "imports/section.css";
 
-.index{}
+.ComponentName{
 
-.index__test{
+    color: cyan
+}
+
+.ComponentName.is-stateName{
 
-    color: blue;
+    color: crimson
 }
 
-.index--test{
+.ComponentName--modifierName{
 
-    color: red;
+    color: yellow
 }
 
-.index-nested {
+.ComponentName-descendentName{
 
-    color: goldenrod;
+    color: navy
 }

test/expects/index.sss.css

@@ -0,0 +1,21 @@
+@import "imports/section.sss";;
+
+.ComponentName {
+
+  color: cyan;
+}
+
+.ComponentName.is-stateName {
+
+  color: crimson;
+}
+
+.ComponentName--modifierName {
+
+  color: yellow;
+}
+
+.ComponentName-descendentName {
+
+  color: navy;
+}

test/fixtures/index.css

@@ -1,13 +1,17 @@
 @import "imports/section.css";
 
-.index {
+@component ComponentName {
+  color: cyan;
 
-  &__test {
-    color: blue;
+  @modifier modifierName {
+    color: yellow;
   }
 
-  &--test {
-    color: red;
+  @descendent descendentName {
+    color: navy;
   }
 
+  @when stateName {
+    color: crimson;
+  }
 }

test/fixtures/index.sss

@@ -1,10 +1,14 @@
 @import "imports/section.sss";
 
-.index
-  color: blue;
+@component ComponentName
+  color: cyan;
 
-.index__red
-  color: red;
+  @modifier modifierName
+    color: yellow;
 
-.index__goldenrod
-  color: goldenrod;
+  @descendent descendentName
+    color: navy;
+
+
+  @when stateName
+    color: crimson;

test/index.js

@@ -10,71 +10,69 @@ var fs = require('fs')
 var path = require('path')
 
 function fixtures (file) {
-  return fs.readFileSync(path.join(__dirname, 'fixtures', file))
+  return fs.readFileSync(path.join(__dirname, 'fixtures', file), 'utf8')
 }
 
 function expected (file) {
-  return fs.readFileSync(path.join(__dirname, 'expects', file))
+  return fs.readFileSync(path.join(__dirname, 'expects', file), 'utf8')
 }
 
 var postcss = require('postcss')
 var pluginsrc = require('..')
 
 test('1 - Load with default plugins ', function (t) {
-  pluginsrc().then(function (plugins) {
-    t.is(expected('plugins.default.js'), plugins)
+  return pluginsrc().then(function (plugins) {
+    t.is(plugins.length, 3)
+    t.is(plugins[0].postcssPlugin, 'postcss-import')
+    t.is(plugins[1].postcssPlugin, 'postcss-nested')
+    t.is(plugins[2].postcssPlugin, 'postcss-bem')
   })
 })
 
 test('2 - Load with custom plugins ', function (t) {
-  pluginsrc('postcss.config.js').then(function (plugins) {
-    t.is(expected('plugins.custom.js'), plugins)
+  return pluginsrc('postcss.config.js').then(function (plugins) {
+    t.is(plugins.length, 3)
+    t.is(plugins[0].postcssPlugin, 'postcss-import')
+    t.is(plugins[1].postcssPlugin, 'postcss-nested')
+    t.is(plugins[2].postcssPlugin, 'postcss-bem')
   })
 })
 
 test('3 - Process CSS with default plugins', function (t) {
-  pluginsrc().then(function (plugins) {
-    postcss(plugins)
+  return pluginsrc().then(function (plugins) {
+    return postcss(plugins)
       .process(fixtures('index.css'))
       .then(function (result) {
-        console.log(result.css)
-        fs.writeFileSync('expects/index.css', result.css)
         t.is(expected('index.css'), result.css)
       })
   })
 })
 
 test('4 - Process SSS with custom plugins', (t) => {
-  pluginsrc('postcss.config.js').then((plugins) => {
-    postcss(plugins)
+  return pluginsrc('postcss.config.js').then((plugins) => {
+    return postcss(plugins)
       .process(fixtures('index.css'))
       .then(function (result) {
-        console.log(result.css)
-        fs.writeFileSync('expects/custom.css', result.css)
         t.is(expected('custom.css'), result.css)
       })
   })
 })
 
 test('5 - Process SSS with default plugins', function (t) {
-  pluginsrc().then(function (plugins) {
-    postcss(plugins)
+  return pluginsrc().then(function (plugins) {
+    return postcss(plugins)
       .process(fixtures('index.sss'), {parser: require('sugarss')})
       .then(function (result) {
-        console.log(result.css)
-        fs.writeFileSync('expects/index.sss.css', result.css)
         t.is(expected('index.sss.css'), result.css)
       })
   })
 })
 
 test('6 - Process SSS with custom plugins', function (t) {
-  pluginsrc('postcssrc.json').then(function (plugins) {
-    postcss(plugins)
+  return pluginsrc('postcssrc.json').then(function (plugins) {
+    return postcss(plugins)
       .process(fixtures('index.sss'), {parser: require('sugarss')})
       .then(function (result) {
-        console.log(result.css)
-        fs.writeFileSync('expects/custom.sss.css', result.css)
         t.is(expected('custom.sss.css'), result.css)
       })
   })

test/package.json

@@ -15,9 +15,9 @@
   },
   "postcss": {
     "plugins": {
-      "postcss-import": false,
-      "postcss-nested": false,
-      "postcss-bem": false
+      "postcss-import": null,
+      "postcss-nested": null,
+      "postcss-bem": null
     }
   }
 }

test/postcss.config.js

@@ -1,7 +1,7 @@
 module.exports = {
   plugins: {
-    'postcss-import': false,
-    'postcss-nested': false,
+    'postcss-import': null,
+    'postcss-nested': null,
     'postcss-bem': {
       style: 'bem',
       separators: {

test/postcssrc.json

@@ -1,7 +1,7 @@
 {
   "plugins": {
-    "potscss-import": false,
-    "postcss-nested": false,
+    "postcss-import": null,
+    "postcss-nested": null,
     "postcss-bem": {
       "style": "bem",
       "separators": {