Commit Graph

335 Commits

Author SHA1 Message Date
Carson Gee
eadf3b59e2 Merge pull request #3464 from mitocw/cg/course_image_fixes
Additional logic to handle more course_image URL edge cases
2014-05-13 09:19:07 -04:00
Adam Palay
a51a0c558e fix importing bug (STUD-1599)
add target_location_namespace check
2014-05-12 15:59:41 -04:00
Carson Gee
379745e3a4 Merge pull request #2686 from edx/feature/ichuang/add-reset-links-to-staff-debug
add problem reset link to staff debug page
2014-05-09 13:29:29 -04:00
Carson Gee
7c1e6d83e4 Fix message handling to be more internationalizable 2014-05-09 11:21:39 -04:00
Muhammad Ammar
aa0e8041af Bok-Choy Video Tests Batch6 2014-05-09 07:22:03 +00:00
Carson Gee
b3ec4d1b6b Switching to new dashboard API and adding rescore to actions list 2014-05-08 19:03:14 -04:00
Muhammad Ammar
af6c5efbb3 Bok-Choy video tests batch4 2014-05-08 10:53:08 +00:00
Carson Gee
2998a2e9b7 Code review changes
i18n
2014-05-07 16:16:37 -04:00
Muhammad Ammar
411a13b56c Convert lettuce video tests specifically using youtube stub 2014-05-07 06:11:07 +00:00
cahrens
6f404fe2c5 Test cleanup. 2014-05-05 09:41:38 -04:00
Andy Armstrong
de80f892e2 Clean up coverage and code quality issues 2014-05-02 16:20:17 -04:00
cahrens
ff00fbd1f1 Bok choy acceptance test for drag and drop. 2014-05-02 16:20:17 -04:00
Andy Armstrong
f3a23f3973 Only show drag handles in draft mode 2014-05-02 16:20:12 -04:00
Han Su Kim
8522847676 Merge pull request #3519 from edx/han/json-lint
Small JSON correction
2014-04-29 16:20:22 -04:00
clytwynec
f4ace61579 Merge pull request #3467 from edx/clytwynec/add-auto-auth-page-object-for-lms-tests
Add AutoAuthPage to lms pages for bok-choy tests
2014-04-29 13:07:45 -04:00
Han Su Kim
7f673194fd Correcting JSON 2014-04-29 11:14:14 -04:00
Muhammad Ammar
6f064e2b27 Configure youtube stub for bok-choy 2014-04-25 20:01:09 +00:00
Christine Lytwynec
47d316d1f0 Add AutoAuthPage to lms pages for bok-choy tests 2014-04-24 17:42:36 -04:00
Carson Gee
c4ea338035 Additional logic to handle more course_image URL edge cases
This changes logic to allow more missed use cases of course_image to
work properly.  The cases are:

. XML courses with the course_image attribute set
. Mongo courses that are imported without a contentstore
. Mongo courses that have course_image set but don't have a content store

It also exports default images_static_course.jpg to
images/static_course.jpg to handle a use case where a course author
uploaded an image to the default location in studio without using the
studio interface for adding course images, they then export the course, and then
import it without a contentstore
2014-04-24 16:54:40 -04:00
jsa
f71e78b69f add acceptance tests for user profile pagination.
JIRA: FOR-492
2014-04-24 13:47:03 -04:00
Carson Gee
5775634482 Added jasmine tests and factored out javascript functions to new file 2014-04-23 14:56:32 -04:00
Carson Gee
c7713064d5 Reworked UI for clarity, removed reload, and added Bok-Choy tests 2014-04-23 14:56:31 -04:00
Jay Zoldak
a660cd8539 Set up page objects and base test file for staff view and staff debug. 2014-04-23 14:56:31 -04:00
Jay Zoldak
6e4a451f92 Reword docstrings for bok-choy video tests 2014-04-23 14:37:26 -04:00
Muhammad Ammar
1bbfbedb1f Bok-Choy video tests batch2 2014-04-23 14:37:26 -04:00
Jay Zoldak
7d0297f0df Wait for ajax post after changing language 2014-04-22 14:28:10 -04:00
Jay Zoldak
5e1964dd87 Update bok-choy page definitions 2014-04-18 09:35:10 -04:00
Jay Zoldak
3fc19a35b0 Serve video HTML5 sources locally for acceptance tests 2014-04-15 10:40:53 -04:00
jsa
72c3c87c84 in Studio, render compact placeholders for inline discussions.
JIRA: FOR-429
2014-04-10 15:44:30 -04:00
muhammad-ammar
2318ce18c4 Merge pull request #3217 from edx/ammar/convert-lettuce-video-tests-to-bok-choy
Convert lettuce video tests to bok choy
2014-04-10 21:38:00 +05:00
Muhammad Ammar
5b6f3f8fbf Convert first batch of lettuce video tests to bok-choy. 2014-04-10 15:18:03 +00:00
Andy Armstrong
8059547ed8 Merge pull request #2981 from edx/andya/container-editing
Add "Edit" button to each leaf xblock on the container page
2014-04-10 09:29:32 -04:00
Greg Price
8c8367b055 Merge pull request #3183 from edx/gprice/inline-response-pagination
Add repsonse pagination to inline discussions
2014-04-09 17:55:15 -04:00
Greg Price
16847d85a9 Add bok-choy tests for inline response pagination 2014-04-09 16:56:20 -04:00
Andy Armstrong
88d95d119c Rebuild the way modals are constructed to support nesting. 2014-04-09 10:32:13 -04:00
Will Daly
08413afdfd Allow import of native XBlocks in draft
Added tests for importing a pure XBlock
2014-04-08 07:52:11 -04:00
Jay Zoldak
86cfda32b3 Add synchronization for rendering to studio xblock tests 2014-04-02 13:54:33 -04:00
Jay Zoldak
186e3b8612 Temporarily disable studio acid block tests that are failing 2014-04-02 10:21:05 -04:00
Alexander Kryklia
dfa7c27e77 Add multiple transcripts editor.
Fix donwload subs for non youtube videos and non-en language - continue.
Add acceptance tests.
Add detetion of assets on request.
Updated docstring.
Add fixes and acceptance tests.
Fix acceptance tests.
Update docsrtings and cleanup code, resful for language_id.
Specify exception type in POST.
Fix url in upload module.
Improve exception handling.
Remove 'en' and catching in editable_metadata.
Move descriptor.get_context test to lms tests.
Add query parameter to translation dispatch.
Response to format parameter of translatin GET request.
Fix Acceprance test: Metadata Editor.
move handlers to proper scores.
Split video player into smaller files.
Add ugettext and fix typoes.
Add changelog.
Support for downloading non-ascii filenames.
Change event binding.
Add content-language to download requests.
Reractor POST handler to not update self.transcripts.
2014-03-31 18:49:56 +03:00
Jay Zoldak
65bae9a655 Temporarily disable the bok-choy test that is intermittenly failing 2014-03-28 15:12:46 -04:00
Jay Zoldak
0931c76a2a Disable failing bok-choy test_acid_block_editor test 2014-03-22 09:18:31 -04:00
Jay Zoldak
d88d86120e Merge pull request #3017 from edx/zoldak/bok-choy-version-upgrade
Update edx-platform page objects and tests
2014-03-22 08:32:48 -04:00
Jay Zoldak
bb8800d499 Disable intermittently failing ORA tests 2014-03-22 07:50:44 -04:00
Jay Zoldak
806a6b9f99 Update edx-platform page objects and tests to be compatible with new bok-choy version
Change expectedFailure decorators to skip, because that still takes
a screenshot as if it were an error and at least one of those
take a super long time when running locally on devstack.
2014-03-21 17:10:15 -04:00
Nimisha Asthagiri
e86b4a12dc Changes for viewing built-in tabs in studio
Changed "Status Page" -> "Page".

UX:
    support for displaying built-in tabs
    restored drag and drop on Studio Pages
    additional styling for fixed state on Studio Pages
    add a new page action added to bottom of Studio Pages

Dev
    changes for viewing tabs in studio,
    refactored the tab code,
    decoupled the code from django layer.
    is_hideable flag on tabs
    get_discussion method is needed to continue to support
external_discussion links for now since used by 6.00x course.
    override the __eq__ operator to support comparing with
dict-type tabs.

Test
    moved test code to common,
    added acceptance test for built-in pages
    added additional unit tests for tabs.
    changed test_split_modulestore test to support serializing objects
that are fields in a Course.

Env:
    updated environment configuration settings so they are
    consistent for both cms and lms.
2014-03-21 13:58:01 -04:00
Usman Khalid
c086cbc38d Merge pull request #2816 from edx/usman/lms1192-module-render-exceptions
Catch module render exceptions
2014-03-21 21:12:30 +05:00
zubiar-arbi
00bf5e4fce use unicode strings for slug and regex
STUD-1433
2014-03-21 15:48:29 +05:00
Jay Zoldak
c5a7911b87 Fix pylint disable pragmas that were pep8 violations 2014-03-20 10:18:40 -04:00
Usman Khalid
ae73f3eaa0 Puts module.render() in try statements.
LMS-1192
2014-03-19 19:30:22 +05:00
Don Mitchell
e13d167045 Merge pull request #2918 from edx/dhm/meld_pretty_factory
Dhm/meld pretty factory
2014-03-17 09:44:19 -04:00