Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
radiac committed Jul 4, 2020
1 parent 516787d commit 96aa1e0
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions tests/test_models_capitalised.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ class CapitalisedModelTest(TagTestManager, TestCase):

def setUpExtra(self):
self.test_model = test_models.CapitalisedTest
self.single_tag_model = test_models.CapitalisedTest.title.tag_model
self.single_tag_field = test_models.CapitalisedTest.title
self.single_tag_model = test_models.CapitalisedTest.singletag.tag_model
self.single_tag_field = test_models.CapitalisedTest.singletag
self.tag_model = test_models.CapitalisedTest.tags.tag_model
self.tag_field = test_models.CapitalisedTest.tags

Expand All @@ -31,7 +31,7 @@ def test_table_name_capitalised(self):
)
self.assertEqual(
self.single_tag_model._meta.db_table,
"tagulousTestsApp3_tagulous_capitalisedtest_title",
"tagulousTestsApp3_tagulous_capitalisedtest_singletag",
)
self.assertEqual(
self.tag_model._meta.db_table,
Expand All @@ -40,7 +40,7 @@ def test_table_name_capitalised(self):

def test_tag_basics(self):
"Check a tag string can be set and get"
t1 = self.model.objects.create(
t1 = self.test_model.objects.create(
name="Test 1", singletag="single1", tags="tag1, tag2"
)
self.assertInstanceEqual(
Expand All @@ -50,13 +50,18 @@ def test_tag_basics(self):
def test_weight(self):
"Test weight()"
# Copy of test_models_tagmodel.TagModelQuerySetTest.test_weight_scale_up
self.o1 = self.model.objects.create(
self.o1 = self.test_model.objects.create(
name="Test 1", singletag="single1", tags="David, Eric"
)
self.o2 = self.model.objects.create(
self.o2 = self.test_model.objects.create(
name="Test 2", singletag="single1", tags="Eric, Frank"
)

# Mimic initial from TagFieldOptionsModel
self.tag_model.objects.create(name="Adam")
self.tag_model.objects.create(name="Brian")
self.tag_model.objects.create(name="Chris")

# Scale them to 2+2n: 0=2, 1=4, 2=6
weighted = self.tag_model.objects.weight(min=2, max=6)
self.assertEqual(len(weighted), 6)
Expand Down

0 comments on commit 96aa1e0

Please sign in to comment.