Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 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
5 changes: 0 additions & 5 deletions .eslintrc

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '18.17.1'
node-version: '20'
cache: npm

- name: Install dependencies
Expand Down
34 changes: 18 additions & 16 deletions cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,29 @@ const config = defineConfig({
reporterOptions: {
configFile: "reporter-config.json"
},
env: {
projectId: process.env.CYPRESS_PROJECT_ID,
},
expose: {
visualRegressionType: 'regression',
visualRegressionBaseDirectory: 'cypress/screenshots/MultiFlatmapVuer.cy.js/base',
visualRegressionDiffDirectory: 'cypress/screenshots/diff',
visualRegressionGenerateDiff: 'always',
visualRegressionFailSilently: true,
HUMAN_FEMALE_UUID: process.env.HUMAN_FEMALE_UUID ? process.env.HUMAN_FEMALE_UUID : '',
HUMAN_MALE_UUID: process.env.HUMAN_MALE_UUID ? process.env.HUMAN_MALE_UUID : '',
RAT_UUID: process.env.RAT_UUID ? process.env.RAT_UUID : '',
MOUSE_UUID: process.env.MOUSE_UUID ? process.env.MOUSE_UUID : '',
PIG_UUID: process.env.PIG_UUID ? process.env.PIG_UUID : '',
CAT_UUID: process.env.CAT_UUID ? process.env.CAT_UUID : '',
ERROR_TOLERANCE: process.env.ERROR_TOLERANCE ? process.env.ERROR_TOLERANCE : 0.0001
},
component: {
specPattern: "cypress/component/*.cy.js",
devServer: {
framework: "vue",
bundler: "vite",
},
env: {
projectId: process.env.CYPRESS_PROJECT_ID,
visualRegressionType: 'regression',
visualRegressionBaseDirectory: 'cypress/screenshots/MultiFlatmapVuer.cy.js/base',
visualRegressionDiffDirectory: 'cypress/screenshots/diff',
visualRegressionGenerateDiff: 'always',
visualRegressionFailSilently: true,
HUMAN_FEMALE_UUID: process.env.HUMAN_FEMALE_UUID ? process.env.HUMAN_FEMALE_UUID : '',
HUMAN_MALE_UUID: process.env.HUMAN_MALE_UUID ? process.env.HUMAN_MALE_UUID : '',
RAT_UUID: process.env.RAT_UUID ? process.env.RAT_UUID : '',
MOUSE_UUID: process.env.MOUSE_UUID ? process.env.MOUSE_UUID : '',
PIG_UUID: process.env.PIG_UUID ? process.env.PIG_UUID : '',
CAT_UUID: process.env.CAT_UUID ? process.env.CAT_UUID : '',
ERROR_TOLERANCE: process.env.ERROR_TOLERANCE ? process.env.ERROR_TOLERANCE : 0.0001
},
screenshotsFolder: './cypress/screenshots',
setupNodeEvents(on, config) {
configureVisualRegression(on)
Expand Down Expand Up @@ -69,4 +71,4 @@ const config = defineConfig({
},
});

export default config;
export default config;
2 changes: 1 addition & 1 deletion cypress/component/MultiFlatmapVuer.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const availableSpecies = [
{ name: "Cat" }
]
const organTypes = ['color', 'grayscale']
const ERROR_TOLERANCE = parseFloat(Cypress.env('ERROR_TOLERANCE'))
const ERROR_TOLERANCE = parseFloat(Cypress.expose('ERROR_TOLERANCE'))

describe('MultiFlatmapVuer', () => {

Expand Down
4 changes: 2 additions & 2 deletions cypress/component/VisualTest.cy.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable no-alert, no-console */
const ERROR_TOLERANCE = parseFloat(Cypress.env('ERROR_TOLERANCE'));
const ERROR_TOLERANCE = parseFloat(Cypress.expose('ERROR_TOLERANCE'));
// Ref: flatmap-viewer/src/layers/styling.ts
const STROKE_INTERPOLATION = [
'interpolate',
Expand Down Expand Up @@ -56,7 +56,7 @@ function is_high_resolution_screen() {
describe('MultiFlatmapVuer Screenshot Comparison', () => {

beforeEach(() => {
Cypress.env('visualRegressionBaseDirectory', 'cypress/screenshots/VisualTest.cy.js/base');
Cypress.expose('visualRegressionBaseDirectory', 'cypress/screenshots/VisualTest.cy.js/base');
cy.viewport(500, 500);
cy.fixture('MultiFlatmapPropsDevel.json').then((props) => {
const modifiedProps = {
Expand Down
14 changes: 7 additions & 7 deletions cypress/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ import 'cypress-wait-until';
import CypressComponentWrapper from '../component/CypressComponentWrapper.vue'
import { createPinia, setActivePinia } from 'pinia';
const UUIDS = {
'Human Female': Cypress.env('HUMAN_FEMALE_UUID'),
'Human Male': Cypress.env('HUMAN_MALE_UUID'),
'Rat': Cypress.env('RAT_UUID'),
'Mouse': Cypress.env('MOUSE_UUID'),
'Pig': Cypress.env('PIG_UUID'),
'Cat': Cypress.env('CAT_UUID')
'Human Female': Cypress.expose('HUMAN_FEMALE_UUID'),
'Human Male': Cypress.expose('HUMAN_MALE_UUID'),
'Rat': Cypress.expose('RAT_UUID'),
'Mouse': Cypress.expose('MOUSE_UUID'),
'Pig': Cypress.expose('PIG_UUID'),
'Cat': Cypress.expose('CAT_UUID')
}

Cypress.on('uncaught:exception', (err) => {
Expand Down Expand Up @@ -94,4 +94,4 @@ Cypress.Commands.add('loadMultiFlatmap', (entry, species = undefined) => {
})
})
})
})
})
23 changes: 23 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import js from "@eslint/js";
import vue from "eslint-plugin-vue";
import globals from "globals";

export default [
{
ignores: ["dist/**", "docs/.vitepress/**", "docs/components/**"],
},
js.configs.recommended,
...vue.configs["flat/essential"],
{
files: ["**/*.{js,vue}"],
languageOptions: {
ecmaVersion: "latest",
sourceType: "module",
globals: {
...globals.node,
...globals.browser,
},
},
rules: {},
},
];
Loading
Loading