Navigation Menu

Skip to content

Commit

Permalink
Add pylint to dev packages, modify exporter test case setup
Browse files Browse the repository at this point in the history
  • Loading branch information
rstorey committed Nov 7, 2018
1 parent 4bc9e35 commit 64d4c60
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 33 deletions.
1 change: 1 addition & 0 deletions Pipfile
Expand Up @@ -48,6 +48,7 @@ django-debug-toolbar = "*"
"flake8" = "*"
coverage = "*"
pre-commit = "*"
pylint = "*"

[requires]
python_version = "3.6"
Expand Down
73 changes: 64 additions & 9 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions concordia/tests/utils.py
Expand Up @@ -104,11 +104,6 @@ def create_asset(
return asset


def clean_up():
campaign = Campaign.objects.get(title="Test Campaign")
campaign.delete()


class JSONAssertMixin(object):
def assertValidJSON(self, response, expected_status=200):
"""
Expand Down
22 changes: 5 additions & 17 deletions exporter/tests/test_view.py
Expand Up @@ -11,7 +11,6 @@
create_campaign,
create_item,
create_project,
clean_up,
)

DOWNLOAD_URL = (
Expand All @@ -28,8 +27,11 @@ class ViewTest_Exporter(TestCase):
"""

def setUp(self):
user = User.objects.create(username="tester", email="tester@example.com")
user.set_password("top_secret")
user.save()

self.login_user()
self.assertTrue(self.client.login(username="tester", password="top_secret"))

campaign = create_campaign(published=True)
project = create_project(campaign=campaign, published=True)
Expand All @@ -45,24 +47,10 @@ def setUp(self):
)

# add a Transcription object
transcription1 = Transcription(asset=asset, user=self.user, text="Sample")
transcription1 = Transcription(asset=asset, user=user, text="Sample")
transcription1.full_clean()
transcription1.save()

def tearDown(self):
clean_up()

def login_user(self):
"""
Create a user and log the user in
"""

self.user = User.objects.create(username="tester", email="tester@example.com")
self.user.set_password("top_secret")
self.user.save()

self.assertTrue(self.client.login(username="tester", password="top_secret"))

def test_csv_export(self):
"""
Test GET route /campaigns/exportCSV/<slug-value>/ (campaign)
Expand Down
4 changes: 2 additions & 2 deletions exporter/views.py
Expand Up @@ -43,7 +43,6 @@ def get_original_asset_id(download_url):
class ExportCampaignToCSV(TemplateView):
"""
Exports the most recent transcription for each asset in a campaign
"""

@method_decorator(login_required)
Expand Down Expand Up @@ -87,7 +86,6 @@ class ExportCampaignToBagit(TemplateView):
Executes bagit.py to turn temp directory into bagit strucutre.
Builds and exports bagit structure as zip.
Removes all temporary directories and files.
"""

@method_decorator(login_required)
Expand Down Expand Up @@ -123,6 +121,8 @@ def get(self, request, *args, **kwargs):
response = HttpResponse(zip_file, content_type="application/zip")
response["Content-Disposition"] = "attachment; filename=%s.zip" % campaign_slug

# Upload zip to S3 bucket

# Clean up temp folders & zipfile once exported
shutil.rmtree(export_base_dir)
os.remove("%s.zip" % export_base_dir)
Expand Down

0 comments on commit 64d4c60

Please sign in to comment.