Skip to content

Commit

Permalink
fix tests and vue upgrade to v2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
killbotXD committed Dec 13, 2019
1 parent a4a7107 commit ff1f3b6
Show file tree
Hide file tree
Showing 27 changed files with 3,580 additions and 5,228 deletions.
5 changes: 4 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ module.exports = {
},
overrides: [
{
files: ["**/__tests__/*.{j,t}s?(x)"],
files: [
"**/__tests__/*.{j,t}s?(x)",
"**/tests/unit/**/*.spec.{j,t}s?(x)"
],
env: {
jest: true
}
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ cache:
script:
- npm run lint
- npm run test:unit
- npm run test:e2e
- npm run test:e2e:headless
- npm run build
14 changes: 4 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# gymkhana
[![Build Status](https://travis-ci.com/devlup-labs/gymkhana_frontend.svg?branch=master)](https://travis-ci.com/devlup-labs/gymkhana_frontend)

## Project setup
```
Expand All @@ -16,24 +15,19 @@ npm run serve
npm run build
```

### Run your tests
```
npm run test
```

### Lints and fixes files
### Run your unit tests
```
npm run lint
npm run test:unit
```

### Run your end-to-end tests
```
npm run test:e2e
```

### Run your unit tests
### Lints and fixes files
```
npm run test:unit
npm run lint
```

### Customize configuration
Expand Down
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
presets: ["@vue/app"]
presets: ["@vue/cli-plugin-babel/preset"]
};
22 changes: 2 additions & 20 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,4 @@
module.exports = {
moduleFileExtensions: ["js", "jsx", "json", "vue"],
transform: {
"^.+\\.vue$": "vue-jest",
".+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$":
"jest-transform-stub",
"^.+\\.jsx?$": "babel-jest"
},
transformIgnorePatterns: ["/node_modules/"],
moduleNameMapper: {
"^@/(.*)$": "<rootDir>/src/$1"
},
snapshotSerializers: ["jest-serializer-vue"],
testMatch: [
"**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)"
],
testURL: "http://localhost/",
watchPlugins: [
"jest-watch-typeahead/filename",
"jest-watch-typeahead/testname"
]
preset: "@vue/cli-plugin-unit-jest",
setupFilesAfterEnv: ["<rootDir>/tests/setup.js"]
};
Loading

0 comments on commit ff1f3b6

Please # to comment.