Skip to content
This repository has been archived by the owner on Aug 30, 2021. It is now read-only.

Commit

Permalink
Fixing Karma To Load Libraries Independently
Browse files Browse the repository at this point in the history
  • Loading branch information
amoshaviv committed Apr 23, 2014
1 parent c7a14f8 commit 81254e0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion config/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ module.exports.getGlobbedFiles = function(globPatterns, removeRoot) {
* Get the modules JavaScript files
*/
module.exports.getJavaScriptAssets = function(includeTests) {
var output = this.getGlobbedFiles(this.assets.js, 'public/');
var output = this.getGlobbedFiles(this.assets.lib.concat(this.assets.js), 'public/');

// To include tests
if (includeTests) {
Expand Down
4 changes: 2 additions & 2 deletions config/express.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ module.exports = function(db) {

// Set views path and view engine
app.set('view engine', 'html');
app.set('views', config.root + '/app/views');
app.set('views', './app/views');

// Environment dependent middleware
if (process.env.NODE_ENV === 'development') {
Expand Down Expand Up @@ -99,7 +99,7 @@ module.exports = function(db) {
app.use(flash());

// Setting the app router and static folder
app.use(express.static(config.root + '/public'));
app.use(express.static(path.resolve('./public')));

// Globbing routing files
config.getGlobbedFiles('./app/routes/**/*.js').forEach(function(routePath) {
Expand Down
2 changes: 1 addition & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = function(config) {
frameworks: ['jasmine'],

// List of files / patterns to load in the browser
files: applicationConfiguration.assets.js.concat(applicationConfiguration.assets.tests),
files: applicationConfiguration.assets.lib.concat(applicationConfiguration.assets.js, applicationConfiguration.assets.tests),

// Test results reporter to use
// Possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
Expand Down
2 changes: 1 addition & 1 deletion public/modules/articles/config/articles.client.routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ angular.module('articles').config(['$stateProvider',
state('createArticle', {
url: '/articles/create',
templateUrl: 'modules/articles/views/create-article.client.view.html'
}).§
}).
state('viewArticle', {
url: '/articles/:articleId',
templateUrl: 'modules/articles/views/view-article.client.view.html'
Expand Down

0 comments on commit 81254e0

Please sign in to comment.