Skip to content

Commit

Permalink
fixed karma
Browse files Browse the repository at this point in the history
  • Loading branch information
jonniespratley committed Dec 19, 2014
1 parent 1c63c71 commit a8906d0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
9 changes: 7 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ var fs = require('fs');
/**
* @TODO - Externalize configuration for server and proxy, mongodb
*/
var config = JSON.parse(fs.readFileSync(__dirname + '/config/config.json'));
var cmsRoutes = require(__dirname + '/routes/cms-routes');

var serverEndpoint = 'http://localhost:8181';
var proxyConfig = {
proxy: {
Expand Down Expand Up @@ -97,6 +96,12 @@ module.exports = function (grunt) {
open: true,
base: ['.tmp', '<%= yeoman.app %>'],
middleware: function (connect, options) {
var express = require('express');
var fs = require('fs');
var cmsRouter = require('./routes/cms-router.js');
var app = express();
var config = JSON.parse(fs.readFileSync('./config/config.json'));
var server = new cmsRouter.mount(config, app);
return [
require('json-proxy').initialize(proxyConfig),
mountFolder(connect, '.grunt'),
Expand Down
6 changes: 3 additions & 3 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ module.exports = function (config) {
'app/bower_components/angular-*/dist/angular-*.js',

//Libs
'app/scripts/libs/parse-1.2.17.min.js',
'app/scripts/libs/md5.js',
'app/scripts/libs/markdown.js',
'app/libs/parse-1.2.17.min.js',
'app/libs/md5.js',
'app/libs/markdown.js',

//Coffee source
//'app/scripts/**/*.coffee',
Expand Down

0 comments on commit a8906d0

Please sign in to comment.