Skip to content

Commit 8e57b35

Browse files
committed
fix(webpack): use a mock for primus in test
1 parent 40c26af commit 8e57b35

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export default class Primus {}

Diff for: templates/app/client/components/socket(ws)/socket.service.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
2-
import Primus from './primus';
2+
import Primus from 'primus';
33
import primusEmit from 'primus-emit';
44
import { Injectable } from '@angular/core';
55
import { noop, find, remove } from 'lodash';

Diff for: templates/app/webpack.make.js

+10-4
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,24 @@ module.exports = function makeWebpackConfig(options) {
7070
};
7171
}
7272

73-
<%_ if(filters.ts) { _%>
7473
config.resolve = {
7574
modules: ['node_modules'],
76-
extensions: ['.js', '.ts']
77-
};<% } %>
75+
extensions: ['.js', '.ts'],
76+
alias: {
77+
primus: path.resolve(__dirname, 'client/components/socket/primus.js'),
78+
}
79+
};
7880

7981
if(TEST) {
8082
config.resolve = {
8183
modules: [
8284
'node_modules'
8385
],
84-
extensions: ['.js', '.ts']
86+
extensions: ['.js', '.ts'],
87+
alias: {
88+
// for some reason the primus client and webpack don't get along in test
89+
primus: path.resolve(__dirname, 'client/components/socket/primus.mock.js'),
90+
}
8591
};
8692
}
8793

0 commit comments

Comments
 (0)