Skip to content

Commit

Permalink
some testing setup
Browse files Browse the repository at this point in the history
  • Loading branch information
mtxr committed Mar 26, 2019
1 parent 1c708f9 commit 2bc4d00
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 18 deletions.
3 changes: 2 additions & 1 deletion .vscodeignore
Expand Up @@ -48,7 +48,8 @@ tslint.json
**/*.vsix
node_modules/**
**/node_modules/**

jest.config.js
**/jest.config.js
# exceptions
!static/icon.png
!README.md
Expand Down
10 changes: 2 additions & 8 deletions package.json
Expand Up @@ -19,7 +19,7 @@
],
"scripts": {
"clean": "rimraf -rf ../dist",
"test": "jest --config=jest.config.js && yarn workspace @sqltools/formatter test",
"test": "yarn workspace @sqltools/formatter test && yarn workspace @sqltools/plugins test",
"precompile": "yarn test && yarn run clean",
"prewatch": "yarn run clean",
"watch": "yarn workspace @sqltools/extension watch",
Expand All @@ -34,19 +34,13 @@
"husky": "^1.3.1"
},
"devDependencies": {
"@types/jest": "^24.0.11",
"babel-jest": "^24.5.0",
"jest": "^24.5.0",
"jest-cli": "^24.5.0",
"rimraf": "^2.6.3",
"ts-jest": "^24.0.0",
"typescript": "^3.3.3333",
"vsce": "^1.58.0"
},
"husky": {
"hooks": {
"pre-commit": "yarn test",
"pre-push": "yarn test"
"pre-commit": "yarn test"
}
}
}
5 changes: 5 additions & 0 deletions packages/core/package.json
Expand Up @@ -19,13 +19,18 @@
},
"devDependencies": {
"@types/command-exists": "^1.2.0",
"@types/jest": "^24.0.11",
"@types/mssql": "^4.0.12",
"@types/mysql": "^2.15.5",
"@types/oracledb": "^1.11.34",
"@types/pg": "^7.4.13",
"@types/redux": "^3.6.0",
"@types/sqlite3": "^3.1.5",
"@types/webpack-env": "^1.13.8",
"babel-jest": "^24.5.0",
"jest-cli": "^24.5.0",
"jest": "^24.5.0",
"ts-jest": "^24.0.0",
"typescript": "^3.3.3333"
}
}
1 change: 1 addition & 0 deletions packages/core/utils/query.ts
Expand Up @@ -10,6 +10,7 @@ export function generateInsert(
cols: Array<{ value: string, column: DatabaseInterface.TableColumn }>,
formatOptions?: Settings['format'],
): string {
// @todo: snippet should have variable name and type
let insertQuery = `INSERT INTO ${table} (${cols.map((col) => col.value).join(', ')}) VALUES (`;
cols.forEach((col, index) => {
insertQuery = insertQuery.concat(`'\${${index + 1}:${col.column.type}}', `);
Expand Down
7 changes: 4 additions & 3 deletions packages/extension/package.json
Expand Up @@ -741,21 +741,22 @@
"devDependencies": {
"@babel/cli": "^7.1.2",
"@types/jest": "^24.0.11",
"babel-jest": "^24.5.0",
"babel-loader": "^8.0.4",
"copy-webpack-plugin": "^5.0.0",
"cross-env": "^5.2.0",
"css-loader": "^2.1.1",
"jest": "^24.5.0",
"jest-cli": "^24.5.0",
"jest": "^24.5.0",
"node-sass": "^4.11.0",
"sass-loader": "^7.1.0",
"style-loader": "^0.23.1",
"ts-jest": "^24.0.0",
"ts-loader": "^5.3.3",
"typescript": "^3.3.3333",
"vscode": "^1.1.30",
"webpack": "^4.29.6",
"webpack-cli": "^3.2.3"
"webpack-cli": "^3.2.3",
"webpack": "^4.29.6"
},
"dependencies": {
"@sqltools/core": "*",
Expand Down
2 changes: 1 addition & 1 deletion packages/formatter
5 changes: 5 additions & 0 deletions packages/language-server/package.json
Expand Up @@ -17,8 +17,13 @@
"@babel/plugin-proposal-object-rest-spread": "^7.3.4",
"@babel/plugin-transform-spread": "^7.2.2",
"@babel/preset-env": "^7.3.4",
"@types/jest": "^24.0.11",
"@types/node": "^11.10.5",
"babel-jest": "^24.5.0",
"babel-loader": "^8.0.5",
"jest-cli": "^24.5.0",
"jest": "^24.5.0",
"ts-jest": "^24.0.0",
"typescript": "^3.3.3333"
}
}
5 changes: 1 addition & 4 deletions jest.config.js → packages/plugins/jest.config.js
Expand Up @@ -3,13 +3,10 @@ module.exports = {
testEnvironment: 'node',
collectCoverage: true,
collectCoverageFrom: ['**/*.ts', '**/*.tsx'],
coverageDirectory: '<rootDir>/coverage',
coverageReporters: ['lcov'],
coverageDirectory: '<rootDir>/../../coverage/plugins',
coveragePathIgnorePatterns: [
'/node_modules/',
'/interface/',
'/packages\/extension/',
'/packages\/formatter/', // formatter has it's own test suite
'/coverage/'
],
coverageThreshold: {
Expand Down
9 changes: 9 additions & 0 deletions packages/plugins/package.json
Expand Up @@ -12,7 +12,16 @@
"@sqltools/ui": "*",
"csv-stringify": "^5.3.0"
},
"scripts": {
"test": "jest --config jest.config.js",
"test:watch": "yarn run test -- --watch"
},
"devDependencies": {
"@types/jest": "^24.0.11",
"babel-jest": "^24.5.0",
"jest": "^24.5.0",
"jest-cli": "^24.5.0",
"ts-jest": "^24.0.0",
"typescript": "^3.3.3333"
}
}
7 changes: 6 additions & 1 deletion packages/ui/package.json
Expand Up @@ -17,9 +17,14 @@
"@babel/core": "^7.3.4",
"@babel/preset-env": "^7.3.4",
"@babel/preset-react": "^7.0.0",
"@types/react": "^16.8.7",
"@types/jest": "^24.0.11",
"@types/react-dom": "^16.8.2",
"@types/react-table": "^6.7.22",
"@types/react": "^16.8.7",
"babel-jest": "^24.5.0",
"jest-cli": "^24.5.0",
"jest": "^24.5.0",
"ts-jest": "^24.0.0",
"typescript": "^3.3.3333"
}
}

0 comments on commit 2bc4d00

Please sign in to comment.