Skip to content

Commit 02a40ca

Browse files
akirasosaakirasosa
committed
typescript 2.1.4
coverage does not work so that I disabled it.
1 parent 992a46d commit 02a40ca

File tree

6 files changed

+51
-46
lines changed

6 files changed

+51
-46
lines changed

‎config/karma.conf.js

+12-10
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,21 @@ module.exports = function (config) {
88
{pattern: './config/spec-bundle.js', watched: false},
99
],
1010
preprocessors: {
11-
'./config/spec-bundle.js': ['coverage', 'webpack', 'sourcemap'],
11+
// './config/spec-bundle.js': ['coverage', 'webpack', 'sourcemap'],
12+
'./config/spec-bundle.js': ['webpack', 'sourcemap'],
1213
},
1314
webpack: testWebpackConfig,
14-
coverageReporter: {
15-
type: 'in-memory'
16-
},
17-
remapCoverageReporter: {
18-
'text-summary': null,
19-
html: './coverage/html',
20-
lcovonly: './coverage/lcov.info',
21-
},
15+
// coverageReporter: {
16+
// type: 'in-memory'
17+
// },
18+
// remapCoverageReporter: {
19+
// 'text-summary': null,
20+
// html: './coverage/html',
21+
// lcovonly: './coverage/lcov.info',
22+
// },
2223
webpackMiddleware: {stats: 'errors-only'},
23-
reporters: ['mocha', 'coverage', 'remap-coverage'],
24+
// reporters: ['mocha', 'coverage', 'remap-coverage'],
25+
reporters: ['mocha'],
2426
port: 9876,
2527
colors: true,
2628
logLevel: config.LOG_INFO,

‎config/webpack.common.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const webpack = require('webpack');
22
const helpers = require('./helpers');
33

44
const HtmlWebpackPlugin = require('html-webpack-plugin');
5-
const ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin;
5+
const { CheckerPlugin } = require('awesome-typescript-loader');
66
const ExtractTextPlugin = require("extract-text-webpack-plugin");
77

88
module.exports = {
@@ -47,7 +47,7 @@ module.exports = {
4747
template: 'src/index.html',
4848
chunksSortMode: 'dependency',
4949
}),
50-
new ForkCheckerPlugin(),
50+
new CheckerPlugin(),
5151
new webpack.ContextReplacementPlugin(
5252
// The (\\|\/) piece accounts for path separators in *nix and Windows
5353
/angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,

‎config/webpack.test.js

+14-12
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ const path = require('path');
22
const helpers = require('./helpers');
33
const webpack = require('webpack');
44

5+
const { CheckerPlugin } = require('awesome-typescript-loader');
56
const ContextReplacementPlugin = require('webpack/lib/ContextReplacementPlugin');
67

78
const ENV = process.env.ENV = process.env.NODE_ENV = 'test';
@@ -47,18 +48,18 @@ module.exports = {
4748
},
4849
{test: /\.css$/, loader: 'raw-loader'},
4950
{test: /\.html$/, loader: 'raw-loader'},
50-
{
51-
enforce: 'post',
52-
test: /\.(js|ts)$/,
53-
loader: 'istanbul-instrumenter-loader',
54-
include: [
55-
helpers.root('src'),
56-
],
57-
exclude: [
58-
/\.(e2e|spec)\.ts$/,
59-
/node_modules/
60-
]
61-
},
51+
// {
52+
// enforce: 'post',
53+
// test: /\.(js|ts)$/,
54+
// loader: 'istanbul-instrumenter-loader',
55+
// include: [
56+
// helpers.root('src'),
57+
// ],
58+
// exclude: [
59+
// /\.(e2e|spec)\.ts$/,
60+
// /node_modules/
61+
// ]
62+
// },
6263
]
6364
},
6465
plugins: [
@@ -80,6 +81,7 @@ module.exports = {
8081
},
8182
},
8283
}),
84+
new CheckerPlugin(),
8385
],
8486
node: {
8587
global: true,

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"@types/webpack": "^2.0.0",
6060
"angular2-router-loader": "^0.3.3",
6161
"angular2-template-loader": "^0.6.0",
62-
"awesome-typescript-loader": "^2.2.4",
62+
"awesome-typescript-loader": "^3.0.0-beta.13",
6363
"codelyzer": "^1.0.0-beta.3",
6464
"coveralls": "^2.11.15",
6565
"css-loader": "^0.26.0",
@@ -85,7 +85,7 @@
8585
"ts-helpers": "^1.1.2",
8686
"tslint": "^3.15.1",
8787
"tslint-loader": "^2.1.5",
88-
"typescript": "~2.0.10",
88+
"typescript": "~2.1.4",
8989
"webpack": ">=2.1.0-beta.27",
9090
"webpack-dev-server": ">=2.1.0-beta.11",
9191
"webpack-merge": "^1.0.2"

‎src/app/components/header/header.component.spec.ts

+10-5
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ describe('HeaderComponent', () => {
9595
expect(link).toBeTruthy();
9696
link.click();
9797
advance(fixture);
98-
expect(link.parentElement.classList).toContain('active');
98+
const activatedNav = getDOM().querySelector(el, '.nav-item.active > a[href="/home"]');
99+
expect(activatedNav).toBeTruthy();
99100
}));
100101

101102
it('does not show a nav link to top', () => {
@@ -108,15 +109,17 @@ describe('HeaderComponent', () => {
108109
expect(link).toBeTruthy();
109110
link.click();
110111
advance(fixture);
111-
expect(link.parentElement.classList).toContain('active');
112+
const activatedNav = getDOM().querySelector(el, '.nav-item.active > a[href="/users"]');
113+
expect(activatedNav).toBeTruthy();
112114
}));
113115

114116
it('shows a nav link to help', fakeAsync(() => {
115117
const link = getDOM().querySelector(el, 'a[href="/help"]');
116118
expect(link).toBeTruthy();
117119
link.click();
118120
advance(fixture);
119-
expect(link.parentElement.classList).toContain('active');
121+
const activatedNav = getDOM().querySelector(el, '.nav-item.active > a[href="/help"]');
122+
expect(activatedNav).toBeTruthy();
120123
}));
121124

122125
it('shows a nav link to profile', fakeAsync(() => {
@@ -160,7 +163,8 @@ describe('HeaderComponent', () => {
160163
expect(link).toBeTruthy();
161164
link.click();
162165
advance(fixture);
163-
expect(link.parentElement.classList).toContain('active');
166+
const activatedNav = getDOM().querySelector(el, '.nav-item.active > a[href="/"].nav-link');
167+
expect(activatedNav).toBeTruthy();
164168
}));
165169

166170
it('does not show a nav link to users', () => {
@@ -173,7 +177,8 @@ describe('HeaderComponent', () => {
173177
expect(link).toBeTruthy();
174178
link.click();
175179
advance(fixture);
176-
expect(link.parentElement.classList).toContain('active');
180+
const activatedNav = getDOM().querySelector(el, '.nav-item.active > a[href="/help"]');
181+
expect(activatedNav).toBeTruthy();
177182
}));
178183

179184
it('does not show a nav link to profile', () => {

‎yarn.lock

+11-15
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,10 @@ alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
145145
version "1.0.2"
146146
resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
147147

148-
amdefine@1.0.0:
148+
amdefine@1.0.0, amdefine@>=0.0.4:
149149
version "1.0.0"
150150
resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.0.tgz#fd17474700cb5cc9c2b709f0be9d23ce3c198c33"
151151

152-
amdefine@>=0.0.4:
153-
version "1.0.1"
154-
resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
155-
156152
angular2-router-loader@^0.3.3:
157153
version "0.3.4"
158154
resolved "https://registry.yarnpkg.com/angular2-router-loader/-/angular2-router-loader-0.3.4.tgz#bb458f233d30d66d58ae2648ad52b8ea1f433dec"
@@ -323,13 +319,13 @@ autoprefixer@^6.3.1:
323319
postcss "^5.2.6"
324320
postcss-value-parser "^3.2.3"
325321

326-
awesome-typescript-loader@^2.2.4:
327-
version "2.2.4"
328-
resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-2.2.4.tgz#4185d60c035c25515f9c2a747fa5f69b2a001e9e"
322+
awesome-typescript-loader@^3.0.0-beta.13:
323+
version "3.0.0-beta.13"
324+
resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-3.0.0-beta.13.tgz#b8b40f97a437d39310b93021611d239015050036"
329325
dependencies:
330326
colors "^1.1.2"
331-
enhanced-resolve "^2.2.2"
332-
loader-utils "^0.2.6"
327+
enhanced-resolve "^2.3.0"
328+
loader-utils "^0.2.16"
333329
lodash "^4.13.1"
334330
object-assign "^4.1.0"
335331
source-map-support "^0.4.0"
@@ -1257,7 +1253,7 @@ engine.io@1.6.10:
12571253
engine.io-parser "1.2.4"
12581254
ws "1.0.1"
12591255

1260-
enhanced-resolve@^2.2.0, enhanced-resolve@^2.2.2:
1256+
enhanced-resolve@^2.2.0, enhanced-resolve@^2.3.0:
12611257
version "2.3.0"
12621258
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz#a115c32504b6302e85a76269d7a57ccdd962e359"
12631259
dependencies:
@@ -2316,7 +2312,7 @@ loader-runner@^2.2.0:
23162312
version "2.2.0"
23172313
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.2.0.tgz#824c1b699c4e7a2b6501b85902d5b862bf45b3fa"
23182314

2319-
loader-utils@0.x.x, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.3, loader-utils@^0.2.5, loader-utils@^0.2.6, loader-utils@^0.2.7, loader-utils@~0.2.2:
2315+
loader-utils@0.x.x, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.3, loader-utils@^0.2.5, loader-utils@^0.2.7, loader-utils@~0.2.2:
23202316
version "0.2.16"
23212317
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
23222318
dependencies:
@@ -4181,9 +4177,9 @@ type-is@~1.6.13:
41814177
media-typer "0.3.0"
41824178
mime-types "~2.1.13"
41834179

4184-
typescript@~2.0.10:
4185-
version "2.0.10"
4186-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.0.10.tgz#ccdd4ed86fd5550a407101a0814012e1b3fac3dd"
4180+
typescript@~2.1.4:
4181+
version "2.1.4"
4182+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.1.4.tgz#b53b69fb841126acb1dd4b397d21daba87572251"
41874183

41884184
uglify-js@2.7.x, uglify-js@^2.6, uglify-js@~2.7.3:
41894185
version "2.7.5"

0 commit comments

Comments
 (0)