Skip to content

Commit

Permalink
remove test files from TypeScript exclude
Browse files Browse the repository at this point in the history
  • Loading branch information
alecmerdler committed Jun 24, 2019
1 parent 5c8eb91 commit ab13ec7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
9 changes: 5 additions & 4 deletions frontend/integration-tests/protractor.conf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { createWriteStream } from 'fs';
import { format } from 'util';

const tap = !!process.env.TAP;
const addReporter = (jasmine as any).getEnv().addReporter;

export const BROWSER_TIMEOUT = 15000;
export const appHost = `${process.env.BRIDGE_BASE_ADDRESS || 'http://localhost:9000'}${(process.env.BRIDGE_BASE_PATH || '/').replace(/\/$/, '')}`;
Expand Down Expand Up @@ -56,12 +57,12 @@ export const config: Config = {
beforeLaunch: () => new Promise(resolve => htmlReporter.beforeLaunch(resolve)),
onPrepare: () => {
browser.waitForAngularEnabled(false);
jasmine.getEnv().addReporter(htmlReporter);
jasmine.getEnv().addReporter(junitReporter);
addReporter(htmlReporter);
addReporter(junitReporter);
if (tap) {
jasmine.getEnv().addReporter(new TapReporter());
addReporter(new TapReporter());
} else {
jasmine.getEnv().addReporter(new ConsoleReporter());
addReporter(new ConsoleReporter());
}
},
onComplete: async() => {
Expand Down
2 changes: 0 additions & 2 deletions frontend/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
".yarn",
"**/node_modules",
"public/dist",
"**/__tests__",
"integration-tests"
],
"include": [
"**/*.js",
Expand Down

0 comments on commit ab13ec7

Please sign in to comment.