Commit Graph

22621 Commits

Author SHA1 Message Date
Chris Dodge
0743adb1cd update grade download csv content 2013-01-03 12:58:59 -05:00
Calen Pennington
8874d9d7f8 Add a draft implementation of the Poll module for Justice 2013-01-03 12:21:13 -05:00
David Ormsbee
2daddff2ef Merge pull request #1217 from MITx/feature/zoldak/lms-acceptance-testing
Merge the lettuce acceptance test framework to master
2013-01-03 09:06:47 -08:00
Chris Dodge
e70db062b2 Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge
Conflicts:
	requirements.txt
2013-01-03 10:46:24 -05:00
Chris Dodge
7229a9cdaf perform a new merge from master, resolve conflicts 2013-01-03 10:43:03 -05:00
Brian Wilson
c76f37050a introduce form to template 2013-01-03 03:22:37 -05:00
valera-rozuvan
233a35e01e Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
7a8d83a17f Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
c5cd67a6a5 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
f2cce07bd7 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
37c7967e8c Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
213ca3fa32 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
fd0ec0ed8a Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
de63541049 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
d0c72ebe16 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
8af93229d3 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
7cf848db9e Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
c4f336d8fd Added RequireJS.js to the files.json config so that is it also loaded when testing with Jasmine. 2013-01-03 10:14:06 +02:00
valera-rozuvan
8f120f1d27 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
c94530cb01 Added initial RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
62271fe5c6 Added namespaced RequireJS. 2013-01-03 10:14:06 +02:00
Brian Wilson
4abd9cd3d4 get closer to working again 2013-01-02 18:56:25 -05:00
Diana Huang
c89ff2ac0e Basic peer grading view using mocks and some cleanup in
the peer grading service
2013-01-02 17:44:58 -05:00
Calen Pennington
0bed19648e Remove filename and giturl references 2013-01-02 15:08:27 -05:00
Diana Huang
8737009679 Merge branch 'master' into diana/peer-grading-views 2013-01-02 15:04:18 -05:00
Diana Huang
37f261f906 Move peer grading so that there are the individual problem pages
and the problem list page
2013-01-02 15:01:59 -05:00
Jay Zoldak
56d17d8a8a Improve some comments and names in the acceptance test framework 2013-01-02 10:44:21 -05:00
Jay Zoldak
d5111b9ed9 Get lettuce tests running against test database 2013-01-02 10:44:21 -05:00
Jay Zoldak
ccc8b599f1 Fixed tests to work OK so far. 2013-01-02 10:44:21 -05:00
Jay Zoldak
7e5a67badf Add new partner universities and remove cs50 from smart accordion testing 2013-01-02 10:44:20 -05:00
Jay Zoldak
7f6d55ad86 Create acceptance tests for open ended grading. 2013-01-02 10:44:20 -05:00
Jay Zoldak
6df565e468 Interim work on open-ended grading acceptance testing POC 2013-01-02 10:44:20 -05:00
Jay Zoldak
d65985b445 Use beautiful soup to massage the HTML for easier comparison.
Strip off the data-id tag for HTML diff of courseware

Strip data-id attributes so they are not compared in the HTML
2013-01-02 10:44:20 -05:00
Jay Zoldak
8934f54d6f Save the HTML to a file for each section and comment out debug msgs 2013-01-02 10:44:20 -05:00
Jay Zoldak
5cad5d5fba Add scenarios for all Fall 2012 courses to smart accordion feature. 2013-01-02 10:44:20 -05:00
Jay Zoldak
20cc930312 Bring over acceptance test changes from cms master branch. 2013-01-02 10:44:20 -05:00
Jay Zoldak
af4f1668d7 Stub out the video and capture the html files of the high level tabs for diff comparison
Conflicts:
	lms/templates/video.html
2013-01-02 10:44:20 -05:00
Jay Zoldak
10275e9709 Add item checking within courseware tabs 2013-01-02 10:44:19 -05:00
Jay Zoldak
a40ea202d2 Cleanup of imports in courseware tests 2013-01-02 10:44:19 -05:00
Jay Zoldak
0a77dd4431 Smart accordion walkthrough working for cms-master branch
Conflicts:
	lms/envs/cms/acceptance.py
2013-01-02 10:44:19 -05:00
Jay Zoldak
668bc81d7f New branch for clean lms acceptance tests 2013-01-02 10:44:19 -05:00
David Ormsbee
8bf393fbba Merge pull request #1182 from MITx/bridger/feature/ungraded_course
Visual changes for ungraded courses
2013-01-02 07:19:34 -08:00
Diana Huang
deffa188ff Fix some minor problems and add new key for peer grading. 2013-01-02 09:43:21 -05:00
Calen Pennington
6427dd6742 WIP: Get the cms running. Component previews work 2013-01-02 09:07:02 -05:00
Calen Pennington
344cb133aa Make import/export tests pass 2013-01-02 09:05:49 -05:00
Calen Pennington
2509308ce9 Remove reference to shared_state_key 2013-01-02 09:05:48 -05:00
Calen Pennington
fa75245e8a WIP: Start cleaning up CMS to work with new field format 2013-01-02 09:05:48 -05:00
Diana Huang
652a8eb440 New peer grading view on the lms side 2012-12-28 15:48:06 -05:00
Calen Pennington
84cb0ce99b Move inheritance logic out into a separate file in the modulestore 2012-12-28 14:56:42 -05:00
Calen Pennington
7f8b79694c Grade problems that have ungraded student modules 2012-12-28 14:55:32 -05:00