Merge branch 'v6' into add-flowtype-interfaces

.travis.yml

@@ -8,7 +8,6 @@ script:
 env:
   matrix:
   - TEST_TYPE=lint_and_test_unit
-  - TEST_TYPE=integration_test
   - TEST_TYPE=test_create_project
 cache:
   directories:

package.json

@@ -84,6 +84,7 @@
     "karma-mocha-reporter": "^2.0.0",
     "karma-phantomjs-launcher": "^1.0.2",
     "karma-sinon": "^1.0.4",
+    "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.7.0",
     "lodash.uniq": "^4.3.0",
     "node-sass": "^3.3.3",

src/index.integration-spec.js

@@ -12,19 +12,17 @@ temp.track()
  * Simulate a complete install of Sagui in a target folder.
  *
  * It symlinks all the dependencies in place
- * and copies the Sagui source folder.
+ * and copies the require Sagui files.
  */
 const npmInstall = (projectPath) => {
-  const saguiInNodeModules = path.join(projectPath, 'node_modules/sagui')
   const nodeModules = path.join(__dirname, '../node_modules')
   const packages = fs.readdirSync(nodeModules)
 
   packages.forEach((name) => fs.ensureSymlinkSync(path.join(nodeModules, name), path.join(projectPath, 'node_modules', name)))
 
+  const saguiInNodeModules = path.join(projectPath, 'node_modules/sagui/karma-static-files')
   fs.ensureDirSync(saguiInNodeModules)
-  fs.copySync(path.join(__dirname, '..'), saguiInNodeModules, {
-    filter: (file) => !file.match(/node_modules/)
-  })
+  fs.copySync(path.join(__dirname, '../karma-static-files'), saguiInNodeModules)
 }
 
 describe('[integration] sagui', function () {

src/karma/presets/base.js

@@ -11,7 +11,7 @@ export default {
 
       preprocessors: {
         // add webpack as preprocessor
-        'node_modules/sagui/karma-static-files/test-bundle.js': ['webpack']
+        'node_modules/sagui/karma-static-files/test-bundle.js': ['webpack', 'sourcemap']
       },
 
       webpackServer: {

src/karma/presets/reporters.js

@@ -2,7 +2,14 @@ export default {
   name: 'frameworks',
   configure () {
     return {
-      reporters: ['mocha']
+      reporters: ['mocha'],
+
+      // first run will have the full output and
+      // the next runs just output the summary and
+      // errors in mocha style
+      mochaReporter: {
+        output: 'autowatch'
+      }
     }
   }
 }

src/webpack/presets/base.js

@@ -2,19 +2,35 @@ import { NoErrorsPlugin } from 'webpack'
 import path from 'path'
 import actions from '../../actions'
 
+/**
+ * Configure a proper devtool that best suits
+ * a specific action we want to perform
+ *
+ * see: http://webpack.github.io/docs/configuration.html#devtool
+ */
+const devtool = (action) => {
+  // generate the actual source map files on build
+  if (action === actions.BUILD) {
+    return 'source-map'
+  }
+
+  if (action === actions.TEST) {
+    return 'inline-source-map'
+  }
+
+  // Use a much faster cheap-module-eval-source-map setup when possible
+  return 'cheap-module-eval-source-map'
+}
+
 export default {
   name: 'base',
   configure ({ action, projectPath, saguiPath, watch }) {
     const projectSourcePath = path.join(projectPath, 'src')
 
-    // Use a much faster cheap-module-eval-source-map setup when possible
-    // see: http://webpack.github.io/docs/configuration.html#devtool
-    const devtool = action === actions.BUILD ? 'source-map' : 'cheap-module-eval-source-map'
-
     return {
       context: projectSourcePath,
 
-      devtool,
+      devtool: devtool(action),
 
       plugins: watch || action === actions.DEVELOP ? [] : [new NoErrorsPlugin()],
 

src/webpack/presets/base.spec.js

@@ -56,5 +56,10 @@ describe('base webpack preset', function () {
       const config = preset.configure({ projectPath, saguiPath, action: actions.BUILD })
       expect(config.devtool).equal('source-map')
     })
+
+    it('should inline the source-map while testing', () => {
+      const config = preset.configure({ projectPath, saguiPath, action: actions.TEST })
+      expect(config.devtool).equal('inline-source-map')
+    })
   })
 })