Commit Graph

7322 Commits

Author SHA1 Message Date
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
David Ormsbee
86247139a9 Merge pull request #1129 from MITx/valera/require-js
Inclusion of namespaced Require JS
2013-01-03 08:44:30 -08:00
Jay Zoldak
8c4edc459c update testing doc 2013-01-03 11:22:21 -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
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
David Ormsbee
e4dff3f788 Merge pull request #1201 from MITx/feature/rocha/change-courses-layout
Fix broken display of courses in university profile
2012-12-21 13:40:08 -08:00
Carlos Andrés Rocha
1ac41787a7 Fix broken display of courses in university profile 2012-12-21 16:38:17 -05:00
David Ormsbee
bcb5eda222 Merge pull request #1190 from MITx/fix/alex/opendocs_linux
Fix/alex/opendocs linux
2012-12-21 12:24:04 -08:00
David Ormsbee
8532d79ea5 Merge pull request #1198 from MITx/feature/ichuang/update-tracking-log-sql-schema
update schema for tracking sql logs - larger fields; add hostname
2012-12-21 12:23:45 -08:00
David Ormsbee
5171fe6871 Merge pull request #1199 from MITx/fix/zoldak/test-logger-settings
Remove logger setting override from test settings configuration file.
2012-12-21 12:22:47 -08:00
David Ormsbee
241b4eb0fe Merge pull request #1196 from MITx/feature/rocha/change-courses-layout
New Layout for course listings with new course graphical overlay
2012-12-21 12:18:05 -08:00
David Ormsbee
02151d39e8 Merge pull request #1200 from MITx/content/rocha/job-page-update
Add Instructional Designer Job Post
2012-12-21 10:01:55 -08:00
Carlos Andrés Rocha
4959dc6005 Add Instructional Designer Job Post 2012-12-21 11:44:45 -05:00
David Ormsbee
f43c93e1d8 Merge pull request #1189 from MITx/fix/rocha/login-redirect
Fix django auth login redirection
2012-12-21 08:20:18 -08:00
Carlos Andrés Rocha
8ac89c39a7 Use course metadata instead of setting attributes to display new course overlay 2012-12-21 11:12:21 -05:00
Jay Zoldak
3bbfb4851b Remove logger setting override from test settings configuration file. 2012-12-21 10:25:14 -05:00
ichuang
320f1b4141 update schema for tracking sql logs - larger fields; add hostname 2012-12-21 08:44:40 -05:00
Carlos Andrés Rocha
22de7cbb4e Add logic to display courses by start date and show the new overlay 2012-12-20 20:05:11 -05:00
Carlos Andrés Rocha
a0d1d98c92 Merge branch 'style/btalbot/homepage-courselistings' into feature/rocha/change-courses-layout 2012-12-20 17:45:19 -05:00
David Ormsbee
ecc4d79f55 Merge pull request #1193 from MITx/content/rocha/new-courses-2013
Correct some spring courses announcement information
2012-12-20 12:39:32 -08:00
Carlos Andrés Rocha
3a4b626e62 Remove unused code from accounts login page 2012-12-20 14:19:06 -05:00