From a3404df407d27e69e6a881309fede9caf62f3aea Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Fri, 30 Oct 2020 12:08:44 +0300 Subject: [PATCH] Fixed cvat-core tests --- cvat-core/tests/mocks/dummy-data.mock.js | 36 ++++++++++++++++++---- cvat-core/tests/mocks/server-proxy.mock.js | 13 +++++--- 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/cvat-core/tests/mocks/dummy-data.mock.js b/cvat-core/tests/mocks/dummy-data.mock.js index 8b3b5d5a..efbc16e4 100644 --- a/cvat-core/tests/mocks/dummy-data.mock.js +++ b/cvat-core/tests/mocks/dummy-data.mock.js @@ -154,7 +154,11 @@ const tasksDummyData = { name: 'Test', size: 1, mode: 'annotation', - owner: 1, + owner: { + url: 'http://localhost:7000/api/v1/users/1', + id: 1, + username: 'admin', + }, assignee: null, bug_tracker: '', created_date: '2019-09-05T11:59:22.987942Z', @@ -194,7 +198,11 @@ const tasksDummyData = { name: 'Image Task', size: 9, mode: 'annotation', - owner: 1, + owner: { + url: 'http://localhost:7000/api/v1/users/1', + id: 1, + username: 'admin', + }, assignee: null, bug_tracker: '', created_date: '2019-06-18T13:05:08.941304+03:00', @@ -239,7 +247,11 @@ const tasksDummyData = { name: 'Video Task', size: 5002, mode: 'interpolation', - owner: 1, + owner: { + url: 'http://localhost:7000/api/v1/users/1', + id: 1, + username: 'admin', + }, assignee: null, bug_tracker: '', created_date: '2019-06-21T16:34:49.199691+03:00', @@ -558,7 +570,11 @@ const tasksDummyData = { name: 'Test Task', size: 5002, mode: 'interpolation', - owner: 2, + owner: { + url: 'http://localhost:7000/api/v1/users/2', + id: 2, + username: 'bsekache', + }, assignee: null, bug_tracker: '', created_date: '2019-05-16T13:08:00.621747+03:00', @@ -767,7 +783,11 @@ const tasksDummyData = { name: 'Video', size: 75, mode: 'interpolation', - owner: 1, + owner: { + url: 'http://localhost:7000/api/v1/users/1', + id: 1, + username: 'admin', + }, assignee: null, bug_tracker: '', created_date: '2019-05-15T11:40:19.487999+03:00', @@ -964,7 +984,11 @@ const tasksDummyData = { name: 'Labels Set', size: 9, mode: 'annotation', - owner: 1, + owner: { + url: 'http://localhost:7000/api/v1/users/1', + id: 1, + username: 'admin', + }, assignee: null, bug_tracker: 'http://bugtracker.com/issue12345', created_date: '2019-05-13T15:35:29.871003+03:00', diff --git a/cvat-core/tests/mocks/server-proxy.mock.js b/cvat-core/tests/mocks/server-proxy.mock.js index 2db07977..983562e4 100644 --- a/cvat-core/tests/mocks/server-proxy.mock.js +++ b/cvat-core/tests/mocks/server-proxy.mock.js @@ -94,8 +94,8 @@ class ServerProxy { const object = tasksDummyData.results.filter((task) => task.id === id)[0]; for (const prop in taskData) { if ( - Object.prototype.hasOwnProperty.call(taskData, prop) && - Object.prototype.hasOwnProperty.call(object, prop) + Object.prototype.hasOwnProperty.call(taskData, prop) + && Object.prototype.hasOwnProperty.call(object, prop) ) { object[prop] = taskData[prop]; } @@ -110,7 +110,10 @@ class ServerProxy { name: taskData.name, size: 5000, mode: 'interpolation', - owner: 2, + owner: { + id: 2, + username: 'bsekache', + }, assignee: null, bug_tracker: taskData.bug_tracker, created_date: '2019-05-16T13:08:00.621747+03:00', @@ -175,8 +178,8 @@ class ServerProxy { for (const prop in jobData) { if ( - Object.prototype.hasOwnProperty.call(jobData, prop) && - Object.prototype.hasOwnProperty.call(object, prop) + Object.prototype.hasOwnProperty.call(jobData, prop) + && Object.prototype.hasOwnProperty.call(object, prop) ) { object[prop] = jobData[prop]; }