Commit Graph

35669 Commits

Author SHA1 Message Date
clrux
650c95f9c3 Merge pull request #11501 from edx/clrux/ac-328-uxpl
AC-328 adding UXPL classnames to headings
2016-03-01 07:23:07 -05:00
Muddasser
724058a5ad Check both url and title for the presence of code 2016-03-01 16:03:25 +05:00
Renzo Lucioni
9de6b9120c Merge pull request #11698 from edx/renzo/speed-up-test-course-listing
Speed up course listing tests
2016-02-29 18:08:38 -05:00
John Eskew
b777530dac Add SharedModuleStoreTestCase.setUpClassAndTestData() context manager
for use when a test class has a setUpTestData() method which uses
variables set up in the setUpClass() method.
Change base teams API test class to use the context manager.
2016-02-29 18:02:57 -05:00
Bill DeRusha
bec6971ae2 Monkey patch django.db.models.options for faster cache expiry 2016-02-29 17:37:17 -05:00
John Eskew
65e26e3ec2 Move user/admin model creation to class level.
Wrap whole test with several publish/unpublish in same bulk_op.
2016-02-29 17:20:08 -05:00
Renzo Lucioni
d54e1cfa67 Merge pull request #11693 from edx/renzo/update-testing-docs
Document use of --disable-migrations flag
2016-02-29 17:14:25 -05:00
Renzo Lucioni
447eb4c2a7 Speed up course listing tests
This test was creating 500 courses in about 2.5 minutes. Creating 10 courses instead allows the test to execute in 7 seconds.
2016-02-29 17:04:52 -05:00
Kevin Falcone
447c189d9e Merge pull request #11569 from edx/jibsheet/csmh-extended
Student Module History Extension
2016-02-29 15:56:55 -05:00
Chris Rodriguez
c619e1ec6b Adding UXPL classnames to headings 2016-02-29 15:43:17 -05:00
John Eskew
14ad8cd78f SharedModuleStoreTestCase conversion for speedup. 2016-02-29 14:41:17 -05:00
John Eskew
bd4cc57bad Convert to SharedModuleStoreTestCase 2016-02-29 14:04:24 -05:00
Renzo Lucioni
8637198578 Document use of --disable-migrations flag 2016-02-29 14:00:25 -05:00
Kevin Falcone
b4ac588ce1 Update reset-test-db.sh for bok-choy
This now correctly migrates and dumps files for both databases.

Run lettuce migrations for both databases
2016-02-29 13:59:29 -05:00
Kevin Falcone
6f9a3911e5 Implement a BaseStudentModuleHistory
This abstract class contains most of the fields (aside from the id and
foreign key to StudentModule that the subclasses need to manage).  It
also provides a get_history method that abstracts searching across
multiple backends.

Move router code to openedx/core
We need to use it from cms and lms.
Ensure aws_migrate can be used for migrating both the lms and cms.

Handle queries directed to student_module_history vs default and the
extra queries generated by Django 1.8 (SAVEPOINTS, etc).

Additionally, flag testing classes as multi_db so that Django will
flush the non-default database between unit tests.

Further decouple the foreignkey relation between csm and csmhe

When calling StudentModule().delete() Django will try to delete CSMHE
objects, but naively does so in the database, not by consulting the
database router.

Instead, we disable django cascading deletes and listen for post_delete
signals and clean up CSMHE by hand.

Add feature flags for CSMHE
One to turn it on/off so we can control the deploy.
The other will control whether or not we read from two database tables
or one when searching.

Update tests to explicitly use this get_history method rather than
looking directly into StudentModuleHistory or
StudentModuleHistoryExtended.

Inform lettuce to avoid the coursewarehistoryextended app

Otherwise it fails when it can't find features/ in that app.

Add Pg support, this is not tested automatically.
2016-02-29 13:59:27 -05:00
Calen Pennington
dd90c55602 Create a new CSMHExtended table to hold our new data
This is a clone (copy) of CSMH's declaration and methods with an added
id of UnsignedBigInAutoField

We should be able to delete the save_history code, but needs testing.

Add error logging when capa failures happen

Put StudentModuleHistory into its own database

Bump out the primary key on CSMHE

This gives us a gap to backfill as needed.
Since the new table's pk is an unsigned bigint, even for people who don't
consolidate CSMH into CSMHE, the lost rows are unlikely to matter.

Remove StudentModuleHistory cleaner
2016-02-29 13:58:39 -05:00
Renzo Lucioni
e0407893ff Merge pull request #11603 from edx/usman/migrations-setup
Update migrations setup during Python unit tests
2016-02-29 13:54:30 -05:00
Mushtaq Ali
0b430fc9ff Merge pull request #11681 from edx/mushtaq/TNL-4167-fix-studio-name
Display studio name properly on empty course page.
2016-02-29 22:24:00 +05:00
Ben Patterson
e593edffda Merge pull request #11690 from edx/revert-11644-omar/hide-tos
Revert "Registration: don't require terms of service if checkbox is hidden"
2016-02-29 12:16:15 -05:00
Ben Patterson
9e4f14f1be Revert "Registration: don't require terms of service if checkbox is hidden" 2016-02-29 12:08:09 -05:00
Usman Khalid
2586f09d7a Add option to disable migrations when running tests
By default, migrations are applied as they always have been. Exporting DISABLE_MIGRATIONS=1 or passing --disable-migrations to Paver commands will create tables directly from apps' models.
2016-02-29 11:47:32 -05:00
Adam
62ccef69cc Merge pull request #11685 from edx/hotfix/2016-02-29
Revert "Pass DOM element, not jQuery object to XBlock initialisation."
2016-02-29 11:16:06 -05:00
Omar Khan
23a0a6d41a Merge pull request #11644 from open-craft/omar/hide-tos
Registration: don't require terms of service if checkbox is hidden
2016-02-29 23:15:56 +07:00
Muddasser
bc2914eef4 Merge pull request #11655 from edx/muddasser-chrome-bokchoy-test_can_add_remove_allowance
Test should wait for ajax calls to finish before checking the changes
2016-02-29 18:46:08 +05:00
Braden MacDonald
76e66ff30f Revert "Pass DOM element, not jQuery object to XBlock initialisation." 2016-02-29 08:39:19 -05:00
Mushtaq Ali
3dc73c655b Display studio name properly on empty course page. 2016-02-29 17:11:55 +05:00
Ayub-khan
4b81f0bb3c Fix progress exception for credit courses and add unit test. 2016-02-29 15:42:20 +05:00
Qubad786
55ab52ea9f Configure code jail for cms 2016-02-29 15:22:52 +05:00
Awais Jibran
03585a4842 Merge pull request #11657 from edx/aj/ECOM3688-add-log-in-cert-gen
Improve logging in certification generation
2016-02-29 14:47:34 +05:00
raeeschachar
f09e9f020c Merge pull request #11672 from edx/raees/chrome-bokchoy-test-cancelling-redirects
Fixed test_cancelling_redirects failing on Chrome
2016-02-29 11:28:25 +05:00
Douglas Hall
58e1047a3e Incremented edx-proctoring version for 0.12.12 release 2016-02-27 16:53:42 -05:00
Ben Patterson
18e1aaa320 Ensuring page is loaded belongs in the page object.
TNL-4151 had previously been fixed to avoid a flaky condition; however,
that only passed the flaky condition to a later point in the
test. The proper fix is to ensure the page has loaded. Putting the
definition in this method will mean that the page will wait
to load with other functions, such as `DashboardPage.visit()`.
2016-02-27 12:37:20 -05:00
Ben Patterson
953014cfb2 Merge pull request #11604 from edx/benp/lettuce-browser
Dev user should be able to specify LETTUCE_BROWSER.
2016-02-27 09:14:11 -05:00
Ned Batchelder
a7a1affb6d Merge pull request #11676 from edx/jibsheet/facebook_url_noop_migration
Noop the 0008 and conditional the 0009 migration
2016-02-26 19:47:18 -05:00
Carol Tong
049fbb18fd Merge pull request #11668 from edx/carol/DOC-2703
DOC-2703: replace instances of “courseware” in Advanced Settings help
2016-02-26 17:33:33 -05:00
David Ormsbee
2e422b2caf Merge pull request #11492 from edx/ormsbee/inline_capa
Move rendering of capa problems inline
2016-02-26 17:23:51 -05:00
Kevin Falcone
7a129b0e9f Noop the 0008 and conditional the 0009 migration
We removed a column in the same release that we removed it
from the model.  This creates a gap where the code still looks for
a column which has been dropped until the new code has been deployed.

The initial fix was to put the column back, but that creates a window
during the alterations where views will error.

This noops the 0008 migration and effectively noops 0009 unless you've
run the old migration.
2016-02-26 17:14:12 -05:00
David Ormsbee
13682e4694 Cache edxmako request context computation.
When capa problem rendering was moved to happen inline on courseware
page loads, we started executing many more Mako templates on sequences
with large numbers of thse problems. To help offset this, we're caching
the context generation (it showed up as the easiest piece of low
hanging fruit on profiles of the courseware index page).

[PERF-261]
2016-02-26 16:15:07 -05:00
David Ormsbee
9984bbc29a Make Capa problems do initial load without AJAX.
Before this commit, calling the student_view on a capa problem would
cause it to render an empty placeholder <div>, wait for the
DOMContentLoaded event to be fired, and then make AJAX requests to the
the problem_get handlers to retrieve the HTML it needed to render the
actual problems. This can significantly increase the end user load
times for pages, particularly when there are many problems in a
vertical.

This commit takes a very conservative approach and has the server side
add the rendered HTML into a new data-content attribute on the <div>
enclosing the problem. When Capa's JS initialization runs, it grabs
from that data-content attribute rather than reaching over the network
for an AJAX request.

I had attempted to make it somewhat smarter and push the rendered
problem straight into the document instead of relying on the
data-content attribute. This was faster, and should be our long term
goal. However, it caused odd bugs, particularly around MathJAX
rendering, and I never quite tracked the issue down. I'm still going
forward with these changes because it's significantly better than the
current situation that students have to deal with, and we can make the
JS more performant in a future iteration.

[PERF-261]
2016-02-26 16:15:07 -05:00
Carol Tong
cc0c577884 Replace instances of courseware in Advanced Settings help with "course" 2016-02-26 15:20:29 -05:00
Matt Drayer
890d1bfd66 Merge pull request #11505 from eduNEXT/fmo/condition_microsite_enable_pre
Use has_configuration_set() during microsite initialization
2016-02-26 14:26:26 -05:00
Braden MacDonald
daadc1e4bc Merge pull request #11674 from edx/revert-11433-smarnach/studio-add-xblock
Revert "Pass DOM element, not jQuery object to XBlock initialisation."
2016-02-26 10:17:15 -08:00
Eric Fischer
9d0ce13884 Merge pull request #11667 from edx/efischer/ora_release
Weekly ORA release
2016-02-26 12:16:44 -05:00
Felipe Montoya
2c7ddb1d15 Delegating the conditional to the has_configuration_Set method, which is overriden by the database backend, so the enable_pre_startup works well for both backends.
Adding tests

Fix quality issues
2016-02-26 12:11:44 -05:00
Braden MacDonald
cfa7cd3d87 Revert "Pass DOM element, not jQuery object to XBlock initialisation." 2016-02-26 09:06:13 -08:00
Nimisha Asthagiri
e5108dc7c6 Merge pull request #11673 from edx/mobile/undo_facebook_url_removal
Course Overview migrations fix: Readd the Facebook URL field
2016-02-26 11:49:54 -05:00
Eric Fischer
78c879341f Weekly ORA release
Now installing without `-e`, and moving to a fully released 1.0.0 version
Also includes updating edx-submissions to a 1.0.0 release.
2016-02-26 11:19:50 -05:00
raeeschachar
b4cbc66d96 Fixed test_cancelling_redirects failing on Chrome 2016-02-26 21:12:32 +05:00
Nimisha Asthagiri
33e47d317b Course Overview migrations fix: Readd the Facebook URL field. 2016-02-26 10:20:36 -05:00
Ben Patterson
34e41449c7 Clean up based on feedback. 2016-02-26 09:26:04 -05:00