Skip to content

Commit

Permalink
Enable webhooks pipeline (#6706)
Browse files Browse the repository at this point in the history
<!-- Raise an issue to propose your change
(https://github.com/opencv/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution
guide](https://opencv.github.io/cvat/docs/contributing/). -->

<!-- Provide a general summary of your changes in the Title above -->

### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->

### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->

### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- [ ] I have added a description of my changes into the
[CHANGELOG](https://github.com/opencv/cvat/blob/develop/CHANGELOG.md)
file
- [ ] I have updated the documentation accordingly
- [ ] I have added tests to cover my changes
- [ ] I have linked related issues (see [GitHub docs](

https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
- [ ] I have increased versions of npm packages if it is necessary

([cvat-canvas](https://github.com/opencv/cvat/tree/develop/cvat-canvas#versioning),

[cvat-core](https://github.com/opencv/cvat/tree/develop/cvat-core#versioning),

[cvat-data](https://github.com/opencv/cvat/tree/develop/cvat-data#versioning)
and

[cvat-ui](https://github.com/opencv/cvat/tree/develop/cvat-ui#versioning))

### License

- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/opencv/cvat/blob/develop/LICENSE) that covers the
project.
  Feel free to contact the maintainers if that's a concern.
  • Loading branch information
bsekachev committed Aug 22, 2023
1 parent 9fb60b7 commit 948db75
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 32 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,8 @@ jobs:
matrix:
specs: ['actions_tasks', 'actions_tasks2', 'actions_tasks3',
'actions_objects', 'actions_objects2', 'actions_users',
'actions_projects_models', 'actions_organizations', 'canvas3d_functionality',
'canvas3d_functionality_2', 'issues_prs', 'issues_prs2', 'masks', 'skeletons',
'analytics']
'actions_projects_models', 'canvas3d_functionality', 'canvas3d_functionality_2',
'issues_prs', 'issues_prs2', 'features']
steps:
- uses: actions/checkout@v3
with:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,8 @@ jobs:
matrix:
specs: ['actions_tasks', 'actions_tasks2', 'actions_tasks3',
'actions_objects', 'actions_objects2', 'actions_users',
'actions_projects_models', 'actions_organizations', 'canvas3d_functionality',
'canvas3d_functionality_2', 'issues_prs', 'issues_prs2', 'masks', 'skeletons',
'analytics']
'actions_projects_models', 'canvas3d_functionality', 'canvas3d_functionality_2',
'issues_prs', 'issues_prs2', 'features']
steps:
- uses: actions/checkout@v3

Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/schedule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,8 @@ jobs:
matrix:
specs: ['actions_tasks', 'actions_tasks2', 'actions_tasks3',
'actions_objects', 'actions_objects2', 'actions_users',
'actions_projects_models', 'actions_organizations', 'canvas3d_functionality',
'canvas3d_functionality_2', 'issues_prs', 'issues_prs2', 'masks', 'skeletons',
'analytics']
'actions_projects_models', 'canvas3d_functionality', 'canvas3d_functionality_2',
'issues_prs', 'issues_prs2', 'features']
steps:
- uses: actions/checkout@v3

Expand Down
6 changes: 1 addition & 5 deletions tests/cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ module.exports = defineConfig({
baseUrl: 'http://localhost:8080',
specPattern: [
'cypress/e2e/auth_page.js',
'cypress/e2e/skeletons/*.js',
'cypress/e2e/webhooks.js',
'cypress/e2e/masks/*.js',
'cypress/e2e/features/*.js',
'cypress/e2e/actions_tasks/**/*.js',
'cypress/e2e/actions_tasks2/**/*.js',
'cypress/e2e/actions_tasks3/**/*.js',
Expand All @@ -31,9 +29,7 @@ module.exports = defineConfig({
'cypress/e2e/issues_prs/**/*.js',
'cypress/e2e/issues_prs2/**/*.js',
'cypress/e2e/actions_users/**/*.js',
'cypress/e2e/analytics/*.js',
'cypress/e2e/actions_projects_models/**/*.js',
'cypress/e2e/actions_organizations/**/*.js',
'cypress/e2e/remove_users_tasks_projects_organizations.js',
],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,14 +181,15 @@ context('Analytics pipeline', () => {
cy.goCheckFrameNumber(0);
cy.get('#cvat-objects-sidebar-state-item-1')
.find('.cvat-objects-sidebar-state-item-label-selector')
.type(`${secondLabelName}{Enter}`)
.type(`${secondLabelName}{Enter}`);
cy.get('#cvat-objects-sidebar-state-item-1')
.find('.cvat-objects-sidebar-state-item-label-selector')
.trigger('mouseout');
cy.saveJob();

cy.goToNextFrame(1);
cy.get('#cvat_canvas_shape_2')
.trigger('mousemove')
.should('have.class', 'cvat_canvas_shape_activated');
cy.get('#cvat_canvas_shape_2').trigger('mousemove');
cy.get('#cvat_canvas_shape_2').should('have.class', 'cvat_canvas_shape_activated');
cy.get('body').type('{del}');
cy.get('#cvat_canvas_shape_2').should('not.exist');
cy.saveJob();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ context('Manipulations with masks', { scrollBehavior: false }, () => {
const { value } = instruction;
cy.get('.cvat-brush-tools-brush').click();
cy.get('.cvat-brush-tools-brush-size').within(() => {
cy.get('input').clear().type(`${value}`);
cy.get('input').clear();
cy.get('input').type(`${value}`);
});
} else {
const { coordinates } = instruction;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ context('Manipulations with skeletons', { scrollBehavior: false }, () => {
expect(skeletonSize).to.be.equal(skeleton.points.length);
cy.get('input[type="file"]').attachFile(archiveName, { subjectType: 'drag-n-drop' });
cy.intercept('/api/tasks?**').as('taskPost');
cy.contains('Submit & Open').scrollIntoView().click();
cy.contains('Submit & Open').scrollIntoView();
cy.contains('Submit & Open').click();
cy.wait('@taskPost').then((interception) => {
taskID = interception.response.body.id;
expect(interception.response.statusCode).to.be.equal(201);
Expand Down Expand Up @@ -125,7 +126,8 @@ context('Manipulations with skeletons', { scrollBehavior: false }, () => {
cy.get('body').click();
cy.get('#cvat_canvas_shape_1').within(($el) => {
cy.get('.cvat_canvas_skeleton_wrapping_rect').should('exist').and('not.be.visible');
cy.wrap($el).trigger('mousemove').should('have.class', 'cvat_canvas_shape_activated');
cy.wrap($el).trigger('mousemove');
cy.wrap($el).should('have.class', 'cvat_canvas_shape_activated');
cy.get('.cvat_canvas_skeleton_wrapping_rect').should('exist').and('be.visible');
});

Expand Down Expand Up @@ -160,7 +162,8 @@ context('Manipulations with skeletons', { scrollBehavior: false }, () => {
});
cy.get('body').trigger('keydown', { keyCode: 78, code: 'KeyN', shiftKey: true });
cy.get('.cvat-canvas-container')
.click(skeletonPosition.xtl + REDRAW_MARGIN, skeletonPosition.ytl + REDRAW_MARGIN)
.click(skeletonPosition.xtl + REDRAW_MARGIN, skeletonPosition.ytl + REDRAW_MARGIN);
cy.get('.cvat-canvas-container')
.click(skeletonPosition.xbr + REDRAW_MARGIN, skeletonPosition.ybr + REDRAW_MARGIN);
cy.get('.cvat-cursor-control').should('have.class', 'cvat-active-canvas-control');
cy.get('#cvat_canvas_shape_1').within(() => {
Expand All @@ -186,7 +189,8 @@ context('Manipulations with skeletons', { scrollBehavior: false }, () => {
cy.goCheckFrameNumber(splittingFrame);

cy.get('.cvat-split-track-control').click();
cy.get('#cvat_canvas_shape_1').click().click();
cy.get('#cvat_canvas_shape_1').click();
cy.get('#cvat_canvas_shape_1').click();

// check objects after splitting
cy.get('#cvat_canvas_shape_1').should('not.exist');
Expand Down
File renamed without changes.
19 changes: 10 additions & 9 deletions tests/nightly_cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,16 @@ module.exports = defineConfig({
baseUrl: 'http://localhost:8080',
specPattern: [
'cypress/e2e/auth_page.js',
'cypress/e2e/actions_tasks/*.js',
'cypress/e2e/actions_tasks2/*.js',
'cypress/e2e/actions_tasks3/*.js',
'cypress/e2e/actions_objects/*.js',
'cypress/e2e/actions_objects2/*.js',
'cypress/e2e/issues_prs/*.js',
'cypress/e2e/issues_prs2/*.js',
'cypress/e2e/actions_projects_models/*.js',
'cypress/e2e/actions_users/*.js',
'cypress/e2e/features/*.js',
'cypress/e2e/actions_tasks/**/*.js',
'cypress/e2e/actions_tasks2/**/*.js',
'cypress/e2e/actions_tasks3/**/*.js',
'cypress/e2e/actions_objects/**/*.js',
'cypress/e2e/actions_objects2/**/*.js',
'cypress/e2e/issues_prs/**/*.js',
'cypress/e2e/issues_prs2/**/*.js',
'cypress/e2e/actions_users/**/*.js',
'cypress/e2e/actions_projects_models/**/*.js',
'cypress/e2e/email_system/*.js',
'cypress/e2e/remove_users_tasks_projects_organizations.js',
],
Expand Down

0 comments on commit 948db75

Please sign in to comment.