Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

internal/integration-tests-has-started-failing #367

Closed
wants to merge 1 commit into from
Closed

internal/integration-tests-has-started-failing #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 44 additions & 0 deletions cypress.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import { defineConfig } from 'cypress';

export default defineConfig({
videosFolder: 'cypress/videos',
screenshotsFolder: 'cypress/screenshots',
fixturesFolder: 'cypress/fixtures',
retries: {
runMode: 2,
openMode: 0,
},
env: {
DSPACE_TEST_ADMIN_USER: '[email protected]',
DSPACE_TEST_ADMIN_PASSWORD: 'dspace',
DSPACE_TEST_COMMUNITY: 'c4c8da3d-8105-49a1-94fa-f89ad3e9a887',
DSPACE_TEST_COLLECTION: 'c6579e21-4d9b-44c7-a557-186c5e3471eb',
DSPACE_TEST_ENTITY_PUBLICATION: 'e98b0f27-5c19-49a0-960d-eb6ad5287067',
DSPACE_TEST_SEARCH_TERM: 'test',
DSPACE_TEST_SUBMIT_COLLECTION_NAME: 'Sample Collection',
DSPACE_TEST_SUBMIT_COLLECTION_UUID: '9d8334e9-25d3-4a67-9cea-3dffdef80144',
DSPACE_TEST_SUBMIT_CLARIAH_COLLECTION_UUID:
'7eb3562b-27f5-445f-8303-db771969cbff',
DSPACE_TEST_SUBMIT_USER: '[email protected]',
DSPACE_TEST_SUBMIT_USER_PASSWORD: 'dspace',
CLARIN_TEST_WITHDRAWN_ITEM: '7282fc76-0941-4055-a5a3-1f582c638050',
CLARIN_TEST_WITHDRAWN_ITEM_WITH_REASON:
'8ae76fcf-b26b-42f2-84d3-9a85e0517bca',
CLARIN_TEST_WITHDRAWN_ITEM_WITH_REASON_AND_AUTHORS:
'cd368b6a-0019-4813-bad9-5050e50ba36d',
CLARIN_TEST_WITHDRAWN_REPLACED_ITEM: '566b1b8b-840d-476c-9fb0-b92fb92d4aad',
CLARIN_TEST_WITHDRAWN_REPLACED_ITEM_WITH_AUTHORS:
'600a9e09-dd31-428e-9328-2ed6631aa50a',
CLARIN_TEST_WITHDRAWN_REASON: 'reason',
CLARIN_TEST_WITHDRAWN_REPLACEMENT: 'new URL',
CLARIN_TEST_WITHDRAWN_AUTHORS: 'author1, author2',
},
e2e: {
// We've imported your old cypress plugins here.
// You may want to clean this up later by importing these.
setupNodeEvents(on, config) {
return require('./cypress/plugins/index.ts')(on, config)
},
baseUrl: 'http://127.0.0.1:4000',
},
});
34 changes: 0 additions & 34 deletions cypress.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cypress/integration/admin-menu.spec.ts → cypress/e2e/admin-menu.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
TEST_ADMIN_PASSWORD,
TEST_ADMIN_USER,
TEST_SUBMIT_COLLECTION_UUID,
} from '../support';
} from '../support/e2e';

/**
* Test menu options for admin
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/breadcrumbs.spec.ts → cypress/e2e/breadcrumbs.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TEST_ENTITY_PUBLICATION } from 'cypress/support';
import { TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
import { testA11y } from 'cypress/support/utils';

describe('Breadcrumbs', () => {
Expand Down
0 cypress/integration/browse-by-author.spec.ts → cypress/e2e/browse-by-author.cy.ts
View file
Open in desktop
File renamed without changes.
0 .../integration/browse-by-dateissued.spec.ts → cypress/e2e/browse-by-dateissued.cy.ts
View file
Open in desktop
File renamed without changes.
0 ...ess/integration/browse-by-subject.spec.ts → cypress/e2e/browse-by-subject.cy.ts
View file
Open in desktop
File renamed without changes.
0 cypress/integration/browse-by-title.spec.ts → cypress/e2e/browse-by-title.cy.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../integration/clarin-licenses-page.spec.ts → cypress/e2e/clarin-licenses-page.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TEST_ADMIN_PASSWORD, TEST_ADMIN_USER } from '../support';
import { TEST_ADMIN_PASSWORD, TEST_ADMIN_USER } from '../support/e2e';

/**
* Test to check if the license administration page is loaded after redirecting.
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/collection-page.spec.ts → cypress/e2e/collection-page.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TEST_COLLECTION } from 'cypress/support';
import { TEST_COLLECTION } from 'cypress/support/e2e';
import { testA11y } from 'cypress/support/utils';

describe('Collection Page', () => {
Expand Down
2 changes: 1 addition & 1 deletion ...integration/collection-statistics.spec.ts → cypress/e2e/collection-statistics.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TEST_COLLECTION } from 'cypress/support';
import { TEST_COLLECTION } from 'cypress/support/e2e';
import { testA11y } from 'cypress/support/utils';

describe('Collection Statistics Page', () => {
Expand Down
0 cypress/integration/community-list.spec.ts → cypress/e2e/community-list.cy.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cypress/integration/community-page.spec.ts → cypress/e2e/community-page.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TEST_COMMUNITY } from 'cypress/support';
import { TEST_COMMUNITY } from 'cypress/support/e2e';
import { testA11y } from 'cypress/support/utils';

describe('Community Page', () => {
Expand Down
2 changes: 1 addition & 1 deletion .../integration/community-statistics.spec.ts → cypress/e2e/community-statistics.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TEST_COMMUNITY } from 'cypress/support';
import { TEST_COMMUNITY } from 'cypress/support/e2e';
import { testA11y } from 'cypress/support/utils';

describe('Community Statistics Page', () => {
Expand Down
0 cypress/integration/footer.spec.ts → cypress/e2e/footer.cy.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cypress/integration/handle-page.ts → cypress/e2e/handle-page.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TEST_ADMIN_PASSWORD, TEST_ADMIN_USER } from '../support';
import { TEST_ADMIN_PASSWORD, TEST_ADMIN_USER } from '../support/e2e';

/**
* Test for checking if the handle page is loaded after redirecting.
Expand Down
0 cypress/integration/header.spec.ts → cypress/e2e/header.cy.ts
View file
Open in desktop
File renamed without changes.
0 ...s/integration/homepage-statistics.spec.ts → cypress/e2e/homepage-statistics.cy.ts
View file
Open in desktop
File renamed without changes.
0 cypress/integration/homepage.spec.ts → cypress/e2e/homepage.cy.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cypress/integration/item-page.spec.ts → cypress/e2e/item-page.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Options } from 'cypress-axe';
import { TEST_ENTITY_PUBLICATION } from 'cypress/support';
import { TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
import { testA11y } from 'cypress/support/utils';

describe('Item Page', () => {
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/item-statistics.spec.ts → cypress/e2e/item-statistics.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TEST_ENTITY_PUBLICATION } from 'cypress/support';
import { TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
import { testA11y } from 'cypress/support/utils';

describe('Item Statistics Page', () => {
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/login-modal.spec.ts → cypress/e2e/login-modal.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TEST_ADMIN_PASSWORD, TEST_ADMIN_USER, TEST_ENTITY_PUBLICATION } from 'cypress/support';
import { TEST_ADMIN_PASSWORD, TEST_ADMIN_USER, TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';

const page = {
openLoginMenu() {
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/my-dspace.spec.ts → cypress/e2e/my-dspace.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// TEST_SUBMIT_USER_PASSWORD,
// TEST_SUBMIT_COLLECTION_NAME,
// TEST_SUBMIT_USER
// } from 'cypress/support';
// } from 'cypress/support/e2e';

// CLARIN - When the user is redirected into /mydspace the default search configuration is for
// supervisedItems and the yourSubmission is missing. TODO fix this
Expand Down
0 cypress/integration/pagenotfound.spec.ts → cypress/e2e/pagenotfound.cy.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cypress/integration/search-navbar.spec.ts → cypress/e2e/search-navbar.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TEST_SEARCH_TERM } from 'cypress/support';
import { TEST_SEARCH_TERM } from 'cypress/support/e2e';

const page = {
fillOutQueryInNavBar(query) {
Expand Down
0 cypress/integration/search-page.spec.ts → cypress/e2e/search-page.cy.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cypress/integration/submission-ui.spec.ts → cypress/e2e/submission-ui.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
TEST_ADMIN_USER,
TEST_SUBMIT_CLARIAH_COLLECTION_UUID,
TEST_SUBMIT_COLLECTION_UUID
} from '../support';
} from '../support/e2e';
import { createItemProcess } from '../support/commands';


Expand Down
10 changes: 4 additions & 6 deletions cypress/integration/submission.spec.ts → cypress/e2e/submission.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import {
TEST_SUBMIT_USER,
TEST_SUBMIT_USER_PASSWORD,
TEST_SUBMIT_COLLECTION_NAME,
TEST_ADMIN_PASSWORD, TEST_ADMIN_USER, TEST_SUBMIT_COLLECTION_NAME,
TEST_SUBMIT_COLLECTION_UUID,
TEST_ADMIN_USER, TEST_ADMIN_PASSWORD
}
from 'cypress/support';
TEST_SUBMIT_USER,
TEST_SUBMIT_USER_PASSWORD
} from 'cypress/support/e2e';
import { createItemProcess } from '../support/commands';

describe('New Submission page', () => {
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/tombstone.spec.ts → cypress/e2e/tombstone.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
TEST_WITHDRAWN_ITEM,
TEST_WITHDRAWN_ITEM_WITH_REASON, TEST_WITHDRAWN_ITEM_WITH_REASON_AND_AUTHORS, TEST_WITHDRAWN_REASON,
TEST_WITHDRAWN_REPLACED_ITEM, TEST_WITHDRAWN_REPLACED_ITEM_WITH_AUTHORS, TEST_WITHDRAWN_REPLACEMENT
} from '../support';
} from '../support/e2e';

const ITEMPAGE_WITHDRAWN = '/items/' + TEST_WITHDRAWN_ITEM;
const ITEMPAGE_WITHDRAWN_REASON = '/items/' + TEST_WITHDRAWN_ITEM_WITH_REASON;
Expand Down
0 cypress/support/index.ts → cypress/support/e2e.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@
"compression-webpack-plugin": "^9.2.0",
"copy-webpack-plugin": "^6.4.1",
"cross-env": "^7.0.3",
"cypress": "9.7.0",
"cypress-axe": "^0.14.0",
"cypress": "12.17.4",
"cypress-axe": "^1.4.0",
"deep-freeze": "0.0.1",
"eslint": "^8.2.0",
"eslint-plugin-deprecation": "^1.3.2",
Expand Down
Loading
Loading