From 336ea5ac8b2d922fb54f99edd55d4773dd126934 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Barrois?= <raphael.barrois@polytechnique.org>
Date: Tue, 18 Nov 2014 00:35:19 +0100
Subject: Remove deprecated features.

This disables the ``FACTORY_FOR`` syntax and related parameters,
that should be declared through ``class Meta``.
---
 tests/__init__.py          |  1 -
 tests/test_declarations.py | 15 --------------
 tests/test_deprecation.py  | 49 ----------------------------------------------
 tests/test_using.py        |  2 +-
 4 files changed, 1 insertion(+), 66 deletions(-)
 delete mode 100644 tests/test_deprecation.py

(limited to 'tests')

diff --git a/tests/__init__.py b/tests/__init__.py
index 855beea..5b6fc55 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -4,7 +4,6 @@
 from .test_base import *
 from .test_containers import *
 from .test_declarations import *
-from .test_deprecation import *
 from .test_django import *
 from .test_fuzzy import *
 from .test_helpers import *
diff --git a/tests/test_declarations.py b/tests/test_declarations.py
index 86bc8b5..18a4cd4 100644
--- a/tests/test_declarations.py
+++ b/tests/test_declarations.py
@@ -22,7 +22,6 @@
 
 import datetime
 import itertools
-import warnings
 
 from factory import declarations
 from factory import helpers
@@ -207,20 +206,6 @@ class FactoryWrapperTestCase(unittest.TestCase):
             datetime.date = orig_date
 
 
-class RelatedFactoryTestCase(unittest.TestCase):
-
-    def test_deprecate_name(self):
-        with warnings.catch_warnings(record=True) as w:
-
-            warnings.simplefilter('always')
-            f = declarations.RelatedFactory('datetime.date', name='blah')
-
-            self.assertEqual('blah', f.name)
-            self.assertEqual(1, len(w))
-            self.assertIn('RelatedFactory', str(w[0].message))
-            self.assertIn('factory_related_name', str(w[0].message))
-
-
 class PostGenerationMethodCallTestCase(unittest.TestCase):
     def setUp(self):
         self.obj = mock.MagicMock()
diff --git a/tests/test_deprecation.py b/tests/test_deprecation.py
deleted file mode 100644
index a07cbf3..0000000
--- a/tests/test_deprecation.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2010 Mark Sandstrom
-# Copyright (c) 2011-2013 Raphaël Barrois
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-"""Tests for deprecated features."""
-
-import warnings
-
-import factory
-
-from .compat import mock, unittest
-from . import tools
-
-
-class DeprecationTests(unittest.TestCase):
-    def test_factory_for(self):
-        class Foo(object):
-            pass
-
-        with warnings.catch_warnings(record=True) as w:
-            warnings.simplefilter('always')
-            class FooFactory(factory.Factory):
-                FACTORY_FOR = Foo
-
-            self.assertEqual(1, len(w))
-            warning = w[0]
-            # Message is indeed related to the current file
-            # This is to ensure error messages are readable by end users.
-            self.assertIn(warning.filename, __file__)
-            self.assertIn('FACTORY_FOR', str(warning.message))
-            self.assertIn('model', str(warning.message))
diff --git a/tests/test_using.py b/tests/test_using.py
index 8aba8b6..7318f2e 100644
--- a/tests/test_using.py
+++ b/tests/test_using.py
@@ -1798,7 +1798,7 @@ class PostGenerationTestCase(unittest.TestCase):
                 model = TestObject
             one = 3
             two = 2
-            three = factory.RelatedFactory(TestRelatedObjectFactory, name='obj')
+            three = factory.RelatedFactory(TestRelatedObjectFactory, 'obj')
 
         obj = TestObjectFactory.build()
         # Normal fields
-- 
cgit v1.2.3