From d5082013dcb5a16d1c8764dee502cdaf22eb0204 Mon Sep 17 00:00:00 2001
From: EvgenyShashkin <44070548+EvgenyShashkin@users.noreply.github.com>
Date: Thu, 20 Jun 2019 07:50:00 +0200
Subject: [PATCH 1/6] Run tests for REST API

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 722d2e0abed8..64d11c5f2681 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,5 +12,6 @@ before_script:
   - docker-compose -f docker-compose.yml -f docker-compose.ci.yml up --build -d
 
 script:
-  - docker exec -it cvat /bin/bash -c 'tests/node_modules/.bin/karma start tests/karma.conf.js'
+  - docker exec -it cvat /bin/bash -c 'python3 manage.py test --settings cvat.settings.testing cvat/apps/engine && 
+  tests/node_modules/.bin/karma start tests/karma.conf.js'
   

From 2720c0b3a222c2eafa4aac1a51769598b34c6885 Mon Sep 17 00:00:00 2001
From: EvgenyShashkin <44070548+EvgenyShashkin@users.noreply.github.com>
Date: Thu, 20 Jun 2019 07:50:53 +0200
Subject: [PATCH 2/6] Added DJANGO_CONFIGURATION with value "testing"

---
 docker-compose.ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
index b0bcb0f306eb..5fb003805eb6 100644
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.yml
@@ -4,6 +4,7 @@ services:
   cvat:
     build:
       args:
+        DJANGO_CONFIGURATION: "testing"
         WITH_TESTS: "yes"
       network: host
     environment:

From 02b7c861065fd2d5f3cb01b99fe8431f683c7fee Mon Sep 17 00:00:00 2001
From: EvgenyShashkin <44070548+EvgenyShashkin@users.noreply.github.com>
Date: Thu, 20 Jun 2019 07:51:24 +0200
Subject: [PATCH 3/6] Fixed crash of python tests

---
 cvat/requirements/development.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cvat/requirements/development.txt b/cvat/requirements/development.txt
index fea2fb3b0160..8fe07d94fc03 100644
--- a/cvat/requirements/development.txt
+++ b/cvat/requirements/development.txt
@@ -7,7 +7,7 @@ pylint==1.8.3
 pylint-django==0.9.4
 pylint-plugin-utils==0.2.6
 rope==0.11
-six==1.11.0
+six==1.12.0
 wrapt==1.10.11
 django-extensions==2.0.6
 Werkzeug==0.14.1

From 6898addcb4d679750108164fb403cf5a5559ed96 Mon Sep 17 00:00:00 2001
From: EvgenyShashkin <44070548+EvgenyShashkin@users.noreply.github.com>
Date: Thu, 20 Jun 2019 10:09:37 +0300
Subject: [PATCH 4/6] Update .travis.yml

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 64d11c5f2681..3213ef4c54cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,6 @@ before_script:
   - docker-compose -f docker-compose.yml -f docker-compose.ci.yml up --build -d
 
 script:
-  - docker exec -it cvat /bin/bash -c 'python3 manage.py test --settings cvat.settings.testing cvat/apps/engine && 
-  tests/node_modules/.bin/karma start tests/karma.conf.js'
+  - docker exec -it cvat /bin/bash -c 'python3 manage.py test --settings cvat.settings.testing cvat/apps/engine && tests/node_modules/.bin/karma start tests/karma.conf.js'
+
   

From f9960238a6fe5fe85fbcd3b624859e642d793f4e Mon Sep 17 00:00:00 2001
From: EvgenyShashkin <44070548+EvgenyShashkin@users.noreply.github.com>
Date: Wed, 26 Jun 2019 22:18:20 +0200
Subject: [PATCH 5/6] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20d0851ff2eb..a3ee0c827b34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Installation guide
 - Linear interpolation for a single point
 - Video frame filter
+- Running functional tests for REST API during a build
 
 ### Changed
 - Outside and keyframe buttons in the side panel for all interpolation shapes (they were only for boxes before)

From 0fbd58a41e98bee60cfd72bca15e2d7d869e729e Mon Sep 17 00:00:00 2001
From: Nikita Manovich <40690625+nmanovic@users.noreply.github.com>
Date: Mon, 15 Jul 2019 14:06:06 +0300
Subject: [PATCH 6/6] Removed --settings option

---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3213ef4c54cd..2579ffc02dca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,4 @@ before_script:
   - docker-compose -f docker-compose.yml -f docker-compose.ci.yml up --build -d
 
 script:
-  - docker exec -it cvat /bin/bash -c 'python3 manage.py test --settings cvat.settings.testing cvat/apps/engine && tests/node_modules/.bin/karma start tests/karma.conf.js'
-
-  
+  - docker exec -it cvat /bin/bash -c 'python3 manage.py test cvat/apps/engine && tests/node_modules/.bin/karma start tests/karma.conf.js'