Skip to content
This repository was archived by the owner on Jul 10, 2019. It is now read-only.

Commit 23ab9c8

Browse files
authored
Merge pull request #11 from hisasann/feature/improve-jest-test
Feature/improve jest test
2 parents a0bd364 + 992e222 commit 23ab9c8

File tree

7 files changed

+67
-15
lines changed

7 files changed

+67
-15
lines changed

jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = {
66
},
77
moduleFileExtensions: ['js', 'ts', 'vue', 'json'],
88
transform: {
9-
'^.+\\.tsx?$': 'babel-jest',
9+
'^.+\\.tsx?$': 'ts-jest',
1010
'.*\\.(vue)$': 'vue-jest'
1111
},
1212
testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$'

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
"pug": "^2.0.3",
104104
"pug-plain-loader": "^1.0.0",
105105
"sass-loader": "^7.1.0",
106+
"ts-jest": "^24.0.2",
106107
"vue-jest": "^3.0.4"
107108
}
108109
}

src/@types/shims-tsx.d.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import Vue, { VNode } from 'vue'
2+
3+
declare global {
4+
namespace JSX {
5+
// tslint:disable no-empty-interface
6+
interface Element extends VNode {}
7+
// tslint:disable no-empty-interface
8+
interface ElementClass extends Vue {}
9+
interface IntrinsicElements {
10+
[elem: string]: any
11+
}
12+
}
13+
}

src/@types/shims-vue.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
declare module '*.vue' {
2+
import Vue from 'vue'
3+
export default Vue
4+
}

src/routers/custom-path.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ export default function(
66
return {
77
name: 'custom-path',
88
path: '/example/(c|d)-:a/(e|f)-:b/*',
9-
component: resolve(__dirname, '../../src/routed-pages/custom-path.vue')
9+
component: resolve(__dirname, '../routed-pages/custom-path.vue')
1010
}
1111
}

src/routers/include.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ export default function(
66
return {
77
name: 'include',
88
path: '/include',
9-
component: resolve(__dirname, '../../src/include/include.vue')
9+
component: resolve(__dirname, '../include/include.vue')
1010
}
1111
}

yarn.lock

Lines changed: 46 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3642,6 +3642,13 @@ browserslist@^4.5.2:
36423642
electron-to-chromium "^1.3.122"
36433643
node-releases "^1.1.13"
36443644

3645+
bs-logger@0.x:
3646+
version "0.2.6"
3647+
resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
3648+
integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==
3649+
dependencies:
3650+
fast-json-stable-stringify "2.x"
3651+
36453652
bser@^2.0.0:
36463653
version "2.0.0"
36473654
resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
@@ -3652,7 +3659,7 @@ buffer-equal@0.0.1:
36523659
version "0.0.1"
36533660
resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
36543661

3655-
buffer-from@^1.0.0:
3662+
buffer-from@1.x, buffer-from@^1.0.0:
36563663
version "1.1.1"
36573664
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
36583665

@@ -3777,7 +3784,7 @@ camelcase@^3.0.0:
37773784
version "3.0.0"
37783785
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
37793786

3780-
camelcase@^4.0.0:
3787+
camelcase@^4.0.0, camelcase@^4.1.0:
37813788
version "4.1.0"
37823789
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
37833790

@@ -5646,7 +5653,7 @@ fast-glob@^2.0.2:
56465653
merge2 "^1.2.3"
56475654
micromatch "^3.1.10"
56485655

5649-
fast-json-stable-stringify@^2.0.0:
5656+
fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
56505657
version "2.0.0"
56515658
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
56525659

@@ -7603,6 +7610,12 @@ json3@^3.3.2:
76037610
version "3.3.2"
76047611
resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
76057612

7613+
json5@2.x, json5@^2.1.0:
7614+
version "2.1.0"
7615+
resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
7616+
dependencies:
7617+
minimist "^1.2.0"
7618+
76067619
json5@^0.5.0, json5@^0.5.1:
76077620
version "0.5.1"
76087621
resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
@@ -7613,12 +7626,6 @@ json5@^1.0.1:
76137626
dependencies:
76147627
minimist "^1.2.0"
76157628

7616-
json5@^2.1.0:
7617-
version "2.1.0"
7618-
resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
7619-
dependencies:
7620-
minimist "^1.2.0"
7621-
76227629
jsonfile@^2.1.0:
76237630
version "2.4.0"
76247631
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
@@ -8015,7 +8022,7 @@ make-dir@^1.0.0, make-dir@^1.3.0:
80158022
dependencies:
80168023
pify "^3.0.0"
80178024

8018-
make-error@^1.1.1:
8025+
make-error@1.x, make-error@^1.1.1:
80198026
version "1.3.5"
80208027
resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
80218028
integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==
@@ -8272,7 +8279,7 @@ mixin-object@^2.0.1:
82728279
for-in "^0.1.3"
82738280
is-extendable "^0.1.1"
82748281

8275-
mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
8282+
mkdirp@0.5.1, mkdirp@0.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
82768283
version "0.5.1"
82778284
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
82788285
dependencies:
@@ -10773,7 +10780,7 @@ resolve@1.1.7:
1077310780
version "1.1.7"
1077410781
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
1077510782

10776-
resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.2.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1, resolve@^1.9.0:
10783+
resolve@1.x, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.2.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1, resolve@^1.9.0:
1077710784
version "1.10.0"
1077810785
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
1077910786
dependencies:
@@ -10976,6 +10983,11 @@ semver@5.5.0:
1097610983
version "5.5.0"
1097710984
resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
1097810985

10986+
semver@^5.5:
10987+
version "5.7.0"
10988+
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
10989+
integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
10990+
1097910991
semver@^6.0.0:
1098010992
version "6.0.0"
1098110993
resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
@@ -11867,6 +11879,21 @@ tryer@^1.0.0:
1186711879
resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
1186811880
integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==
1186911881

11882+
ts-jest@^24.0.2:
11883+
version "24.0.2"
11884+
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.0.2.tgz#8dde6cece97c31c03e80e474c749753ffd27194d"
11885+
integrity sha512-h6ZCZiA1EQgjczxq+uGLXQlNgeg02WWJBbeT8j6nyIBRQdglqbvzDoHahTEIiS6Eor6x8mK6PfZ7brQ9Q6tzHw==
11886+
dependencies:
11887+
bs-logger "0.x"
11888+
buffer-from "1.x"
11889+
fast-json-stable-stringify "2.x"
11890+
json5 "2.x"
11891+
make-error "1.x"
11892+
mkdirp "0.x"
11893+
resolve "1.x"
11894+
semver "^5.5"
11895+
yargs-parser "10.x"
11896+
1187011897
ts-loader@^5.3.3:
1187111898
version "5.3.3"
1187211899
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-5.3.3.tgz#8b4af042e773132d86b3c99ef0acf3b4d325f473"
@@ -12742,6 +12769,13 @@ yallist@^3.0.0, yallist@^3.0.2:
1274212769
version "3.0.3"
1274312770
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
1274412771

12772+
yargs-parser@10.x:
12773+
version "10.1.0"
12774+
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
12775+
integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
12776+
dependencies:
12777+
camelcase "^4.1.0"
12778+
1274512779
yargs-parser@^11.1.1:
1274612780
version "11.1.1"
1274712781
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"

0 commit comments

Comments
 (0)