Update tests to take into account refactoring

Author: David Paz

test/WebpackConfig.js

@@ -278,28 +278,20 @@ describe('WebpackConfig object', () => {
         });
     });
 
-    describe('enableTypeScriptLoader', () => {
-        it('Call with no config', () => {
-            const config = createConfig();
-            config.enableTypeScriptLoader();
-
-            expect(config.useTypeScriptLoader).to.be.true;
-        });
-
-        it('Pass valid config', () => {
+    describe('configureTypeScript', () => {
+        it('Calling method sets it', () => {
             const config = createConfig();
-            config.enableTypeScriptLoader({ transpileOnly: true });
-
-            expect(config.useTypeScriptLoader).to.be.true;
-            expect(config.typeScriptOptions.transpileOnly).to.be.true;
+            const testCallback = () => {};
+            config.configureTypeScript(testCallback);
+            expect(config.tsConfigurationCallback).to.equal(testCallback);
         });
 
-        it('Pass invalid config', () => {
+        it('Calling with non-callback throws an error', () => {
             const config = createConfig();
 
             expect(() => {
-                config.enableTypeScriptLoader({ fake_option: false });
-            }).to.throw('Invalid option "fake_option" passed to enableTypeScriptLoader()');
+                config.configureTypeScript('FOO');
+            }).to.throw('must be a callback function');
         });
     });
 

test/functional.js

@@ -583,11 +583,12 @@ module.exports = {
             });
         });
 
-        it('When enabled, TypeScript is compiled!', (done) => {
+        it('When configured, TypeScript is compiled!', (done) => {
             const config = createWebpackConfig('www/build', 'dev');
             config.setPublicPath('/build');
             config.addEntry('main', ['./js/render.ts', './js/index.ts']);
-            config.enableTypeScriptLoader();
+            const testCallback = () => {};
+            config.configureTypeScript(testCallback);
 
             testSetup.runWebpack(config, (webpackAssert) => {
                 // check that ts-loader transformed the ts file

test/loaders/typescript.js

@@ -0,0 +1,53 @@
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+'use strict';
+
+const expect = require('chai').expect;
+const WebpackConfig = require('../../lib/WebpackConfig');
+const RuntimeConfig = require('../../lib/config/RuntimeConfig');
+const tsLoader = require('../../lib/loaders/typescript');
+
+function createConfig() {
+    const runtimeConfig = new RuntimeConfig();
+    runtimeConfig.context = __dirname;
+    runtimeConfig.babelRcFileExists = false;
+
+    return new WebpackConfig(runtimeConfig);
+}
+
+describe('loaders/typescript', () => {
+    it('getLoaders() basic usage', () => {
+        const config = createConfig();
+        config.configureTypeScript(function(config) {
+            config.foo = 'bar';
+        });
+
+        const actualLoaders = tsLoader.getLoaders(config);
+        expect(actualLoaders).to.have.lengthOf(2);
+        // callback is used
+        expect(actualLoaders[1].options.foo).to.equal('bar');
+    });
+
+    it('getLoaders() check defaults configuration values', () => {
+        const config = createConfig();
+        config.configureTypeScript(function(config) {
+            config.foo = 'bar';
+        });
+
+        const actualLoaders = tsLoader.getLoaders(config);
+        // callback is used
+        expect(actualLoaders[1].options.foo).to.equal('bar');
+        // defaults
+        expect(actualLoaders[1].options.silent).to.be.true;
+        expect(actualLoaders[1].options.transpileOnly).to.be.false;
+        expect(actualLoaders[1].options.logLevel).to.equal('info');
+    });
+
+});