Skip to content

Commit da8f621

Browse files
committed
Merge branch 'feature/skeleton-changes' into develop
2 parents 868d262 + 821a34b commit da8f621

File tree

5 files changed

+22
-7
lines changed

5 files changed

+22
-7
lines changed

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"webRoot": "${workspaceRoot}/src",
1313
"userDataDir": "${workspaceRoot}/.chrome",
1414
"sourceMapPathOverrides": {
15-
"webpack:///./src/*": "${webRoot}/*"
15+
"webpack:///*": "${webRoot}/*"
1616
}
1717
}
1818
]

package-scripts.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ module.exports = {
1818
rimraf('test/coverage-karma'),
1919
'karma start test/karma.conf.js'
2020
),
21-
watch: 'karma start test/karma.conf.js --no-single-run',
22-
debug: 'karma start test/karma.conf.js --no-single-run --debug'
21+
watch: 'karma start test/karma.conf.js --auto-watch --no-single-run',
22+
debug: 'karma start test/karma.conf.js --auto-watch --no-single-run --debug'
2323
},
2424
all: concurrent({
2525
browser: series.nps('test.karma', 'e2e'),

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
],
5757
"testEnvironment": "node",
5858
"moduleNameMapper": {
59-
"aurelia-(.*)": "<rootDir>/node_modules/$1"
59+
"aurelia-(.*)": "<rootDir>/node_modules/aurelia-$1"
6060
},
6161
"collectCoverage": true,
6262
"collectCoverageFrom": [

test/protractor.conf.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,21 @@ exports.config = {
3232
capabilities: {
3333
'browserName': 'chrome',
3434
'chromeOptions': {
35-
'args': ['show-fps-counter=true']
35+
'args': [
36+
'--show-fps-counter',
37+
'--no-default-browser-check',
38+
'--no-first-run',
39+
'--disable-default-apps',
40+
'--disable-popup-blocking',
41+
'--disable-translate',
42+
'--disable-background-timer-throttling',
43+
'--disable-renderer-backgrounding',
44+
'--disable-device-discovery-notifications',
45+
/* enable these if you'd like to test using Chrome Headless
46+
'--no-gpu',
47+
'--headless'
48+
*/
49+
]
3650
}
3751
},
3852

test/unit/welcome.spec.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import { bootstrap } from 'aurelia-bootstrapper';
22
import { StageComponent } from 'aurelia-testing';
3+
import { PLATFORM } from 'aurelia-pal';
34

45
describe('WelcomeComponent', () => {
56
let component;
67

78
beforeEach(async () => {
89
component = StageComponent
910
.withResources([
10-
'../../src/app/modules/welcome/welcome.vm',
11-
'../../src/app/resources/converters/date-format.converter'
11+
PLATFORM.moduleName('../../src/app/modules/welcome/welcome.vm'),
12+
PLATFORM.moduleName('../../src/app/resources/converters/date-format.converter')
1213
])
1314
.inView('<welcome-view-model></welcome-view-model>');
1415
await component.create(bootstrap);

0 commit comments

Comments
 (0)