fixed links in tests

jasgnft · Jun 7, 2023 · d2333c6 · d2333c6
1 parent 9d06efb
commit d2333c6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/cvat-core/src/frames.ts b/cvat-core/src/frames.ts
@@ -321,7 +321,7 @@ function getFrameMeta(jobID, frame): FramesMetaData['frames'][0] {
     if (mode === 'interpolation' && meta.frames.length === 1) {
         // video tasks have 1 frame info, but image tasks will have many infos
         [frameMeta] = meta.frames;
-    } else if ((mode === 'annotation' || mode === 'interpolation') && meta.frames.length > 1) {
+    } else if (mode === 'annotation' || (mode === 'interpolation' && meta.frames.length > 1)) {
         if (frame > meta.stop_frame) {
             throw new ArgumentError(`Meta information about frame ${frame} can't be received from the server`);
         }

diff --git a/tests/cypress/e2e/actions_organizations/case_113_new_organization_pipeline.js b/tests/cypress/e2e/actions_organizations/case_113_new_organization_pipeline.js
@@ -226,7 +226,8 @@ context('New organization pipeline.', () => {
             cy.assignJobToUser(0, thirdUserName);
             cy.renameTask(taskName, newTaskName);
             cy.url().then((url) => {
-                taskID = Number(url.split('/').slice(-1)[0]);
+                const [link] = url.split('?');
+                taskID = Number(link.split('/').slice(-1)[0]);
             });
             cy.getJobNum(0).then(($jobID) => {
                 jobID = $jobID;

diff --git a/tests/cypress/e2e/actions_tasks2/case_97_export_import_task.js b/tests/cypress/e2e/actions_tasks2/case_97_export_import_task.js
@@ -43,7 +43,8 @@ context('Export, import an annotation task.', { browser: '!firefox' }, () => {
         cy.createZipArchive(directoryToArchive, archivePath);
         cy.createAnnotationTask(taskName, labelName, attrName, textDefaultValue, archiveName);
         cy.openTask(taskName);
-        cy.url().then((link) => {
+        cy.url().then((url) => {
+            const [link] = url.split('?');
             taskId = Number(link.split('/').slice(-1)[0]);
         });
         cy.addNewLabel(newLabelName);
@@ -122,7 +123,8 @@ context('Export, import an annotation task.', { browser: '!firefox' }, () => {
             cy.contains('The task has been restored successfully. Click here to open').should('exist').and('be.visible');
             cy.closeNotification('.ant-notification-notice-info');
             cy.openTask(taskName);
-            cy.url().then((link) => {
+            cy.url().then((url) => {
+                const [link] = url.split('?');
                 expect(Number(link.split('/').slice(-1)[0])).to.be.equal(taskId + 1);
             });
             cy.get('.cvat-constructor-viewer-item').then((labels) => {

diff --git a/tests/cypress/e2e/actions_users/issue_1810_login_logout.js b/tests/cypress/e2e/actions_users/issue_1810_login_logout.js
@@ -36,7 +36,8 @@ context('When clicking on the Logout button, get the user session closed.', () =
             cy.login();
             cy.openTask(taskName);
             // get id task
-            cy.url().then((link) => {
+            cy.url().then((url) => {
+                const [link] = url.split('?');
                 taskId = Number(link.split('/').slice(-1)[0]);
             });
         });