Merge branch 'master' into master

apitester/runtests/migrations/0008_auto_20181227_1738.py

@@ -0,0 +1,33 @@
+# Generated by Django 2.0.7 on 2018-12-27 16:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('runtests', '0007_auto_20181115_1557'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='profileoperation',
+            name='is_deleted',
+            field=models.IntegerField(default=0, help_text='Deleted', verbose_name='Deleted'),
+        ),
+        migrations.AddField(
+            model_name='profileoperation',
+            name='remark',
+            field=models.CharField(blank=True, help_text='remark', max_length=255, null=True, verbose_name='remark'),
+        ),
+        migrations.AddField(
+            model_name='profileoperation',
+            name='replica_id',
+            field=models.IntegerField(default=1, help_text='Test Replica id', verbose_name='Replica id'),
+        ),
+        migrations.AlterField(
+            model_name='profileoperation',
+            name='order',
+            field=models.IntegerField(default=100, help_text='Test order', verbose_name='Order'),
+        ),
+    ]

apitester/runtests/views.py

@@ -463,4 +463,4 @@ def deleteJsonBody(request):
     profile.is_deleted = 1
     profile.save()
 
-    return JsonResponse({'state': True})
+    return JsonResponse({'state': True})

apitester/test_create_test_configuration.py

@@ -0,0 +1,12 @@
+from django.test import TestCase
+from runtests.models import TestConfiguration
+
+class NewTestConfigurationTestCase(TestCase):
+    '''
+        Create a new (empty) TestConfiguration model.
+    '''
+    def test_create_test_configuration(self):
+        test_config = TestConfiguration(owner_id=1, name='Fred', 
+                                        api_version='3.1.0')
+        test_config.save()
+        return test_config