asyavee/medusa-store
1
0 Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
olivermrbl committed 2022-08-24 12:30:33 +02:00
2 parents bda83a84bc 690ca9e89a
commit b7b0a7d3a4
160 files changed
+17116 -3239
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

integration-tests/.env.template → integration-tests/.env.test
+1
View File
@@ -1,3 +1,4 @@
# Default postgres credentials
DB_HOST=localhost
DB_USERNAME=postgres
DB_PASSWORD=''
integration-tests/api/__tests__/line-item-adjustments/index.js
-4
View File
@@ -101,10 +101,6 @@ describe("Line Item Adjustments", () => {
await doAfterEach()
})
afterEach(async () => {
await doAfterEach()
})
describe("Given an existing line item, a discount, and a line item adjustment for both", () => {
describe("When creating an adjustment for another line item w. same discount", () => {
test("Then should create an adjustment", async () => {
integration-tests/api/jest.config.js
+1
View File
@@ -17,6 +17,7 @@ module.exports = {
],
transformIgnorePatterns: [`/dist`],
transform: { "^.+\\.[jt]s$": `../../jest-transformer.js` },
setupFiles: ["../setup-env.js"],
setupFilesAfterEnv: ["../setup.js"],
globalSetup: "../globalSetup.js",
globalTeardown: "../globalTeardown.js",
integration-tests/api/medusa-config.js
+5 -4
View File
@@ -1,12 +1,13 @@
const DB_USERNAME = process.env.DB_USERNAME || "postgres"
const DB_PASSWORD = process.env.DB_PASSWORD || ""
const workerId = parseInt(process.env.JEST_WORKER_ID || "1")
const DB_HOST = process.env.DB_HOST
const DB_USERNAME = process.env.DB_USERNAME
const DB_PASSWORD = process.env.DB_PASSWORD
const DB_NAME = process.env.DB_TEMP_NAME
module.exports = {
plugins: [],
projectConfig: {
redis_url: process.env.REDIS_URL,
database_url: `postgres://${DB_USERNAME}:${DB_PASSWORD}@localhost/medusa-integration-${workerId}`,
database_url: `postgres://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOST}/${DB_NAME}`,
database_type: "postgres",
jwt_secret: "test",
cookie_secret: "test",
integration-tests/helpers/use-db.js
+8 -10
View File
@@ -1,18 +1,19 @@
const path = require("path")
require("dotenv").config({ path: path.join(__dirname, "../.env") })
const { dropDatabase } = require("pg-god")
const { createConnection } = require("typeorm")
const dbFactory = require("./use-template-db")
const workerId = parseInt(process.env.JEST_WORKER_ID || "1")
const DB_USERNAME = process.env.DB_USERNAME || "postgres"
const DB_PASSWORD = process.env.DB_PASSWORD || ""
const DB_URL = `postgres://${DB_USERNAME}:${DB_PASSWORD}@localhost/medusa-integration-${workerId}`
const DB_HOST = process.env.DB_HOST
const DB_USERNAME = process.env.DB_USERNAME
const DB_PASSWORD = process.env.DB_PASSWORD
const DB_NAME = process.env.DB_TEMP_NAME
const DB_URL = `postgres://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOST}/${DB_NAME}`
const pgGodCredentials = {
user: DB_USERNAME,
password: DB_PASSWORD,
host: DB_HOST,
}
const keepTables = [
@@ -69,8 +70,7 @@ const DbTestUtil = {
shutdown: async function () {
await this.db_.close()
const databaseName = `medusa-integration-${workerId}`
return await dropDatabase({ databaseName }, pgGodCredentials)
return await dropDatabase({ DB_NAME }, pgGodCredentials)
},
}
@@ -117,9 +117,7 @@ module.exports = {
instance.setDb(dbConnection)
return dbConnection
} else {
const databaseName = `medusa-integration-${workerId}`
await dbFactory.createFromTemplate(databaseName)
await dbFactory.createFromTemplate(DB_NAME)
// get migraitons with enabled featureflags
const migrationDir = path.resolve(
integration-tests/helpers/use-template-db.js
+7 -4
View File
@@ -1,16 +1,19 @@
const path = require("path")
require("dotenv").config({ path: path.join(__dirname, "../.env") })
require("dotenv").config({ path: path.join(__dirname, "../.env.test") })
const { createDatabase, dropDatabase } = require("pg-god")
const { createConnection, getConnection } = require("typeorm")
const DB_USERNAME = process.env.DB_USERNAME || "postgres"
const DB_PASSWORD = process.env.DB_PASSWORD || ""
const DB_URL = `postgres://${DB_USERNAME}:${DB_PASSWORD}@localhost`
const DB_HOST = process.env.DB_HOST
const DB_USERNAME = process.env.DB_USERNAME
const DB_PASSWORD = process.env.DB_PASSWORD
const DB_URL = `postgres://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOST}`
const pgGodCredentials = {
user: DB_USERNAME,
password: DB_PASSWORD,
host: DB_HOST,
}
class DatabaseFactory {
integration-tests/jest.config.js
+1
View File
@@ -25,5 +25,6 @@ module.exports = {
`.cache`,
],
transform: { "^.+\\.[jt]s$": `<rootDir>/jest-transformer.js` },
setupFiles: ["<rootDir>/integration-tests/setup-env.js"],
setupFilesAfterEnv: ["<rootDir>/integration-tests/setup.js"],
}
integration-tests/plugins/jest.config.js
+1
View File
@@ -15,6 +15,7 @@ module.exports = {
],
transformIgnorePatterns: [`/dist`],
transform: { "^.+\\.[jt]s$": `../../jest-transformer.js` },
setupFiles: ["../setup-env.js"],
setupFilesAfterEnv: ["../setup.js"],
globalSetup: "../globalSetup.js",
globalTeardown: "../globalTeardown.js",
integration-tests/plugins/medusa-config.js
+7 -6
View File
@@ -1,6 +1,7 @@
const DB_USERNAME = process.env.DB_USERNAME || "postgres"
const DB_PASSWORD = process.env.DB_PASSWORD || ""
const workerId = parseInt(process.env.JEST_WORKER_ID || "1")
const DB_HOST = process.env.DB_HOST
const DB_USERNAME = process.env.DB_USERNAME
const DB_PASSWORD = process.env.DB_PASSWORD
const DB_NAME = process.env.DB_TEMP_NAME
module.exports = {
plugins: [
@@ -22,9 +23,9 @@ module.exports = {
],
projectConfig: {
// redis_url: REDIS_URL,
database_url: `postgres://${DB_USERNAME}:${DB_PASSWORD}@localhost/medusa-integration-${workerId}`,
database_url: `postgres://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOST}/${DB_NAME}`,
database_type: "postgres",
jwt_secret: 'test',
cookie_secret: 'test'
jwt_secret: "test",
cookie_secret: "test",
},
}
integration-tests/plugins/package.json
+1 -1
View File
@@ -4,7 +4,7 @@
"main": "index.js",
"license": "MIT",
"scripts": {
"test": "jest --maxWorkers=50% --silent=false",
"test": "jest --runInBand --silent=false",
"build": "babel src -d dist --extensions \".ts,.js\""
},
"dependencies": {
integration-tests/setup-env.js
+8
View File
@@ -0,0 +1,8 @@
const path = require("path")
require("dotenv").config({ path: path.join(__dirname, ".env.test") })
if (typeof process.env.DB_TEMP_NAME === "undefined") {
const tempName = parseInt(process.env.JEST_WORKER_ID || "1")
process.env.DB_TEMP_NAME = `medusa-integration-${tempName}`
}
integration-tests/setup.js
+6 -10
View File
@@ -1,20 +1,16 @@
const path = require("path")
const { dropDatabase } = require("pg-god")
require("dotenv").config({ path: path.join(__dirname, ".env") })
const DB_USERNAME = process.env.DB_USERNAME || "postgres"
const DB_PASSWORD = process.env.DB_PASSWORD || ""
const DB_HOST = process.env.DB_HOST
const DB_USERNAME = process.env.DB_USERNAME
const DB_PASSWORD = process.env.DB_PASSWORD
const DB_NAME = process.env.DB_TEMP_NAME
const pgGodCredentials = {
user: DB_USERNAME,
password: DB_PASSWORD,
host: DB_HOST,
}
afterAll(async () => {
const workerId = parseInt(process.env.JEST_WORKER_ID || "1")
await dropDatabase(
{ databaseName: `medusa-integration-${workerId}` },
pgGodCredentials
)
await dropDatabase({ databaseName: DB_NAME }, pgGodCredentials)
})