Skip to content

Commit

Permalink
Fix NITs from @rroemer on #1
Browse files Browse the repository at this point in the history
  • Loading branch information
Chase Adams committed Dec 9, 2015
1 parent 5d7fd4a commit 469f575
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PREPROCESSORS[MAIN_PATH] = ["webpack"];
module.exports = function (config) {
config.set({
basePath: process.cwd(),
frameworks: ["mocha", "sinon-chai", "phantomjs-shim", "intl-shim"],
frameworks: ["mocha", "phantomjs-shim", "intl-shim"],
files: [
// Sinon has issues with webpack. Do global include.
require.resolve("sinon/pkg/sinon"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ module.exports = _.merge({}, testCfg, {
exclude: /node_modules\//,
loader: ispartaLoader
}
],
loaders: testCfg.module.loaders
]
}
});
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,16 @@ var base = require("./webpack.config");
var _ = require("lodash");

module.exports = {

devServer: {
port: (process.env.WEBPACK_DEVSERVER_PORT || "4000"),
contentBase: path.join(process.cwd(), "demo"),
noInfo: false
},

output: {
path: process.cwd(),
filename: "bundle.js",
publicPath: "/assets/"
},

cache: true,
devtool: "source-map",
entry: {
Expand Down

0 comments on commit 469f575

Please sign in to comment.