Merge c33f9e1 into 4899214

docs/source/modules/tcms.management.rst

@@ -14,5 +14,4 @@ Submodules
    tcms.management.admin
    tcms.management.forms
    tcms.management.models
-   tcms.management.views
 

docs/source/modules/tcms.xmlrpc.api.rst

@@ -16,9 +16,6 @@ Submodules
    tcms.xmlrpc.api.build
    tcms.xmlrpc.api.category
    tcms.xmlrpc.api.component
-   tcms.xmlrpc.api.env_group
-   tcms.xmlrpc.api.env_property
-   tcms.xmlrpc.api.env_value
    tcms.xmlrpc.api.plantype
    tcms.xmlrpc.api.priority
    tcms.xmlrpc.api.product

tcms/core/ajax.py

@@ -21,7 +21,6 @@
 from django.contrib.auth.decorators import permission_required
 
 from tcms.management.models import Component, Build, Version
-from tcms.management.models import EnvGroup, EnvProperty, EnvValue
 from tcms.testcases.models import TestCase, Bug
 from tcms.testcases.models import Category
 from tcms.testcases.models import TestCaseTag
@@ -69,21 +68,9 @@ def categories(self):
     def components(self):
         return Component.objects.filter(product__id=self.product_id)
 
-    def env_properties(self):
-        if self.request.GET.get('env_group_id'):
-            return EnvGroup.objects.get(id=self.request.GET['env_group_id']).property.all()
-        return EnvProperty.objects.all()
-
-    def env_values(self):
-        return EnvValue.objects.filter(property_id=self.request.GET.get('env_property_id'))
-
     def versions(self):
         return Version.objects.filter(product__id=self.product_id)
 
-    @staticmethod
-    def env_groups():
-        return EnvGroup.objects.all()
-
 
 def tags(request):
     """

tcms/core/tests/test_ajax.py

@@ -20,11 +20,7 @@
 from tcms.tests.factories import TestPlanFactory
 from tcms.tests.factories import CategoryFactory
 from tcms.tests.factories import ComponentFactory
-from tcms.tests.factories import EnvGroupFactory
-from tcms.tests.factories import EnvPropertyFactory
-from tcms.tests.factories import EnvGroupPropertyMapFactory
 from tcms.tests.factories import ProductFactory
-from tcms.tests.factories import EnvValueFactory
 from tcms.tests.factories import UserFactory
 from tcms.tests.factories import VersionFactory
 from tcms.tests.factories import BuildFactory
@@ -102,16 +98,6 @@ def setUpTestData(cls):
         cls.component_two = ComponentFactory(product=cls.product)
         cls.component_three = ComponentFactory()
 
-        cls.env_group_one = EnvGroupFactory()
-        cls.env_group_two = EnvGroupFactory()
-
-        cls.env_property_one = EnvPropertyFactory()
-        cls.env_property_two = EnvPropertyFactory()
-        EnvGroupPropertyMapFactory(group=cls.env_group_one, property=cls.env_property_one)
-
-        cls.env_value_one = EnvValueFactory(property=cls.env_property_one)
-        cls.env_value_two = EnvValueFactory()
-
         cls.user_one = UserFactory()
         cls.user_two = UserFactory()
 
@@ -152,38 +138,6 @@ def test_components(self):
         self.assertIn(self.component_two, components)
         self.assertNotIn(self.component_three, components)
 
-    def test_env_groups(self):
-
-        env_groups = self.info_objects.env_groups()
-
-        self.assertIn(self.env_group_one, env_groups)
-        self.assertIn(self.env_group_two, env_groups)
-
-    def test_env_properties(self):
-
-        env_properties = self.info_objects.env_properties()
-
-        self.assertIn(self.env_property_one, env_properties)
-        self.assertIn(self.env_property_two, env_properties)
-
-    def test_env_properties_by_env_group(self):
-        self.request.GET = {'env_group_id': self.env_group_one.pk}
-
-        info_objects = _InfoObjects(self.request)
-        env_properties = info_objects.env_properties()
-
-        self.assertIn(self.env_property_one, env_properties)
-        self.assertNotIn(self.env_property_two, env_properties)
-
-    def test_env_values(self):
-        self.request.GET = {'env_property_id': self.env_property_one.pk}
-
-        info_objects = _InfoObjects(self.request)
-        env_values = info_objects.env_values()
-
-        self.assertIn(self.env_value_one, env_values)
-        self.assertNotIn(self.env_value_two, env_values)
-
     def test_users(self):
         self.request.GET = {'username': self.user_one.username}
 

tcms/core/tests/test_views.py

@@ -1,19 +1,15 @@
 # -*- coding: utf-8 -*-
 
-import json
 from http import HTTPStatus
 from urllib.parse import urlencode
 
 from django import test
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
-from django.core import serializers
 from django.urls import reverse
 from django_comments.models import Comment
 
 from tcms.management.models import Priority
-from tcms.management.models import EnvGroup
-from tcms.management.models import EnvProperty
 from tcms.testcases.forms import TestCase
 from tcms.testruns.models import TestCaseRun
 from tcms.tests import BaseCaseRun
@@ -22,9 +18,6 @@
 from tcms.tests import user_should_have_perm
 from tcms.tests.factories import UserFactory
 from tcms.tests.factories import TestPlanFactory
-from tcms.tests.factories import EnvGroupFactory
-from tcms.tests.factories import EnvGroupPropertyMapFactory
-from tcms.tests.factories import EnvPropertyFactory
 
 
 class TestNavigation(test.TestCase):
@@ -193,54 +186,3 @@ def test_update_case_priority(self):
 
         for pk in (self.case_1.pk, self.case_3.pk):
             self.assertEqual('P3', TestCase.objects.get(pk=pk).priority.value)
-
-
-class TestGetObjectInfo(BasePlanCase):
-    """Test case for info view method"""
-
-    @classmethod
-    def setUpTestData(cls):
-        super(TestGetObjectInfo, cls).setUpTestData()
-
-        cls.get_info_url = reverse('ajax-info')
-
-        cls.group_nitrate = EnvGroupFactory(name='nitrate')
-        cls.group_new = EnvGroupFactory(name='NewGroup')
-
-        cls.property_os = EnvPropertyFactory(name='os')
-        cls.property_python = EnvPropertyFactory(name='python')
-        cls.property_django = EnvPropertyFactory(name='django')
-
-        EnvGroupPropertyMapFactory(group=cls.group_nitrate,
-                                   property=cls.property_os)
-        EnvGroupPropertyMapFactory(group=cls.group_nitrate,
-                                   property=cls.property_python)
-        EnvGroupPropertyMapFactory(group=cls.group_new,
-                                   property=cls.property_django)
-
-    def test_get_env_properties(self):
-        response = self.client.get(self.get_info_url, {'info_type': 'env_properties'})
-
-        expected_json = json.loads(
-            serializers.serialize(
-                'json',
-                EnvProperty.objects.all(),
-                fields=('name', 'value')))
-        self.assertJSONEqual(
-            str(response.content, encoding=settings.DEFAULT_CHARSET),
-            expected_json)
-
-    def test_get_env_properties_by_group(self):
-        response = self.client.get(self.get_info_url,
-                                   {'info_type': 'env_properties',
-                                    'env_group_id': self.group_new.pk})
-
-        group = EnvGroup.objects.get(pk=self.group_new.pk)
-        expected_json = json.loads(
-            serializers.serialize(
-                'json',
-                group.property.all(),
-                fields=('name', 'value')))
-        self.assertJSONEqual(
-            str(response.content, encoding=settings.DEFAULT_CHARSET),
-            expected_json)