Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

3029 Commits

Author SHA1 Message Date
Douglas Hall
6eb2e18469 Merge pull request #12483 from edx/douglashall/SOL-1776/add_studio_acceptance_tests 
SOL-1776 Added Studio settings image upload acceptance tests
 2016-05-18 15:28:55 -04:00
cahrens
a80773f8dc Mark test as flaky. 
SOL-1811
 2016-05-18 14:24:20 -04:00
cahrens
2c7cdbffc1 Mark test as flaky. 
TNL-4590
 2016-05-18 14:17:53 -04:00
Douglas Hall
e2c65c57f1 Added Studio settings image upload acceptance tests 2016-05-18 13:33:25 -04:00
cahrens
fd1d72cc8d Wait for seek to complete before pressing play. 
TNL-4540
 2016-05-18 13:13:20 -04:00
Christina Roberts
16e9f9c6c7 Merge pull request #12500 from edx/christina/tnl-1619 
Can no longer play outside of the start/end time for the clip.
 2016-05-18 11:55:23 -04:00
cahrens
9d28237326 Can no longer play outside of the start/end time for the clip. 
This functionality was removed in PR 7111, but not all impacted
tests were deleted.
 2016-05-17 14:45:24 -04:00
Diana Huang
d38b43cce3 Set self.browser consistently in page objects. 2016-05-17 11:08:22 -04:00
Eric Fischer
0cf3e39c31 Replace bulk email settings with admin config models 
Moves ENABLE_INSTRUCTOR_EMAIL and REQUIRE_COURSE_EMAIL_AUTH from settings files
to admin-accessible configuration models. This allows for the bulk email settings
to be modified without a new AMI deploy. See TNL-4504.

Also updates tests:
    -python tests mock out the new configurations in place of the old settings
    -lettuce test has been moved to bokchoy
        (note that there was some loss of coverage here - the lettuce tests had
        been doing some voodoo to allow for cross-process inspection of emails
        messages being "sent" by the server, from the client! In discussion with
        testeng, this seems outside the realm of a visual acceptance test. So,
        the bokchoy test simply confirm the successful queueing of the message,
        and leaves the validation of sending messages to the relevant unit tests.)
    -bok choy fixture has been added, to replace the settings in acceptance.py
    -lettuce and bok choy databases have been updated to reflect the backend changes

The new default is to have bulk_email disabled, we'll need to call this out in the
next OpenEdx release to ensure administrators enable this feature if needed.
 2016-05-16 11:09:39 -04:00
Renzo Lucioni
a3e1854bf1 Fix a11y tests 2016-05-12 16:40:22 -04:00
AlasdairSwan
bc5daffc96 ECOM-4215 adding setup for new program details page 2016-05-12 16:39:23 -04:00
Ben Patterson
c788a1bed3 Merge pull request #12431 from edx/benp/flaky-tnl-4561 
Flag test as flaky.
 2016-05-11 14:04:17 -04:00
Ben Patterson
e3469160c4 Flag test as flaky. 2016-05-11 13:01:38 -04:00
Brian Jacobel
e8d2a626d4 Merge pull request #12417 from edx/bjacobel/fix-release-2016-05-10-merge-conflicts-with-master 
Fix release 2016 05 10 merge conflicts with master
 2016-05-10 13:03:19 -04:00
Brian Jacobel
d88aad7d79 Merge branch 'release' into bjacobel/fix-release-2016-05-10-merge-conflicts-with-master 2016-05-10 12:15:42 -04:00
AlasdairSwan
9becd565b3 If not certificates remove the container element from the DOM 2016-05-10 11:42:29 -04:00
Christina Roberts
e953044786 Merge pull request #12388 from edx/christina/course-search-cohort-test 
Fix flaky cohort tests
 2016-05-09 15:51:31 -04:00
Ben Patterson
c00355ae51 Fix linting issue. 2016-05-09 13:26:34 -04:00
Chris Rodriguez
96ca09f45c Membership page label additions and fixes 2016-05-09 12:32:46 -04:00
Adam Palay
bfb319db9a add discussion_id to course structure dump command (AN-6696) 
add test case for discussion_id already set in XML
 2016-05-09 11:24:37 -04:00
cahrens
7ff3c4b3fb Verify New Cohort form is rendered. 
TNL-2257
 2016-05-09 11:21:06 -04:00
Ben Patterson
162135736c Merge pull request #12361 from edx/benp/skip-extra-flaky-tests-fedx-88 
Skip tests that are too flaky to be reliable. FEDX-88.
 2016-05-06 12:16:41 -04:00
Ben Patterson
72af8afd67 Skip tests that are too flaky to be reliable. FEDX-88. 2016-05-06 11:27:33 -04:00
Diana Huang
07573c5141 Replace old conditional lettuce test with bok choy version. 2016-05-06 09:38:36 -04:00
sanfordstudent
db52e0334f Merge pull request #12333 from edx/sstudent/MA-2252 
Sstudent/ma 2252
 2016-05-05 12:52:09 -04:00
Sanford Student
d4146e7a1d accordion emits event 2016-05-05 11:48:09 -04:00
Ned Batchelder
16fbad3f56 Add a circle-R to the initial welcome message 2016-05-04 15:13:18 -04:00
Ned Batchelder
1a2ba1a533 Reduce the use of 'Open edX' as a noun 2016-05-02 12:44:28 -04:00
asadiqbal
a4197eded5 WL-399 Course Details List Fields 2016-05-01 20:02:09 -04:00
Ibrahim
f7f281b65b WL-398 Add Course Background Image and Video Thumbnail Image Fields to Studio 2016-04-30 15:25:17 -04:00
Muddasser
c283afccbc Merge pull request #12268 from edx/muddasser/bokchoy/chrome/test_badge_share_modal 
Fixed close button click issue
 2016-04-30 00:42:24 +05:00
Eric Fischer
ea77c3ec42 Hide After Due setting for Timed Exams 
TNL-4366
Changes in studio to allow the hide_after_due setting to be utilized.

Includes:
    -python changes to contentstore, where the data is stored.
    -refactoring of timed-examination-preference-editor.underscore, to add this
        setting and make the editor more accessible.
    -javascript changes to link the new setting to the correct data model.
    -sass updates to fix a11y issues on the editor modal.
    -addition of post-due visibility information to course outline in studio.
    -new tests: python, js, acceptance, and a11y
 2016-04-28 13:27:19 -04:00
Muddasser
048f73be6d Fixed close button click issue 2016-04-28 19:37:37 +05:00
AlasdairSwan
a6da71591a Merge pull request #12221 from edx/alasdair/ECOM-3200-program-card-learner-progress 
Adding program progress bar to program cards
 2016-04-27 15:06:39 -04:00
AlasdairSwan
cdb05c26a6 Adding program progress bar to program cards 2016-04-27 13:46:48 -04:00
Nimisha Asthagiri
036537f174 Merge pull request #12263 from edx/tnl/next-button-fix 
Fix Next Button's 404 error
 2016-04-27 13:18:39 -04:00
Muddasser
d670f8c4da Merge pull request #12257 from edx/muddasser/bokchoy/chrome/test_if_captions_are_draggable 
branch out at assert based on chrome and firefox
 2016-04-27 12:03:55 +05:00
Nimisha Asthagiri
2396cc493d Fix Next Button's 404 error 
MA-2305
 2016-04-26 20:21:08 -04:00
Muddasser
2857e66239 Changed screenshots to incorporate firefox and chrome 2016-04-26 18:11:52 +05:00
Muddasser
99cbf18e96 branch out at assert based on chrome and firefox 2016-04-26 16:20:32 +05:00
Ben Patterson
d0b8f5d4fd Merge pull request #12253 from edx/benp/flaky-condition 
Fix flaky condition related to settings page.
 2016-04-26 05:39:34 -04:00
Ibrahim Ahmed
8b014f2650 Merge pull request #12107 from edx/ibrahimahmed443/WL-309-new-fields-in-studio 
WL-309 Add new text fields to Studio schedule and details settings page
 2016-04-26 14:30:43 +05:00
Ibrahim
720bde1da9 add new text fields to schedule and details settings page 2016-04-25 23:44:13 -04:00
Ben Patterson
6ee3ea68ba Fix flaky condition related to settings page. 2016-04-25 17:32:32 -04:00
Andy Armstrong
fe88402982 Merge branch 'master' into alasdair/fedx-118-pattern-library-styles-with-current-partials 2016-04-25 16:51:25 -04:00
Ben Patterson
9efdda83b1 FEDX-88. Marking test as flaky. 2016-04-25 14:35:34 -04:00
AlasdairSwan
a9971ef2ba FEDX-118 Adding header to test page 2016-04-25 10:56:28 -04:00
Muddasser
216c83197a assertScreenshot for firefox 42 2016-04-24 08:32:34 -04:00
J. Clifford Dyer
001874c42e Update seq_* to edx.ui.lms.sequence.* format 
seq_next, seq_prev, and seq_goto events are all renamed, and maintain
legacy compatibility.

This PR also introduces new EventTransformer framework to shim events
based on name prefix.

MA-2221
 2016-04-22 13:38:41 -04:00
Christine Lytwynec
66e2d06235 Merge pull request #12060 from edx/clytwynec/ac-367 
Clytwynec/ac 367
 2016-04-22 09:49:26 -04:00