Skip to content

Build fix and remove karma reporter #24803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gkalpak wants to merge 2 commits into from
Closed

Build fix and remove karma reporter #24803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab42105
build: make `internal-angular` karma reporter compatible with latest …
gkalpak Jul 9, 2018
ef0a6fd
build: remove unnecessary `internal-angular` karma reporter
gkalpak Jul 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions karma-js.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

const browserProvidersConf = require('./browser-providers.conf');
const {generateSeed} = require('./tools/jasmine-seed-generator');
const internalAngularReporter = require('./tools/karma/reporter');

// Karma configuration
// Generated on Thu Sep 25 2014 11:52:02 GMT-0700 (PDT)
Expand Down Expand Up @@ -96,7 +95,6 @@ module.exports = function(config) {
'karma-sauce-launcher',
'karma-chrome-launcher',
'karma-sourcemap-loader',
internalAngularReporter,
],

preprocessors: {
Expand All @@ -113,7 +111,7 @@ module.exports = function(config) {
'/base/angular/': '/base/',
},

reporters: ['internal-angular'],
reporters: ['dots'],
sauceLabs: {
testName: 'Angular2',
retryLimit: 3,
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/test-saucelabs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ source ${thisDir}/_travis-fold.sh
travisFoldStart "test.unit.saucelabs"
./scripts/sauce/sauce_connect_block.sh
SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
$(npm bin)/karma start ./karma-js.conf.js --single-run --browsers=${KARMA_JS_BROWSERS} --reporters internal-angular,saucelabs
$(npm bin)/karma start ./karma-js.conf.js --single-run --browsers=${KARMA_JS_BROWSERS} --reporters dots,saucelabs
travisFoldEnd "test.unit.saucelabs"
67 changes: 0 additions & 67 deletions tools/karma/reporter.js
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions tools/tsc-watch/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
*/

/* tslint:disable:no-console */
import {spawn} from 'child_process';
import {existsSync, mkdirSync, writeFileSync} from 'fs';
import {existsSync, mkdirSync} from 'fs';

import {TSC, TscWatch, reportError} from './tsc_watch';
import {TscWatch} from './tsc_watch';

export * from './tsc_watch';
import 'reflect-metadata';
Expand Down
1 change: 0 additions & 1 deletion tools/tsc-watch/tsc_watch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import {spawn} from 'child_process';
import {platform} from 'os';
import {normalize} from 'path';
import {resolve} from 'url';

enum State {
idle,
Expand Down