Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 35c4fdb

Browse files
authored
Merge branch 'master' into fix-radio-checkbox
2 parents d701dca + 6011af0 commit 35c4fdb

File tree

12 files changed

+633
-520
lines changed

12 files changed

+633
-520
lines changed

‎package-lock.json‎

Lines changed: 606 additions & 493 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,42 +31,42 @@
3131
"author": "Daniel Cook",
3232
"license": "MIT",
3333
"dependencies": {
34-
"@testing-library/dom": "^5.2.0",
34+
"@testing-library/dom": "^5.6.0",
3535
"@vue/test-utils": "^1.0.0-beta.29",
3636
"vue": "^2.6.10",
3737
"vue-template-compiler": "^2.6.10"
3838
},
3939
"devDependencies": {
40-
"@babel/cli": "^7.4.4",
41-
"@babel/core": "^7.4.5",
42-
"@babel/plugin-proposal-object-rest-spread": "^7.4.4",
43-
"@babel/plugin-transform-runtime": "^7.4.4",
44-
"@babel/preset-env": "^7.4.5",
40+
"@babel/cli": "^7.5.0",
41+
"@babel/core": "^7.5.4",
42+
"@babel/plugin-proposal-object-rest-spread": "^7.5.4",
43+
"@babel/plugin-transform-runtime": "^7.5.0",
44+
"@babel/preset-env": "^7.5.4",
45+
"@testing-library/jest-dom": "^4.0.0",
4546
"axios": "^0.19.0",
4647
"babel-core": "^7.0.0-bridge.0",
47-
"babel-eslint": "^10.0.1",
48+
"babel-eslint": "^10.0.2",
4849
"babel-jest": "^24.8.0",
49-
"coveralls": "^3.0.3",
50+
"coveralls": "^3.0.5",
5051
"eslint": "^5.16.0",
5152
"eslint-config-prettier": "^4.3.0",
5253
"eslint-config-standard": "^12.0.0",
53-
"eslint-plugin-import": "^2.17.3",
54+
"eslint-plugin-import": "^2.18.0",
5455
"eslint-plugin-node": "^9.1.0",
5556
"eslint-plugin-prettier": "^3.1.0",
56-
"eslint-plugin-promise": "^4.1.1",
57+
"eslint-plugin-promise": "^4.2.1",
5758
"eslint-plugin-standard": "^4.0.0",
58-
"eslint-plugin-vue": "^5.2.2",
59-
"husky": "^2.4.0",
59+
"eslint-plugin-vue": "^5.2.3",
60+
"husky": "^3.0.0",
6061
"jest": "^24.8.0",
61-
"jest-dom": "^3.4.0",
6262
"jest-in-case": "^1.0.2",
6363
"jest-serializer-vue": "^2.0.2",
64-
"lint-staged": "^8.1.7",
65-
"prettier": "^1.17.1",
66-
"vee-validate": "^2.2.9",
64+
"lint-staged": "^9.2.0",
65+
"prettier": "^1.18.2",
66+
"vee-validate": "^2.2.13",
6767
"vue-i18n": "^8.12.0",
6868
"vue-jest": "^3.0.4",
69-
"vue-router": "^3.0.6",
69+
"vue-router": "^3.0.7",
7070
"vuex": "^3.1.1"
7171
},
7272
"husky": {

‎tests/__tests__/axios-mock.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import axiosMock from 'axios'
22
import { render, fireEvent } from '@testing-library/vue'
33
import Component from './components/Fetch.vue'
4-
import 'jest-dom/extend-expect'
4+
import '@testing-library/jest-dom/extend-expect'
55

66
test('makes an API call and displays the greeting when load-greeting is clicked', async () => {
77
axiosMock.get.mockImplementationOnce(() =>

‎tests/__tests__/disappearance.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { render, waitForElementToBeRemoved } from '@testing-library/vue'
22
import Disappearance from './components/Disappearance'
3-
import 'jest-dom/extend-expect'
3+
import '@testing-library/jest-dom/extend-expect'
44

55
test('it waits for the data to be loaded', async () => {
66
const { getByText, queryByText, queryByTestId } = render(Disappearance)

‎tests/__tests__/form.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { render, fireEvent } from '@testing-library/vue'
2-
import 'jest-dom/extend-expect'
2+
import '@testing-library/jest-dom/extend-expect'
33
import Form from './components/Form'
44

55
// In this test we showcase several ways of targetting DOM elements.

‎tests/__tests__/simple-button.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { render, cleanup, fireEvent } from '@testing-library/vue'
22
import Button from './components/Button'
3-
import 'jest-dom/extend-expect'
3+
import '@testing-library/jest-dom/extend-expect'
44

55
afterEach(cleanup)
66

‎tests/__tests__/stopwatch.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import StopWatch from './components/StopWatch.vue'
22
import { cleanup, render, wait, fireEvent } from '@testing-library/vue'
3-
import 'jest-dom/extend-expect'
3+
import '@testing-library/jest-dom/extend-expect'
44

55
afterEach(cleanup)
66

‎tests/__tests__/update-props.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import NumberDisplay from './components/NumberDisplay.vue'
22
import { render } from '@testing-library/vue'
3-
import 'jest-dom/extend-expect'
3+
import '@testing-library/jest-dom/extend-expect'
44

55
test('calling render with the same component but different props does not remount', async () => {
66
const { getByTestId, updateProps } = render(NumberDisplay, {

‎tests/__tests__/validate-plugin.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import VeeValidate from 'vee-validate'
2-
import 'jest-dom/extend-expect'
2+
import '@testing-library/jest-dom/extend-expect'
33

44
import { render, fireEvent } from '@testing-library/vue'
55
import Validate from './components/Validate'

‎tests/__tests__/vue-router.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'jest-dom/extend-expect'
1+
import '@testing-library/jest-dom/extend-expect'
22

33
import App from './components/Router/App.vue'
44
import Home from './components/Router/Home.vue'

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /