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

Jump to bottom

Preparation for testing. Add tests for issue 1599. #1983

Merged
merged 9 commits into from
Aug 11, 2020
Merged

Preparation for testing. Add tests for issue 1599. #1983

merged 9 commits into from
Aug 11, 2020

Conversation

dvkruchinin
Copy link
Contributor

Motivation and context

Re-configure .travis.yml to run Cypress from Docker host.
Add auto creation superuser for login to CVAT and testing.
Remove unnecessary line from Dockerfile.ci
Add tests for issue 1599

How has this been tested?

Checklist

License

  • I submit my code changes under the same MIT License that covers the project.
    Feel free to contact the maintainers if that's a concern.
  • I have updated the license header for each file (see an example below)
# Copyright (C) 2020 Intel Corporation
#
# SPDX-License-Identifier: MIT

@dvkruchinin dvkruchinin requested a review from azhavoro as a code owner August 4, 2020 16:19
@coveralls
Copy link

coveralls commented Aug 4, 2020 •
edited
Loading

Pull Request Test Coverage Report for Build 6866

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.005%) to 68.929%
Totals Coverage Status
Change from base Build 6864: 0.005%
Covered Lines: 11127
Relevant Lines: 15658
💛 - Coveralls

@azhavoro
Copy link
Contributor

azhavoro commented Aug 5, 2020

@dvkruchinin What is the licence of the cars.jpg file?

@dvkruchinin
Copy link
Contributor Author

@dvkruchinin What is the licence of the cars.jpg file?

This image is freely available on the Internet. I didn't find any mention of a license.

@nmanovic
Copy link
Contributor

nmanovic commented Aug 5, 2020

@dvkruchinin What is the licence of the cars.jpg file?

This image is freely available on the Internet. I didn't find any mention of a license.

@dvkruchinin , it is not acceptable. You can use any image which you can find in our repo.

@dvkruchinin
Copy link
Contributor Author

@dvkruchinin What is the licence of the cars.jpg file?

This image is freely available on the Internet. I didn't find any mention of a license.

@dvkruchinin , it is not acceptable. You can use any image which you can find in our repo.

Done. Replaced the image.

@nmanovic
Copy link
Contributor

nmanovic commented Aug 5, 2020

@dvkruchinin , can we generate an image on the fly? Do we need the actual content of the image?

@dvkruchinin
Copy link
Contributor Author

@dvkruchinin , can we generate an image on the fly? Do we need the actual content of the image?
can we generate an image on the fly? - it is for investigation. It is not clear what is meant by image generation. Alternatively, I can add several images to the directory and use them if necessary.
Do we need the actual content of the image? - in this moment no. Current tasks do not require the actual content.

@nmanovic
Copy link
Contributor

nmanovic commented Aug 5, 2020

@dvkruchinin , in this case I will ask to generate the content. It will allow us to create tasks with any number of images.

@dvkruchinin
Copy link
Contributor Author

@dvkruchinin , in this case I will ask to generate the content. It will allow us to create tasks with any number of images.

This will take longer than planned. I suggest that solve this in a separate task and create a separate PR.

@dvkruchinin
Copy link
Contributor Author

I think it would be better to remove the annotation task creation functionality from this PR. I have an idea to rework this functionality in the form of a Cypress command that can be called in tests for which need to create an annotation task.

@nmanovic
Copy link
Contributor

nmanovic commented Aug 5, 2020

@dvkruchinin , in this case I will ask to generate the content. It will allow us to create tasks with any number of images.

This will take longer than planned. I suggest that solve this in a separate task and create a separate PR.

It is fine. Let's re-estimate the task.

@nmanovic
Copy link
Contributor

nmanovic commented Aug 5, 2020

I think it would be better to remove the annotation task creation functionality from this PR. I have an idea to rework this functionality in the form of a Cypress command that can be called in tests for which need to create an annotation task.

I believe it is a good idea. Let's discuss a plan for the PR offline.

@dvkruchinin dvkruchinin force-pushed the dkru/preparation_for_testing branch from c41be92 to 626ee01 Compare August 7, 2020 10:15
@nmanovic nmanovic requested a review from bsekachev August 7, 2020 18:35
bsekachev
bsekachev reviewed Aug 10, 2020
View reviewed changes
tests/cypress/integration/auth_page.js Outdated Show resolved Hide resolved
tests/cypress/integration/auth_page.js Outdated Show resolved Hide resolved
tests/cypress/integration/issue_1599_ch_user_registration.js Outdated Show resolved Hide resolved
tests/cypress/integration/issue_1599_ch_user_registration.js Outdated Show resolved Hide resolved
tests/cypress/integration/issue_1599_ch_user_registration.js Outdated Show resolved Hide resolved
tests/cypress/integration/issue_1599_pl_user_registration.js Show resolved Hide resolved
tests/cypress/plugins/imageGenerator/addPlugin.js Outdated Show resolved Hide resolved
tests/cypress/plugins/imageGenerator/index.d.ts Outdated Show resolved Hide resolved
tests/cypress/plugins/index.js Outdated Show resolved Hide resolved
tests/cypress/plugins/imageGenerator/addPlugin.js Outdated Show resolved Hide resolved
Dmitry Kruchinin added 8 commits August 11, 2020 04:28
Automate test preparation(mandatory operations for each test cases)
e3714e7 
- Add test for creating an annotation task.
- Add automate for creating superuser.
Add tests for issue 1599.
c12921a
Run Cypress from Travis CI.
9054c35 
Remove Cypress installation command from Dockerfile.ci
Remove the unnecessary docker-compose.ci.yml
Replase image for creation an annotation task.
73edebb 
Change name of imsge in the Cypress test create_new_task.js
Temporarily deleting the annotation task creation functionality
bcefaaa
Image generarion functionality
e1fd1cc 
Add Cypress module for auto generation images
Add package files.
Add custome commands for create an annotation task and a shape.
5e4f3f0
Applying comments.
b7d1da1
@dvkruchinin dvkruchinin force-pushed the dkru/preparation_for_testing branch from ddc1325 to b7d1da1 Compare August 11, 2020 03:48
bsekachev
bsekachev previously approved these changes Aug 11, 2020
View reviewed changes
@bsekachev bsekachev merged commit ca4b320 into cvat-ai:develop Aug 11, 2020
@dvkruchinin dvkruchinin deleted the dkru/preparation_for_testing branch August 19, 2020 11:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bsekachev bsekachev bsekachev approved these changes

@azhavoro azhavoro Awaiting requested review from azhavoro azhavoro is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dvkruchinin @coveralls @azhavoro @nmanovic @bsekachev