ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix .env loading

Browse Source
This commit is contained in:
Ulf Gebhardt 2023-06-02 13:44:43 +02:00
parent 810e1c085b
commit 3ad8588d6f
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cypress/cypress.config.js
View File

@ -1,3 +1,4 @@
const dotenv = require('dotenv')
const { defineConfig } = require("cypress"); const { defineConfig } = require("cypress");
const browserify = require("@badeball/cypress-cucumber-preprocessor/browserify"); const browserify = require("@badeball/cypress-cucumber-preprocessor/browserify");
const { addCucumberPreprocessorPlugin } = require("@badeball/cypress-cucumber-preprocessor"); const { addCucumberPreprocessorPlugin } = require("@badeball/cypress-cucumber-preprocessor");
@ -30,6 +31,9 @@ async function setupNodeEvents(on, config) {
return config; return config;
} }
// Import backend .env (smart)?
const { parsed } = dotenv.config({ path: '../backend/.env' })
module.exports = defineConfig({ module.exports = defineConfig({
e2e: { e2e: {
projectId: "qa7fe2", projectId: "qa7fe2",
@ -44,4 +48,5 @@ module.exports = defineConfig({
video: false, video: false,
setupNodeEvents, setupNodeEvents,
}, },
env: parsed
}); });

6
cypress/support/commands.js
View File

@ -15,7 +15,7 @@
/* globals Cypress cy */ /* globals Cypress cy */
import "cypress-file-upload"; import "cypress-file-upload";
import { GraphQLClient, request } from 'graphql-request' import { GraphQLClient, request } from 'graphql-request'
import config from '../../backend/src/config' import CONFIG from '../../backend/src/config'
const authenticatedHeaders = (variables) => { const authenticatedHeaders = (variables) => {
const mutation = ` const mutation = `
@ -24,7 +24,7 @@ const authenticatedHeaders = (variables) => {
} }
` `
return new Cypress.Promise((resolve, reject) => { return new Cypress.Promise((resolve, reject) => {
request(config.GRAPHQL_URI, mutation, variables).then((response) => { request(CONFIG.GRAPHQL_URI, mutation, variables).then((response) => {
resolve({ authorization: `Bearer ${response.login}` }) resolve({ authorization: `Bearer ${response.login}` })
}) })
}) })
@ -40,7 +40,7 @@ Cypress.Commands.add(
({email, password}) => { ({email, password}) => {
return new Cypress.Promise((resolve, reject) => { return new Cypress.Promise((resolve, reject) => {
authenticatedHeaders({ email, password }).then((headers) => { authenticatedHeaders({ email, password }).then((headers) => {
resolve(new GraphQLClient(config.GRAPHQL_URI, { headers })) resolve(new GraphQLClient(CONFIG.GRAPHQL_URI, { headers }))
}) })
}) })
}) })