Skip to content

Commit

Permalink
More reordering
Browse files Browse the repository at this point in the history
  • Loading branch information
sneridagh committed Oct 22, 2024
1 parent c0f1e5a commit e17e03a
Show file tree
Hide file tree
Showing 27 changed files with 74 additions and 11 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ core
build
.DS_Store
public
.DS_Store
Binary file added cypress/__image_snapshots__/.DS_Store
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 0 additions & 9 deletions cypress/tests/visual/blocks-listing.cy.js

This file was deleted.

73 changes: 73 additions & 0 deletions cypress/tests/visual/blocks-listingsandsearch.cy.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
import path from 'path';
import describeWithResolutions from '../../support/describe-with-resolutions';
import describeWithPaths from '../../support/visual/describe-with-paths';
import rangeFilter from '../../support/visual/range-filter';
import hasItPassed from '../../support/visual/has-it-passed';
import { skipOn } from '@cypress/skip-test';

beforeEach(function () {
skipOn(hasItPassed('cypress' + path.resolve(__filename), this.currentTest));
});

describe('Blocks-Listings-Search', () =>
describeWithResolutions(undefined, (setViewport, title, resolution) => {
describe(`anonymous`, () => {
beforeEach(() => {
cy.intercept('GET', `/**/*?expand*`).as('content');
cy.visit('/');
cy.wait('@content');
setViewport(cy);
});

// it('Listing Block', function () {
// cy.intercept('GET', `/**/@querystring-search*`).as(
// 'querystring-search',
// );
// cy.navigate('/block/listing-block');
// cy.wait([
// '@querystring-search',
// '@querystring-search',
// '@querystring-search',
// '@querystring-search',
// ]);
// cy.matchImage();
// });

it('Search Block', function () {
cy.intercept('GET', `/**/@querystring-search*`).as(
'querystring-search',
);
cy.navigate('/block/search-block');
cy.wait(['@querystring-search', '@querystring-search']);
cy.matchImage();
});

it('Grid - Listing Block', function () {
cy.intercept('GET', `/**/@querystring-search*`).as(
'querystring-search',
);
cy.navigate('/block/grid-block/listing');
cy.wait(['@querystring-search', '@querystring-search']);
cy.matchImage();
});
});

describe(`authenticated`, () => {
if (['ipad-2', 'iphone-8'].includes(resolution)) {
// Skip the link list test for smaller resolutions
return;
}

beforeEach(() => {
cy.autologin('admin', 'admin');
cy.intercept('GET', `/**/*?expand*`).as('content');
cy.visit('/');
cy.wait('@content');
setViewport(cy);
});

// it('home page', function () {
// cy.matchImage();
// });
});
}));
1 change: 0 additions & 1 deletion cypress/tests/visual/blocks.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ const PUBLIC_PAGES = [
'/block/button-block',
'/block/highlight-block',
'/block/image-block',
'/block/search-block',
'/block/introduction-block',
'/block/separator-block',
'/block/teaser-block',
Expand Down
1 change: 1 addition & 0 deletions packages/volto-light-theme/src/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ const applyConfig = (config) => {
config.settings.enableFatMenu = true;
config.settings.slate.useLinkedHeadings = false;
config.settings.contentMetadataTagsImageField = 'preview_image';
config.settings.querystringSearchGet = true;

// Initial block for event content type
config.blocks.initialBlocks = {
Expand Down

0 comments on commit e17e03a

Please sign in to comment.