mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-13 07:46:06 +00:00
Merge branch 'master' into ignore-dependabot-frontend-bump-pr
This commit is contained in:
commit
ffa86c62d0
2
.github/workflows/deploy-documentation.yml
vendored
2
.github/workflows/deploy-documentation.yml
vendored
@ -38,7 +38,7 @@ jobs:
|
||||
run: npm install && npm run docs:build
|
||||
|
||||
- name: Deploy Vuepress to Github Pages
|
||||
uses: crazy-max/ghaction-github-pages@08f571653184e9ff3d598bdda53ffd4ed00ed562 # v4.0.0
|
||||
uses: crazy-max/ghaction-github-pages@fbf0a4fa4e00f45accd6cf3232368436ec06ed59 # v4.0.0
|
||||
with:
|
||||
target_branch: gh-pages
|
||||
build_dir: .vuepress/dist
|
||||
|
||||
@ -1,7 +1,12 @@
|
||||
const dotenv = require('dotenv')
|
||||
const { defineConfig } = require("cypress");
|
||||
const browserify = require("@badeball/cypress-cucumber-preprocessor/browserify");
|
||||
const { addCucumberPreprocessorPlugin } = require("@badeball/cypress-cucumber-preprocessor");
|
||||
const { defineConfig } = require('cypress');
|
||||
const browserify = require('@cypress/browserify-preprocessor');
|
||||
const {
|
||||
addCucumberPreprocessorPlugin,
|
||||
} = require('@badeball/cypress-cucumber-preprocessor');
|
||||
const {
|
||||
preprendTransformerToOptions,
|
||||
} = require('@badeball/cypress-cucumber-preprocessor/browserify');
|
||||
|
||||
// Test persistent(between commands) store
|
||||
const testStore = {}
|
||||
@ -9,15 +14,18 @@ const testStore = {}
|
||||
async function setupNodeEvents(on, config) {
|
||||
await addCucumberPreprocessorPlugin(on, config);
|
||||
|
||||
on("file:preprocessor", browserify.default(config));
|
||||
on(
|
||||
'file:preprocessor',
|
||||
browserify(preprendTransformerToOptions(config, browserify.defaultOptions)),
|
||||
);
|
||||
|
||||
on("task", {
|
||||
on('task', {
|
||||
pushValue({ name, value }) {
|
||||
testStore[name] = value
|
||||
return true
|
||||
},
|
||||
getValue(name) {
|
||||
console.log("getValue",name,testStore)
|
||||
console.log('getValue',name,testStore)
|
||||
return testStore[name]
|
||||
},
|
||||
});
|
||||
@ -30,13 +38,13 @@ const { parsed } = dotenv.config({ path: '../backend/.env' })
|
||||
|
||||
module.exports = defineConfig({
|
||||
e2e: {
|
||||
projectId: "qa7fe2",
|
||||
projectId: 'qa7fe2',
|
||||
defaultCommandTimeout: 60000,
|
||||
pageLoadTimeout:180000,
|
||||
chromeWebSecurity: false,
|
||||
baseUrl: "http://localhost:3000",
|
||||
specPattern: "cypress/e2e/**/*.feature",
|
||||
supportFile: "cypress/support/e2e.js",
|
||||
baseUrl: 'http://localhost:3000',
|
||||
specPattern: '**/*.feature',
|
||||
supportFile: 'cypress/support/e2e.js',
|
||||
retries: 0,
|
||||
video: false,
|
||||
viewportHeight: 720,
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
"@babel/core": "^7.26.0",
|
||||
"@babel/preset-env": "^7.26.0",
|
||||
"@babel/register": "^7.25.9",
|
||||
"@badeball/cypress-cucumber-preprocessor": "^20.0.4",
|
||||
"@badeball/cypress-cucumber-preprocessor": "^21.0.2",
|
||||
"@cucumber/cucumber": "10.6.0",
|
||||
"@cypress/browserify-preprocessor": "^3.0.2",
|
||||
"@faker-js/faker": "9.1.0",
|
||||
|
||||
@ -39,7 +39,7 @@ export default {
|
||||
$offset: $size * -0.2;
|
||||
|
||||
&.hc-badges-dual {
|
||||
padding-top: $size / 2 - 2;
|
||||
padding-top: math.div($size, 2) - 2;
|
||||
}
|
||||
|
||||
.hc-badge-container {
|
||||
@ -59,10 +59,10 @@ export default {
|
||||
margin-left: -6px;
|
||||
}
|
||||
&:first-child {
|
||||
margin-left: -$size / 3;
|
||||
margin-left: math.div(-$size, 3);
|
||||
}
|
||||
&:last-child {
|
||||
margin-right: -$size / 3;
|
||||
margin-right: math.div(-$size, 3);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user