got a failing test that actually waits for the promises to resolve

Author: geelen

src/file-system-loader.js

@@ -9,13 +9,12 @@ export default class FileSystemLoader {
 
   fetch( path ) {
     return new Promise( ( resolve, reject ) => {
-      return fs.readFile( path, ( err, source ) => {
-        if (err) reject(err)
-        return Core.load( source, this.fetch.bind(this) ).then( stuff => {
-          let { injectableSource, exportTokens } = stuff
+      fs.readFile( path, "utf-8", ( err, source ) => {
+        if ( err ) reject( err )
+        Core.load( source, this.fetch.bind( this ) ).then( ( { injectableSource, exportTokens } ) => {
           this.sources.push( injectableSource )
-          return exportTokens
-        } )
+          resolve( exportTokens )
+        }, reject )
       } )
     } )
   }

src/index.js

@@ -19,6 +19,7 @@ export default {
   ],
 
   load( sourceString, pathFetcher ) {
+    console.log(sourceString)
     //let parser = new Parser( pathFetcher )
     //
     //return postcss( this.plugins.concat( [parser] ) )
@@ -28,7 +29,6 @@ export default {
     //  } )
 
 
-    return { injectableSource: "", exportTokens: {} }
+    return Promise.resolve({ injectableSource: sourceString, exportTokens: {} })
   }
 }
-

test/test-cases.js

@@ -1,23 +1,27 @@
 "use strict";
 
-var assert = require("assert");
-var fs = require("fs");
-var path = require("path");
-var FileSystemLoader = require('../src/file-system-loader')
+import assert from "assert"
+import fs from "fs"
+import path from "path"
+import FileSystemLoader from "../src/file-system-loader"
 
-function normalize(str) {
-  return str.replace(/\r\n?/g, "\n");
+let normalize = ( str ) => {
+  return str.replace( /\r\n?/g, "\n" );
 }
 
-describe("test-cases", function() {
-  var testDir = path.join(__dirname, "test-cases");
-  fs.readdirSync(testDir).forEach(function(testCase) {
-    if(fs.existsSync(path.join(testDir, testCase, "source.css"))) {
-      it("should " + testCase.replace(/-/g, " "), function() {
-        var expected = normalize(fs.readFileSync(path.join(testDir, testCase, "expected.css"), "utf-8"));
-        var output = FileSystemLoader('')
-        assert.equal(pipeline.process(input).css, expected);
-      });
+describe( "test-cases", () => {
+  let testDir = path.join( __dirname, "test-cases" )
+  fs.readdirSync( testDir ).forEach( testCase => {
+    if ( fs.existsSync( path.join( testDir, testCase, "source.css" ) ) ) {
+      it( "should " + testCase.replace( /-/g, " " ), done => {
+        let expected = normalize( fs.readFileSync( path.join( testDir, testCase, "expected.css" ), "utf-8" ) )
+        let loader = new FileSystemLoader()
+        let expectedTokens = JSON.parse(fs.readFileSync( path.join( testDir, testCase, "expected.json" ), "utf-8" ))
+        loader.fetch(path.join(testDir, testCase, "source.css")).then(tokens => {
+          assert.equal( loader.sources.join(""), expected )
+          assert.equal( tokens, expectedTokens )
+        }).then(done, done)
+      } );
     }
-  });
-});
+  } );
+} );

test/test-cases/simple-export/expected.js

@@ -0,0 +1,3 @@
+{
+  "localName": "__globalName"
+}