Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,508 Commits 1 Branch 0 Tags
cf2b1e0595d06d7e1b6fefb0d5dc1d031306966b
Commit Graph

15508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chrisndodge
cf2b1e0595 Merge pull request #372 from edx/fix/cdodge/update-localdev-setting-for-unsafe-courses 
Fix/cdodge/update localdev setting for unsafe courses
 2013-07-11 13:01:45 -07:00
Jonah Stanley
50ea165a8e Merge pull request #297 from edx/jonahstanley/refactor-unittest-courses 
Jonahstanley/refactor unittest courses
 2013-07-11 12:44:05 -07:00
JonahStanley
5d300bf36f Fixed the broken unit tests from deleting full 2013-07-11 14:34:41 -04:00
Chris Dodge
fbe2cde6e5 add simple unit test on the defaulting of the settings 2013-07-11 14:31:53 -04:00
David Ormsbee
be3d11449b Merge pull request #320 from edx/dave/ie8_csrf_fix 
Remove use of keyword "delete" in forum coffee code to fix IE8 bug LMS-441
 2013-07-11 09:31:46 -07:00
Jonah Stanley
38cabe91ee Merge pull request #369 from edx/jonahstanley/unskip-acceptance-tests 
Unskip Acceptance Tests
 2013-07-11 09:14:53 -07:00
Chris Dodge
c3ad168b10 also add some defaulting to the querying of the settings where it defaults to an empty set 2013-07-11 12:12:42 -04:00
JonahStanley
4e015eacf5 Fixed the whitelist test to not use full course 2013-07-11 12:05:18 -04:00
Chris Dodge
b39edd821c seems like we need to define COURSES_WITH_UNSAFE_CODE in cms.envs.common.py, although cms.envs.common.py imports lms.envs.common (where this is defined). 2013-07-11 12:05:07 -04:00
JonahStanley
24ab36c87a Unskip Acceptance Tests 2013-07-11 11:33:40 -04:00
John Jarvis
67f8d48840 Merge pull request #367 from edx/jarv/gce-email-backend 
adding option for file based backend
 2013-07-11 08:02:47 -07:00
JonahStanley
d2632227de Fixed all but one test 2013-07-11 10:55:00 -04:00
David Baumgold
11fa458692 Merge pull request #368 from edx/db/fix-course-team-add-user 
Fix course team JS to handle non-200 status codes
 2013-07-11 07:17:34 -07:00
JonahStanley
676da2d592 Removed set trace 2013-07-11 10:12:10 -04:00
JonahStanley
7b9a725201 Fixed comment relating to full course 2013-07-11 10:12:09 -04:00
JonahStanley
67326cfae8 Fixed xmodule tests to not rely on full 
Also fixed things in the toy course where needed
 2013-07-11 10:12:09 -04:00
JonahStanley
7fb5f505d6 Refactored out full from the lms tests 2013-07-11 10:12:06 -04:00
JonahStanley
982777f547 All cms unit test no longer rely on the full course. 
Factories were used when possible but tests depending on importing or things not manageable by factories used the toy course.  New files were added to include the needed functionality.  Most files are blank or have minimal xml needed to work
 2013-07-11 10:09:05 -04:00
JonahStanley
55e6d1ad67 Asset tests do not rely on the full course 
A blank asset file was also added to toy
 2013-07-11 10:08:47 -04:00
JonahStanley
62f2764728 First half of refactorization. 
This fixes the following tests(T stands for toy, F stands for factory made):
T import_textbook_as_content_element (needed to add a textbook to toy)
F static_tab_reordering
T import polls (needed to add a poll to toy)
T xlint_fails
F delete
T about_overrides (needed to add an about override to toy)
F remove_hide_progress_tab
 2013-07-11 10:08:40 -04:00
JonahStanley
bbf2398bac Fixed test_course_settings to not rely on full course 2013-07-11 10:07:57 -04:00
JonahStanley
456daa9ce5 Deleted Files and annotated tests 2013-07-11 10:07:02 -04:00
David Baumgold
1f7fcaed50 Separate Mako logic and JS logic 2013-07-11 09:39:32 -04:00
David Baumgold
cffa013314 Fix course team JS to handle non-200 status codes 2013-07-11 09:30:50 -04:00
David Ormsbee
aaf3a47538 Remove use of keyword "delete" in forum coffee code to fix IE8 bug LMS-441. 
Change client-side code references from "delete" to "_delete". Some of these
were method names (or would generate method names), which breaks in IE8
because "delete" is a JavaScript reserved keyword. foo["delete"] is ok, but
foo.delete is not. This also makes forums marginally functional in IE8,
though the left-nav still has some display issues.
 2013-07-10 17:54:13 -04:00
Jason Bau
4b59a85dae Merge pull request #336 from edx/fix/jbau/parameterize-s3-upload-bucket-name 
Parameterize aws s3 bucket name for forum uploads
 2013-07-10 14:51:08 -07:00
Jonah Stanley
786f422ffa Merge pull request #298 from edx/jonahstanley/acceptance-tests-unique-database 
Jonahstanley/acceptance tests unique database
 2013-07-10 14:09:28 -07:00
David Baumgold
17f2b7d988 Merge pull request #361 from edx/antoviaque/vagrant-rbenv 
Add support for Vagrant install, and switch from RVM to rbenv
 2013-07-10 13:33:05 -07:00
JonahStanley
a0900f09cc Commented why Acceptance_static is needed 2013-07-10 16:23:26 -04:00
JonahStanley
a896ccfff7 Added in a comment 
This explains why acceptance_static is used
 2013-07-10 16:21:11 -04:00
John Jarvis
5b16fbe369 adding option for file based backend 2013-07-10 16:05:37 -04:00
JonahStanley
4685cacc7b Databases are now cleaned properly 
Acceptance_static is used to prevent collect static from using a seed
test.py had its seed removed due to redundancy
 2013-07-10 15:28:23 -04:00
David Baumgold
cb62797306 Merge pull request #347 from edx/update-sass 
Update SASS and Bourbon, add Neat
 2013-07-10 11:09:11 -07:00
chrisndodge
9824ba43cf Merge pull request #364 from edx/fix/cdodge/change-log-level-on-course-delete 
change log levels on the delete course utility. Otherwise they get filte...
 2013-07-10 10:52:06 -07:00
David Ormsbee
7993d5c1fc Merge pull request #348 from edx/bugfix/ichuang/idasbhoard-track-json 
tracking in idashboard should only log json-serializable objects
 2013-07-10 10:17:30 -07:00
David Baumgold
18474986f3 Removed deprecated mixins from _textbooks.scss 2013-07-10 13:00:07 -04:00
Adam
2af1132894 Merge pull request #350 from edx/fix/adam/less-noise 
move setting changes in tests to override_settings
 2013-07-10 09:48:55 -07:00
dcadams
a5f8607c7e Merge pull request #357 from edx/bugfix/dcadams/enroll_emails 
Fix course url link in enrollment emails.
 2013-07-10 09:47:53 -07:00
Chris Dodge
1b377260cc change log levels on the delete course utility. Otherwise they get filtered out in production environments (min set to WARN level) 2013-07-10 12:34:39 -04:00
Ned Batchelder
3bd590c1f6 Merge pull request #363 from edx/ned/fix-noisy-docs 
Ned/fix noisy docs
 2013-07-10 09:20:43 -07:00
Ned Batchelder
8997ed0322 Suggestions from James: mitx is old-school, as is autogeneration. 2013-07-10 12:19:53 -04:00
Ned Batchelder
55d4d98031 static_template_view.models is gone, remove it from docs. 2013-07-10 11:39:54 -04:00
Ned Batchelder
7f193bcaad We don't need to run sphinx on our tests. 2013-07-10 11:39:22 -04:00
jkarni
d0e5786250 Update CHANGELOG.rst 2013-07-10 11:38:18 -04:00
Ned Batchelder
a3d496a882 Set sys.path properly for docs to build. 
We used to do it this way, I'm not sure why it was changed.
Our settings files add directories to the path, so we need to
do it here so that names will be importable.
 2013-07-10 11:38:00 -04:00
ihoover
bec731207a Merge pull request #362 from edx/ihoover/login_enrollment_refactor 
refactor login and enrollment test cases to use the mongo modulestore
 2013-07-10 08:06:32 -07:00
David Baumgold
64835febe6 vagrant: .bash_profile loads .bashrc 
Otherwise, `vagrant ssh` doesn't load the rbenv shims, because that line is in
the .bashrc file.
 2013-07-10 10:51:32 -04:00
ihoover
5a03d93000 refactor login and enrollment test cases to use the mongo modulestore 
added namee to authors file
 2013-07-10 10:34:14 -04:00
Adam Palay
d056c8a8f2 replace test setting changes with test-specific mock.patch.dicts 2013-07-10 10:18:58 -04:00
Adam
3b662ee063 Merge pull request #358 from edx/fix/adam/file-upload 
fix to problems with uploading files
 2013-07-10 07:07:28 -07:00