Skip to content
Snippets Groups Projects
Commit 7f27930e authored by Martin Burchell's avatar Martin Burchell
Browse files

Renamed test function

parent 44361e4f
No related branches found
No related tags found
1 merge request!46Tagging frontend
......@@ -7,7 +7,7 @@ from rest_framework import status
from data_layer.models import Item
from .item_create_view_tests import create_item
from .taxonomy_and_term_create_tests import (
create_category,
create_taxonomy,
add_term,
)
from ..views import ItemViewSet
......@@ -15,7 +15,7 @@ from ..views import ItemViewSet
@pytest.fixture
def category():
response = create_category(name="Test Ebola Questions")
response = create_taxonomy(name="Test Ebola Questions")
assert status.is_success(response.status_code), response.data
return response.data
......
......@@ -6,7 +6,7 @@ from rest_framework.test import APIRequestFactory
from rest_framework import status
from .item_create_view_tests import create_item
from .taxonomy_and_term_create_tests import create_category
from .taxonomy_and_term_create_tests import create_taxonomy
from ..views import ItemViewSet
......@@ -39,7 +39,7 @@ def add_free_terms_to_item(item_id, terms):
@pytest.mark.django_db
def test_multiple_new_terms_applied_to_item(item):
taxonomy = create_category(name='test tags',
taxonomy = create_taxonomy(name='test tags',
vocabulary='open',
multiplicity='multiple').data
......
......@@ -7,7 +7,7 @@ from taxonomies.tests.factories import TermFactory
from ..views import ItemViewSet
from .item_create_view_tests import create_item
from .taxonomy_and_term_create_tests import create_category, add_term
from .taxonomy_and_term_create_tests import create_taxonomy, add_term
from .categorize_items_tests import categorize_item
......@@ -62,7 +62,7 @@ def test_filter_by_id_list():
@pytest.mark.django_db
def test_filter_by_term():
taxonomy = create_category(name='taxonomy').data
taxonomy = create_taxonomy(name='taxonomy').data
term = add_term(taxonomy=taxonomy['slug'], name='term').data
items = [create_item(body='item %d' % i).data for i in range(3)]
......@@ -101,7 +101,7 @@ def test_filter_by_multiple_terms():
@pytest.mark.django_db
def test_filter_by_term_works_when_term_name_includes_colon():
taxonomy = create_category(name='taxonomy').data
taxonomy = create_taxonomy(name='taxonomy').data
term = add_term(taxonomy=taxonomy['slug'], name='term:with:colon').data
item = create_item(body='item 1').data
categorize_item(item, term)
......
......@@ -13,7 +13,7 @@ from .categorize_items_tests import (
from .item_create_view_tests import create_item
from .item_list_view_tests import get as list_items
from .taxonomy_and_term_create_tests import (
create_category,
create_taxonomy,
)
......@@ -51,7 +51,7 @@ def test_item_terms_not_affected_by_update():
item = create_item(body='What is the cuse of Ebola?').data
id = item['id']
questions_category = create_category(name="Test Ebola Questions").data
questions_category = create_taxonomy(name="Test Ebola Questions").data
categorize_item(item, term_for(questions_category, 'Vaccine'))
......@@ -72,9 +72,9 @@ def test_item_terms_can_be_updated():
item = create_item(body='What is the cuse of Ebola?').data
id = item['id']
questions_category = create_category(name="Test Ebola Questions").data
regions_category = create_category(name="Test Regions").data
types_category = create_category(name="Test Item Types").data
questions_category = create_taxonomy(name="Test Ebola Questions").data
regions_category = create_taxonomy(name="Test Regions").data
types_category = create_taxonomy(name="Test Item Types").data
categorize_item(item, term_for(questions_category, 'Vaccine'))
categorize_item(item, term_for(regions_category, 'Monrovia'))
......
......@@ -16,7 +16,7 @@ from taxonomies.tests.factories import (
)
def create_category(**kwargs):
def create_taxonomy(**kwargs):
request = APIRequestFactory().put("", kwargs)
view = TaxonomyViewSet.as_view(actions={'put': 'create'})
......@@ -70,7 +70,7 @@ def test_create_a_category():
old_count = count_taxonomies()
assert not taxonomy_exists(category)
response = create_category(name=category)
response = create_taxonomy(name=category)
assert status.is_success(response.status_code), response.data
new_count = count_taxonomies()
......
......@@ -13,7 +13,7 @@ from ..views import TaxonomyViewSet
from .categorize_items_tests import categorize_item
from .item_create_view_tests import create_item
from .taxonomy_and_term_create_tests import (
create_category,
create_taxonomy,
add_term,
)
......@@ -34,12 +34,12 @@ def get_term_itemcount_response(taxonomy_slug, get_params=None):
@pytest.fixture
def questions_category_slug():
return create_category(name="Test Ebola Questions").data['slug']
return create_taxonomy(name="Test Ebola Questions").data['slug']
@pytest.fixture
def regions_category():
return create_category(name="Regions").data
return create_taxonomy(name="Regions").data
@pytest.mark.django_db
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment