Skip to content

Commit

Permalink
Merge pull request #248 from akhuoa/bugfix/security-updates
Browse files Browse the repository at this point in the history
Security updates
  • Loading branch information
alan-wu authored Oct 9, 2024
2 parents 951950d + 586680f commit d5e9fb1
Show file tree
Hide file tree
Showing 7 changed files with 1,822 additions and 8,334 deletions.
5 changes: 3 additions & 2 deletions cypress/component/MapContent.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,6 @@ describe('MapContent', () => {
//Check for two content containers
cy.get('.contentvuer').should('be.visible').should('have.length', 2);

//Wait for the mouse dataset request
cy.wait('@mouseDataset', {timeout: 20000});

//Open the sidebar
cy.get('.side-bar > .open-tab').should('exist').click();
Expand All @@ -154,6 +152,9 @@ describe('MapContent', () => {
//Check number of dataset card, it should be 1
cy.get('.dataset-card-container').should('have.length', 1);

//Wait for the mouse dataset request
cy.wait('@mouseDataset', {timeout: 20000});

//Check how many tags in the dataset
cy.get('.box-card .container button').should('have.length', 6);

Expand Down
2 changes: 1 addition & 1 deletion cypress/fixtures/stubResponse.json
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
"dataset_revision": "",
"dataset_version": "3",
"description": "Test this",
"doi": "https://doi.org/10.26275/z1ga-dflp",
"doi": "https://doi.org/10.26275/llxf-edeh",
"identifier": "N:dataset:a59a7c4c-0234534e24b31",
"mbf-segmentation": [
{
Expand Down
31 changes: 20 additions & 11 deletions cypress/plugins/index.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
const { startDevServer } = require('@cypress/webpack-dev-server')
const webpackConfig = require('@vue/cli-service/webpack.config.js')
// Plugins to be added in main config
// https://docs.cypress.io/guides/tooling/plugins-guide#Using-a-plugin
//
// Legacy configuration
// https://docs.cypress.io/guides/references/legacy-configuration#Plugins
//
// @cypress/webpack-dev-server is bundled with the Cypress binary and should not need to be installed separately.
// https://github.com/cypress-io/cypress/tree/develop/npm/webpack-dev-server#cypresswebpack-dev-server
//
// const { startDevServer } = require('@cypress/webpack-dev-server')
// const webpackConfig = require('@vue/cli-service/webpack.config.js')

module.exports = (on, config) => {
on('dev-server:start', options =>
startDevServer({
options,
webpackConfig
})
)
// module.exports = (on, config) => {
// on('dev-server:start', options =>
// startDevServer({
// options,
// webpackConfig
// })
// )

return config
}
// return config
// }
Loading

0 comments on commit d5e9fb1

Please sign in to comment.