Test filtering not filter by name

.gitignore

@@ -115,3 +115,6 @@ static/org.geppetto.frontend
 pygeppetto_server/
 tags
 pygeppetto-django
+static/projects/model.xmi
+static/projects/nml_model.nml
+static/projects/project.json

Makefile

@@ -110,7 +110,7 @@ git-install-hooks:
 	cp service/hooks/* .git/hooks
 
 git-clean-local: git-check-on-dev
-	for b in `git branch --list "feature/*" --merged`; do git branch -d "$$b"; done;
+	for b in `git branch --list "feature_*" --merged`; do git branch -d "$$b"; done;
 
 git-check-on-dev:
 	@git status -b -s | grep "## development...origin/development"

scidash/account/auth.py

@@ -2,6 +2,5 @@
 
 
 class CsrfExemptSessionAuthentication(SessionAuthentication):
-
     def enforce_csrf(self, request):
         return  # To not perform the csrf check previously happening

scidash/sciunitmodels/api/views.py

@@ -22,6 +22,5 @@ class ModelClassViewSet(viewsets.ReadOnlyModelViewSet):
 class ModelInstanceViewSet(viewsets.ModelViewSet):
     queryset = ModelInstance.objects.all()
     serializer_class = ModelInstanceSerializer
-    permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
+    permission_classes = (permissions.IsAuthenticatedOrReadOnly, )
     filter_class = ModelInstanceFilter
-

scidash/sciunitmodels/models.py

@@ -1,4 +1,5 @@
 from __future__ import unicode_literals
+
 from datetime import date
 
 from django.contrib.contenttypes.fields import GenericRelation

scidash/sciunitmodels/serializers.py

@@ -3,10 +3,10 @@
 from rest_framework_cache.registry import cache_registry
 from rest_framework_cache.serializers import CachedSerializerMixin
 
+from scidash.account.serializers import ScidashUserSerializer
 from scidash.general.mixins import GetByKeyOrCreateMixin
 from scidash.general.serializers import TagSerializer
 from scidash.sciunitmodels.models import Capability, ModelClass, ModelInstance
-from scidash.account.serializers import ScidashUserSerializer
 
 
 class CapabilitySerializer(
@@ -43,7 +43,6 @@ class ModelInstanceSerializer(
         default=serializers.CurrentUserDefault(), read_only=True
     )
 
-
     key = 'hash_id'
 
     class Meta:

scidash/sciunittests/filters.py

@@ -14,7 +14,7 @@ class TestInstanceFilter(filters.FilterSet):
     owner = filters.CharFilter(name='owner__username', lookup_expr='icontains')
 
     name = filters.CharFilter(
-        name='test_class__class_name', lookup_expr='icontains'
+        name='name', lookup_expr='icontains'
     )
 
     timestamp_from = filters.IsoDateTimeFilter(

scidash/sciunittests/models.py

@@ -41,7 +41,9 @@ class TestInstance(models.Model):
     name = models.CharField(max_length=200, default='Default Name')
     test_class = models.ForeignKey(TestClass)
     observation = JSONField()
-    test_suites = models.ManyToManyField(TestSuite, related_name='tests', blank=True)
+    test_suites = models.ManyToManyField(
+        TestSuite, related_name='tests', blank=True
+    )
     description = models.TextField(blank=True, null=True)
     owner = models.ForeignKey(general_models.ScidashUser, null=True)
     verbose = models.IntegerField(default=0)

service/hooks/pre-commit

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -e
+
+make lint