Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Node version and dependencies (#212) #213

Merged
merged 1 commit into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions agent/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fs/ppaas-agent",
"version": "3.1.3",
"version": "3.2.0",
"description": "Agent Service for running pewpew tests",
"main": "dist/src/app.js",
"scripts": {
Expand Down Expand Up @@ -58,6 +58,6 @@
"eslint": "^8.40.0",
"mocha": "^10.2.0",
"nyc": "^15.1.0",
"typescript": "~5.3.0"
"typescript": "^5.3.0"
}
}
6 changes: 3 additions & 3 deletions common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fs/ppaas-common",
"version": "3.1.3",
"version": "3.2.0",
"description": "Common Code for the PewPewController and PewPewAgent",
"main": "dist/src/index.js",
"types": "dist/src/index.d.ts",
Expand Down Expand Up @@ -49,13 +49,13 @@
"@types/node": "^20.0.0",
"@typescript-eslint/eslint-plugin": "^7.0.0",
"@typescript-eslint/parser": "^7.0.0",
"aws-sdk-client-mock": "^3.0.0",
"aws-sdk-client-mock": "^4.0.0",
"chai": "^4.3.7",
"dotenv": "^16.0.0",
"dotenv-flow": "^4.0.1",
"eslint": "^8.40.0",
"mocha": "^10.2.0",
"nyc": "^15.1.0",
"typescript": "~5.3.0"
"typescript": "^5.3.0"
}
}
1 change: 1 addition & 0 deletions controller/.storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const config: StorybookConfig = {
// storyStoreV7: false, // Opt out of on-demand story loading
// postcss: false,
},
staticDirs: ["../public"],
// In the future consider https://clacified.com/tech-science/16/how-to-set-up-storybook-v6-with-react-17
typescript: {
check: false,
Expand Down
28 changes: 14 additions & 14 deletions controller/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fs/ppaas-controller",
"version": "3.1.3",
"version": "3.2.0",
"description": "Controller Service for running pewpew tests",
"private": true,
"scripts": {
Expand All @@ -9,8 +9,8 @@
"dev": "next dev",
"build": "npm run build:react && npm run build:test",
"build:react": "next build",
"storybook": "storybook dev -s ../public -p 5002",
"build-storybook": "storybook build -s ../public",
"storybook": "storybook dev -p 5002",
"build-storybook": "storybook build",
"fix:install": "rimraf \"node_modules/@types/react-native/\"",
"build:test": "npm run fix:install && tsc -p tsconfig.test.json",
"test": "npm run build:test && nyc mocha ./dist/test --require jsdom-global/register -r dotenv-flow/config",
Expand Down Expand Up @@ -53,7 +53,7 @@
"chart.js": "~4.4.0",
"chartjs-adapter-date-fns": "^3.0.0",
"cookie": "^0.6.0",
"date-fns": "~3.3.0",
"date-fns": "~3.6.0",
"express": "^4.18.2",
"file-saver": "^2.0.5",
"formidable": "~2.1.2",
Expand All @@ -62,10 +62,10 @@
"next": "~14.1.0",
"next-cookies": "^2.0.3",
"openid-client": "~5.6.0",
"rc-progress": "^3.4.2",
"rc-progress": "^4.0.0",
"react": "^18.2.0",
"react-accessible-accordion": "^5.0.0",
"react-datepicker": "~6.1.0",
"react-datepicker": "~6.6.0",
"react-dom": "^18.2.0",
"react-dropzone": "^14.2.3",
"react-transition-group": "^4.4.5",
Expand All @@ -79,11 +79,11 @@
"@aws-sdk/client-sqs": "^3.363.0",
"@aws-sdk/util-stream-node": "^3.363.0",
"@next/eslint-plugin-next": "~14.1.0",
"@storybook/addon-actions": "~7.6.0",
"@storybook/addon-links": "~7.6.0",
"@storybook/addons": "~7.6.0",
"@storybook/nextjs": "~7.6.0",
"@storybook/react": "~7.6.0",
"@storybook/addon-actions": "~8.0.0",
"@storybook/addon-links": "~8.0.0",
"@storybook/nextjs": "~8.0.0",
"@storybook/preview-api": "^8.0.0",
"@storybook/react": "~8.0.0",
"@testing-library/react": "^14.0.0",
"@types/bunyan": "~1.8.8",
"@types/chai": "^4.3.5",
Expand All @@ -102,7 +102,7 @@
"@types/yauzl": "^2.10.0",
"@typescript-eslint/eslint-plugin": "^7.0.0",
"@typescript-eslint/parser": "^7.0.0",
"aws-sdk-client-mock": "^3.0.0",
"aws-sdk-client-mock": "^4.0.0",
"chai": "^4.3.7",
"copy-webpack-plugin": "^12.0.2",
"dotenv": "^16.0.0",
Expand All @@ -119,8 +119,8 @@
"nyc": "^15.1.0",
"postcss": "^8.4.24",
"set-value": "^4.1.0",
"storybook": "~7.6.0",
"storybook": "~8.0.0",
"trim": "^1.0.1",
"typescript": "~5.3.0"
"typescript": "^5.3.0"
}
}
9 changes: 7 additions & 2 deletions controller/test/pewpew.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ describe("PewPew Util", () => {
const versionInUse = "0.1.1";
let testIdInUse: string | undefined;

before(() => {
before(async () => {
const yamlFile = "unittest.yaml";
const { testId, s3Folder } = PpaasTestId.makeTestId(yamlFile);
const testScheduler = new Map<string, TestSchedulerItem>();
Expand All @@ -313,7 +313,7 @@ describe("PewPew Util", () => {
token: "user1token",
userId: "user1"
};
TestSchedulerIntegration.addTest({
await TestSchedulerIntegration.addTest({
queueName: "bogus",
scheduleDate: Date.now() + 600000,
testMessage: {
Expand All @@ -326,6 +326,11 @@ describe("PewPew Util", () => {
}
}, authUser1);
testIdInUse = testId;
const foundInUse = await TestSchedulerIntegration.getTestIdsForPewPewVersion(versionInUse);
log("scheduledTests", LogLevel.DEBUG, global.scheduledTests);
expect(foundInUse, "foundInUse").to.not.equal(undefined);
expect(foundInUse?.length, "foundInUse.length").to.equal(1);
expect(foundInUse![0], "foundInUse[0]").to.equal(testId);
});

after(() => {
Expand Down
Loading