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.

Sign up for GitHub

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

Jump to bottom

Fix them blasted tests #4239

Merged
merged 16 commits into from
Aug 18, 2015
Merged

Fix them blasted tests #4239

merged 16 commits into from
Aug 18, 2015

Conversation

rtibbles
Copy link
Member

Tests pass.

Ready to merge. Let's do this so we can rely on our Circle tests.

@jamalex
Copy link
Member

jamalex commented Aug 15, 2015

I very much want to merge this, but am also least qualified to review it. So I won't. But I am excited.

@radinamatic
Copy link
Member

Way to go...!!! 👍

I don't recall seeing a CircleCI green light since..., well ever. 😀

MCGallaspy
MCGallaspy reviewed Aug 17, 2015
View reviewed changes
kalite/control_panel/tests/control_panel.py
@@ -551,60 +557,60 @@ def test_device_log_csv_endpoint(self):
self.assertEqual(len(rows), 2, "API response incorrect")


class CSVExportBrowserTests(CSVExportTestSetup, BrowserActionMixins, CreateAdminMixin, KALiteBrowserTestCase):
# class CSVExportBrowserTests(CSVExportTestSetup, BrowserActionMixins, CreateAdminMixin, KALiteBrowserTestCase):

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

@MCGallaspy
Copy link
Contributor

I'm happy to resolve the conflict and merge this when you're done, FYI.

@rtibbles
Merge branch 'develop' into fix_them_blasted_tests
9c22425 
Conflicts:
	kalite/control_panel/static/js/control_panel/data_export/views.js
@rtibbles rtibbles mentioned this pull request Aug 18, 2015
Closed
@rtibbles
Copy link
Member Author

This should now be ready to merge, assuming that tests pass.

@rtibbles
Copy link
Member Author

Tests pass. Merging.

rtibbles added a commit that referenced this pull request Aug 18, 2015
@rtibbles
Merge pull request #4239 from rtibbles/fix_them_blasted_tests
8ebf587 
Fix them blasted tests
@rtibbles rtibbles merged commit 8ebf587 into learningequality:develop Aug 18, 2015
@rtibbles rtibbles removed the has PR label Aug 18, 2015
@rtibbles rtibbles deleted the fix_them_blasted_tests branch March 2, 2016 16:26
@benjaoming benjaoming mentioned this pull request Apr 6, 2017
Closed
2 tasks
benjaoming pushed a commit to benjaoming/ka-lite that referenced this pull request Apr 6, 2017
Remove stale code from learningequality#4239
5eafb67
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@benjaoming benjaoming benjaoming left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@rtibbles @jamalex @radinamatic @MCGallaspy @benjaoming