Skip to content

Commit

Permalink
Merge branch 'chore/gql-schemas-from-dtos' of https://github.com/medu…
Browse files Browse the repository at this point in the history
…sajs/medusa into chore/gql-schemas-from-dtos
  • Loading branch information
carlos-r-l-rodrigues committed Sep 5, 2024
2 parents da5cfee + 440da31 commit e957418
Show file tree
Hide file tree
Showing 192 changed files with 3,829 additions and 1,656 deletions.
4 changes: 2 additions & 2 deletions integration-tests/api/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ module.exports = {
},
setupFiles: ["../setup-env.js"],
setupFilesAfterEnv: ["../setup.js"],
globalSetup: "../globalSetup.js",
globalTeardown: "../globalTeardown.js",
// globalSetup: "../globalSetup.js",
// globalTeardown: "../globalTeardown.js",
}
4 changes: 1 addition & 3 deletions integration-tests/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"@medusajs/cache-inmemory": "workspace:*",
"@medusajs/customer": "workspace:^",
"@medusajs/event-bus-local": "workspace:*",
"@medusajs/inventory": "latest",
"@medusajs/medusa": "workspace:*",
"@medusajs/modules-sdk": "workspace:^",
"@medusajs/pricing": "workspace:^",
Expand All @@ -28,8 +27,7 @@
"@medusajs/utils": "workspace:^",
"@medusajs/workflow-engine-inmemory": "workspace:*",
"faker": "^5.5.3",
"pg": "^8.11.3",
"typeorm": "^0.3.16"
"pg": "^8.11.3"
},
"devDependencies": {
"@swc/core": "^1.4.8",
Expand Down
180 changes: 0 additions & 180 deletions integration-tests/environment-helpers/use-db.js

This file was deleted.

117 changes: 0 additions & 117 deletions integration-tests/environment-helpers/use-template-db.js

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions integration-tests/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ const pkgs = glob
module.exports = {
testEnvironment: `node`,
testTimeout: 10000,
globalSetup: "<rootDir>/integration-tests/globalSetup.js",
globalTeardown: "<rootDir>/integration-tests/globalTeardown.js",
// globalSetup: "<rootDir>/integration-tests/globalSetup.js",
// globalTeardown: "<rootDir>/integration-tests/globalTeardown.js",
rootDir: `../`,
roots: pkgs,
projects: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ medusaIntegrationTestRunner({
},
},
},
undefined,
{ throwIfKeyNotFound: true }
)

Expand Down Expand Up @@ -127,7 +126,6 @@ medusaIntegrationTestRunner({
},
},
},
undefined,
{
throwIfRelationNotFound: true,
}
Expand Down Expand Up @@ -171,7 +169,6 @@ medusaIntegrationTestRunner({
},
},
},
undefined,
{
throwIfRelationNotFound: [Modules.PAYMENT],
}
Expand Down
Loading

0 comments on commit e957418

Please sign in to comment.