Skip to content

Commit

Permalink
[changed] Use Browserify to run specs
Browse files Browse the repository at this point in the history
  • Loading branch information
mjackson committed Sep 1, 2014
1 parent 0e649be commit 3796371
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 56 deletions.
21 changes: 5 additions & 16 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module.exports = function(config) {

basePath: '',

frameworks: ['mocha'],
frameworks: ['mocha', 'browserify'],

files: [
'specs/main.js'
Expand All @@ -12,23 +12,12 @@ module.exports = function(config) {
exclude: [],

preprocessors: {
'specs/main.js': ['webpack', 'sourcemap']
'specs/main.js': ['browserify']
},

webpack: {
cache: true,
devtool: 'inline-source-map',
module: {
loaders: [
{test: /\.js$/, loader: 'jsx-loader'}
]
}
},

webpackServer: {
stats: {
colors: true
}
browserify: {
watch: true,
debug: true
},

reporters: ['progress'],
Expand Down
9 changes: 2 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,18 @@
"devDependencies": {
"browserify": "4.2.3",
"browserify-shim": "3.6.0",
"bundle-loader": "0.5.0",
"envify": "1.2.0",
"expect": "0.1.1",
"jsx-loader": "0.10.2",
"karma": "0.12.16",
"karma-browserify": "^0.2.1",
"karma-chrome-launcher": "0.1.4",
"karma-cli": "0.0.4",
"karma-firefox-launcher": "0.1.3",
"karma-mocha": "0.1.3",
"karma-sourcemap-loader": "^0.2.0",
"karma-webpack": "1.2.1",
"mocha": "1.20.1",
"react": ">=0.11.0",
"rf-release": "0.3.1",
"uglify-js": "2.4.15",
"webpack": "1.2.0-beta5",
"webpack-dev-server": "1.4.2"
"uglify-js": "2.4.15"
},
"peerDependencies": {
"react": ">=0.11.0"
Expand Down
33 changes: 0 additions & 33 deletions webpack.config.js

This file was deleted.

0 comments on commit 3796371

Please sign in to comment.