diff options
| -rw-r--r-- | ishtar_common/tests.py | 71 | 
1 files changed, 47 insertions, 24 deletions
diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index 4597060da..44e1d75b3 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -2414,17 +2414,20 @@ class ImportTest(TestCase):              )          return imprt -    def test_edit_import(self): -        username = "username666" -        password = "dcbqj7xnjkxnjsknx!@%" -        user = User.objects.create_superuser( -            username, "nomail@nomail.com", password +    def create_importer_model(self): +        return models.ImporterModel.objects.create( +            klass="ishtar_common.models.Parcel", name="Parcel"          ) + +    def create_importer_type(self, imp_model): +        return models.ImporterType.objects.create(associated_models=imp_model) + +    def test_edit_import(self): +        username, password, user = create_superuser()          imprt = self.create_import()          c = Client()          c.login(username=username, password=password) -          response = c.get(reverse("edit_import", kwargs={"pk": imprt.pk}))          self.assertEqual(response.status_code, 200)          self.assertContains(response, imprt.importer_type) @@ -2433,21 +2436,15 @@ class ImportTest(TestCase):          self.assertContains(response, imprt.encoding)          self.assertContains(response, imprt.csv_sep) -        imp_model = models.ImporterModel.objects.create( -            klass="ishtar_common.models.Parcel", name="Parcel" -        ) -        importer_type = models.ImporterType.objects.create(associated_models=imp_model) - -        dest = os.path.join(settings.MEDIA_ROOT, "MCC-operations-example.csv") -        shutil.copy( -            settings.ROOT_PATH -            + "../archaeological_operations/tests/MCC-operations-example.csv", -            dest, -        ) +        imp_model = self.create_importer_model() +        importer_type = self.create_importer_type(imp_model)          data = { -            "id_name": "Test Name", -            "id_importer_type": importer_type, +            "name": "Test Name", +            "importer_type": importer_type.pk, +            "encoding": "utf-8", +            "csv_sep": '|', +            "skip_lines": 1,          }          response = c.post(reverse("edit_import", kwargs={"pk": imprt.pk}), data) @@ -2455,12 +2452,38 @@ class ImportTest(TestCase):          response = c.get(reverse("edit_import", kwargs={"pk": imprt.pk}))          self.assertEqual(response.status_code, 200) -        self.assertContains(response, imprt.name) +        self.assertContains(response, "Test Name")          self.assertContains(response, imprt.importer_type) -        self.assertContains(response, imprt.imported_file) -        self.assertContains(response, imprt.imported_images) -        self.assertContains(response, imprt.encoding) -        self.assertContains(response, imprt.csv_sep) +        self.assertContains(response, "utf-8") + +    def test_create_import(self): +        username, password, user = create_superuser() +        c = Client() +        c.login(username=username, password=password) + +        imp_model = self.create_importer_model() +        importer_type = self.create_importer_type(imp_model) + +        data = { +            "name": "Test Name", +            "importer_type": importer_type.pk, +            "encoding": "utf-8", +            "csv_sep": '|', +            "skip_lines": 1, +        } + +        response = c.post(reverse("new_import"), data) +        self.assertEqual(response.status_code, 302) + +        imprt = models.Import.objects.get(name="Test Name") +        response = c.get(reverse("edit_import", kwargs={"pk": imprt.pk})) + +        self.assertEqual(response.status_code, 200) +        self.assertEqual(imprt.name, "Test Name") +        self.assertEqual(imprt.importer_type, importer_type) +        self.assertEqual(imprt.encoding, "utf-8") +        self.assertEqual(imprt.csv_sep, '|') +      def test_archive_import(self):          imprt = self.create_import()  | 
