Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Django 1.9 support WIP #189

Merged
merged 3 commits into from
Jan 10, 2016
Merged

Conversation

mmoravcik
Copy link
Contributor

DO NOT MERGE YET

This is WIP

Waiting for model mommy authors to submit fix for 1.9:
berinhard/model_mommy#262

Also, django-bootstrap3-datetimepicker, pointing to specific commit for now, so we need to keep an eye on the actual release:
nkunihiko/django-bootstrap3-datetimepicker#35

UPDATE:
model mommy updated, 1 test is failing though https://travis-ci.org/DjangoGirls/djangogirls/builds/95775351

@olasitarska
Copy link
Member

@MarysiaLowas this test is failing on the last line:

def test_unassigning_job_reviewer_from_under_review_post(self):
        unassign_reviewer_url = reverse(
            'admin:unassign_job_reviewer',
            args=[self.job_under_review.id]
        )
        response = self.client.get(unassign_reviewer_url, follow=True)
        self.assertEqual(response.status_code, 200)
        self.assertIn("Open", str(response.content))
        self.assertIn("None", str(response.content))

Do you remember what was that last line testing? I think Django changed the default option in the select from "None" to --- in Django 1.9, but I'm not exactly sure if this is causing it.

We could also just remove this line from the test, but I'm not exactly sure what's the purpose of it :)

Thanks!

@MarysiaLowas
Copy link
Contributor

@olasitarska, the 'unassign' action should clear the reviewer field by setting the reviewer to 'None' and this is what is shown in the admin. So the last line was supposed to test that. Probably not the best way to do that... ;)

@olasitarska
Copy link
Member

Ok, I'm reviewing this now.. Will fix this failing test! :)

@olasitarska olasitarska self-assigned this Jan 10, 2016
@olasitarska olasitarska merged commit 06cee5c into DjangoGirls:master Jan 10, 2016
@olasitarska
Copy link
Member

@MarysiaLowas if you're wondering how I fixed that test: 4323fcc :)

Thanks @mmoravcik! ✋

@MarysiaLowas
Copy link
Contributor

Thanks @olasitarska 💓

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants