improved testing

matijakolaric-com · Apr 17, 2021 · 4f5616c · 4f5616c
1 parent 8854488
commit 4f5616c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/music_publisher/tests/dataimport.csv b/music_publisher/tests/dataimport.csv
@@ -1,6 +1,6 @@
-"Work ID","Work Title","ISWC","Original Title","Alt Title 1","Alt Title 2","Alt Title 3","Alt Title 4","Alt Title 5","Library","CD Identifier","Writer 1 Last","Writer 1 First","Writer 1 IPI","Writer 1 PRO","Writer 1 Role","Writer 1 Share","Writer 1 Controlled","Writer 1 SAAN","Writer 2 Last","Writer 2 First","Writer 2 IPI","Writer 2 PRO","Writer 2 Role","Writer 2 Share","Writer 2 Controlled","Writer 2 SAAN","Writer 3 Last","Writer 3 First","Writer 3 IPI","Writer 3 PRO","Writer 3 Role","Writer 3 Share","Writer 3 Controlled","Writer 3 SAAN","Writer 4 Last","Writer 4 First","Writer 4 IPI","Writer 4 PRO","Writer 4 Role","Writer 4 Share","Writer 4 Controlled","Writer 4 SAAN","Writer 5 Last","Writer 5 First","Writer 5 IPI","Writer 5 PRO","Writer 5 Role","Writer 5 Share","Writer 5 Controlled","Writer 5 SAAN","Artist 1 Last","Artist 1 First","Artist 1 ISNI","Artist 2 Last","Artist 2 First","Artist 2 ISNI","Artist 3 Last","Artist 3 First","Artist 3 ISNI","Artist 4 Last","Artist 4 First","Artist 4 ISNI","Artist 5 Last","Artist 5 First","Artist 5 ISNI","Recording 1 ISRC","Recording 2 ISRC"
+"Work ID","Work Title","ISWC","Original Title","Alt Title 1","Alt Title 2","Alt Title 3","Alt Title 4","Alt Title 5","Library","CD Identifier","Writer 1 Last","Writer 1 First","Writer 1 IPI","Writer 1 PRO","Writer 1 Role","Writer 1 Share","Writer 1 Controlled","Writer 1 SAAN","Writer 2 Last","Writer 2 First","Writer 2 IPI","Writer 2 PRO","Writer 2 Role","Writer 2 Share","Writer 2 Controlled","Writer 2 SAAN","Writer 3 Last","Writer 3 First","Writer 3 IPI","Writer 3 PRO","Writer 3 Role","Writer 3 Share","Writer 3 Controlled","Writer 3 SAAN","Writer 4 Last","Writer 4 First","Writer 4 IPI","Writer 4 PRO","Writer 4 Role","Writer 4 Share","Writer 4 Controlled","Writer 4 SAAN","Writer 5 Last","Writer 5 First","Writer 5 IPI","Writer 5 PRO","Writer 5 Role","Writer 5 Share","Writer 5 Controlled","Writer 5 SAAN","Artist 1 Last","Artist 1 First","Artist 1 ISNI","Artist 2 Last","Artist 2 First","Artist 2 ISNI","Artist 3 Last","Artist 3 First","Artist 3 ISNI","Artist 4 Last","Artist 4 First","Artist 4 ISNI","Artist 5 Last","Artist 5 First","Artist 5 ISNI","Recording 1 ISRC","Recording 2 ISRC","Refecence 1 CMO","Reference 1 ID","Reference 1 X", "Writer 1 X","Recording 2 X"
 
-"X123","Simple Original","T-123.456.789-4",,"Simply Original",,,,,"The Cool Music Library","Internet","Smith",,199,"10 – ASCAP","C – Composer","100%","Yes","1L1J4VA",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"JM-K40-14-00002",
+"X123","Simple Original","T-123.456.789-4",,"Simply Original",,,,,"The Cool Music Library","Internet","Smith",,199,"10 – ASCAP","C – Composer","100%","Yes","1L1J4VA",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"JM-K40-14-00002","10-ASCAP","AS123","A","B"
 "X125","Simple Performed",,,,,,,,,,"Smith",,199,"10 – ASCAP","A – Lyricist",0.6667,"General","SANS12","St. James","James",591,"10 – ASCAP","C – Composer","33.33%","No",,,,,,,,,,,,,,,,,,,,,,,,,,"The Band",,,,,,,,,,,,,,,"JM-K40-14-00003","JM-K40-14-00004"
 ,"Unknown Writer",,,,,,,,,,"Smith",,199,"10 – ASCAP","CA – Composer&Lyricist",0.6667,"General","SANS12",,,,,"CA – Composer&Lyricist","23.33%","No",,,,,,"CA",0.1,"False",,,,,,,,,,,,,,,,,,"St. James","James",,,,,,,,,,,,,,"JM-K40-14-00005",
 ,"Co-Publishing",,,,,,,,"The Cool Music Library","Internet","Carr-Toon","Carmen",395,"10 – ASCAP","CA – Composer&Lyricist",50.00%,"Yes","CARMEN","Carr-Toon","Carmen",395,"10 – ASCAP","CA – Composer&Lyricist",50.00%,"No",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"JM-K40-14-00006",

diff --git a/music_publisher/tests/tests.py b/music_publisher/tests/tests.py
@@ -1186,7 +1186,10 @@ def test_data_import_and_royalty_calculations(self):
         url = reverse('admin:music_publisher_dataimport_add')
         response = self.client.get(url)
         data = get_data_from_response(response)
-        data.update({'data_file': mockfile})
+        data.update({
+            'data_file': mockfile,
+            'ignore_unknown_columns': True
+        })
         response = self.client.post(url, data, follow=False)
         self.assertEqual(response.status_code, 302)
         data_import = music_publisher.models.DataImport.objects.first()