Commit Graph

3109 Commits

Author SHA1 Message Date
David Baumgold
a37a50cf3b Merge branch 'release' 2015-03-05 12:10:27 -05:00
Braden MacDonald
2e0beac378 Update some strings to reflect the new behaviour 2015-03-04 13:38:55 -08:00
Braden MacDonald
93e5a56d79 Show a select box when editing a library content block 2015-03-04 13:32:15 -08:00
David Baumgold
a849657358 Mark VideoTimesTest.test_video_end_time_wo_default_start_time as flaky 2015-03-04 16:25:31 -05:00
Ben Patterson
0c0e5163c0 Disable test that's too flaky for our flaky policy. 2015-03-04 14:45:21 -05:00
Zia Fazal
e21ff20375 backend changes based on feedback
Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/instructor_task/api.py

refined entrance exam student attempts reset

Quality improvements 1/16

added rescore, delete state and task history functionality

added unit tests for entrance exam reset attempts

added unit tests for re scoring of entrance exam and task history

improved test coverage

Got rid of pep violation

feedback changes and added jasmine test

added more jasmine tests for Javascript changes

added bok-choy tests for UI changes

replaced input containing <p> tags with <label>

Removed ee element assertions to avoid js error

Added call to super.setUp()

changes based on feedback on 2/18

Writing tests in JS instead of coffee script

commit related to skip entrance exam 2/13

fixed bad-continuation quality error

fixed broken bok-choy test

changes based on feedback on 2/18

added js tests and removed coffee script tests

fixed broken bok-choy and unit tests

changes left while rebasing

rephrase test titles

do not need these libs

changes based on feedback on 2/24

changes text which was left

Changes based on feedback on 3/3
2015-03-04 15:32:56 +05:00
cahrens
167bd05ac8 Add bok choy coverage for correctly displayed name and email address. 2015-03-03 17:16:47 -05:00
Ben Patterson
375a996dc7 Merge pull request #7200 from edx/benp/flaky-SettingsMilestoneTest-bokchoy
Flag test as flaky. SOL-449.
2015-03-03 11:14:10 -05:00
Ben Patterson
bda0c06213 Flag test as flaky. SOL-449. 2015-03-03 08:28:57 -05:00
Ben Patterson
3539bac160 Event-testing pattern should be supported by a mixin. 2015-03-03 08:02:29 -05:00
Waqas Khalid
4b9dc74cad Add tests for rename import error 2015-03-02 16:09:34 +05:00
Jim Abramson
353b8ea45e Merge pull request #5460 from Kelketek/forum-tracking
Do event tracking for major forum events.
2015-02-26 10:14:04 -05:00
Jonathan Piacenti
be02613aac Do event tracking for major forum events. 2015-02-25 23:30:30 +00:00
Christine Lytwynec
8bdd90a5b1 Merge pull request #7037 from edx/clytwynec/flaky_test_decorator
Clytwynec/flaky test decorator
2015-02-25 16:35:01 -05:00
Ben Patterson
c877c604ef Merge pull request #7099 from edx/benp/disable-sol-430
Disable flaky test.
2015-02-25 14:18:33 -05:00
Daniel Friedman
c8434ef9c8 Check access for discussion modules in forums
TNL-650
2015-02-25 11:31:18 -05:00
Ben Patterson
c7042bcc81 Disable flaky test. 2015-02-25 07:14:23 -05:00
Christine Lytwynec
ac03f87442 add flaky decorator to StudioLibraryContainerTest.test_out_of_date_message
Relates to: TE-745
2015-02-24 17:32:30 -05:00
Ben Patterson
954d8ed9a0 Merge pull request #7070 from edx/benp/fix-tnl1479
Wait for DOM to reflect the selected option.
2015-02-24 10:49:47 -05:00
Ben Patterson
8e7c17d50f Wait for DOM to reflect the selected option.
TNL-1479
2015-02-24 08:24:39 -05:00
Zia Fazal
b3f85e1d4a Instructor Dashboard management tools for Entrance Exams
Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/instructor_task/api.py

refined entrance exam student attempts reset
added rescore, delete state and task history functionality
2015-02-23 15:04:05 -05:00
Ben Patterson
d7cbe46994 Flakiness fix for cohort group selection. 2015-02-23 06:28:25 -05:00
Greg Price
84f9d03fc4 Merge pull request #6953 from edx/gprice/registration-endpoint-refactor
Refactor registration endpoint and return field-specific detail in errors
2015-02-20 16:19:10 -05:00
Jesse Zoldak
715d0230b6 skip intemittently failing test TE-745 2015-02-20 13:36:48 -05:00
Greg Price
ad86ef3bd8 Change cohort tests to not use an invalid username 2015-02-20 11:31:53 -05:00
Anton Stupak
ca8bfa84e7 Merge pull request #6941 from edx/anton/fix-flaky-tests
TNL-454: Fix flaky bok-choy tests.
2015-02-20 14:31:42 +02:00
muzaffaryousaf
a31e38416d Adds content group "Delete" and "Usage" functionality to group configurations page on cms.
TNL-1185
2015-02-20 14:56:22 +05:00
polesye
4b551b5357 TNL-454: Fix flaky bok-choy tests. 2015-02-19 14:43:34 +02:00
Sarina Canelake
73c309935b Merge pull request #6679 from open-craft/problem-tooltips
Support for inline explanatory popups in problem XML
2015-02-18 08:37:03 -05:00
Jesse Zoldak
405c92f4f4 Fix flaky library container test TE-745 2015-02-11 12:47:02 -05:00
Ben Patterson
630801c72c An upgrade to verified should emit a mode_changed event.
This change will also move us to bok-choy instead of lettuce for
these scenarios, and re-enable them. See TE-736.

Includes some refactoring of repeated event-checking code as well.
2015-02-10 09:39:22 -05:00
Jesse Zoldak
07e0eee2bd Fix flaky content library test 2015-02-06 14:59:31 -05:00
Braden MacDonald
3fd9fa6415 Support for inline explanatory popups in problem XML 2015-02-05 16:56:02 -08:00
polesye
d02d3b7926 TNL-1299: Update default video. 2015-02-05 10:55:36 +02:00
Akiva Leffert
50730da1b6 Merge branch 'release' 2015-02-04 13:14:29 -05:00
Giulio Gratta
560ce55896 Add cosmetic price field to studio & logic
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
2015-02-03 09:40:00 -08:00
Waheed Ahmed
e868db2e4d Fixed multiple textbooks links to only last uploaded textbook.
TNL-1304
2015-02-03 19:31:28 +05:00
Christine Lytwynec
e90c66431b disable PayAndVerifyTest.test_immediate_verification_enrollment 2015-02-02 10:40:48 -05:00
Ben Patterson
73b6f3f8a0 Introduce another bok-choy shard.
Bok choy will now be broken as follows:
* shard 1
* shard 2
* shard 3
* default shard (i.e. 'none of the above')

We use our shards to break up work and reduce overall test time by leveraging
multiple test systems.
2015-01-30 15:43:35 -05:00
Renzo Lucioni
a8bed5ce98 Make logistration generally available if feature flag is active
Makes logistration available at /login and /register as well as /accounts/login/ and /accounts/register/. In addition:

- Adds support for redirect URLs in third party auth for combined login/registration page
- Adds support for external auth on the combined login/registration page
- Removes old login and registration acceptance tests
- Adds deprecation warnings to old login and register views
- Moves third party auth util to student_account
- Adds exception for microsites (theming)
2015-01-30 13:28:30 -05:00
Renzo Lucioni
e24d4d96ad Merge pull request #6720 from edx/renzo/remove-split-verification-session-flag
Remove old payment and verification flow
2015-01-29 16:57:40 -05:00
Renzo Lucioni
d5fa69ee54 Fix flaky bok-choy tests caused by malformed URL 2015-01-29 11:36:03 -05:00
Renzo Lucioni
80589eab36 Remove old payment and verification flow
Removes old payment and verification endpoints, views, templates, and tests, making the new split flow the default. The SEPARATE_VERIFICATION_FROM_PAYMENT feature flag is also removed.
2015-01-29 10:56:25 -05:00
Jesse Zoldak
663d02dd40 skip flaky test - test_immediate_verification_enrollment
ECOM-1007
2015-01-29 09:08:20 -05:00
Davorin Sego
e09d47b122 Courseware Search integration 2015-01-28 21:34:58 -05:00
Matt Drayer
9d2a0a4e9d Merge pull request #6705 from edx/mattdrayer/update-milestones-hash
Bok Choy test now passes
2015-01-28 17:38:18 -05:00
Matt Drayer
e5f00e626a Bok Choy test now passes 2015-01-28 17:37:49 -05:00
Matt Drayer
ce5c7948fa Added field to FILTERED_LIST plus a new bokchoy test 2015-01-28 13:11:36 -05:00
Waheed Ahmed
4ac7b55757 Fixed transcript skip first line if it contains BOM(Byte Order Mark).
TNL-935
2015-01-28 12:26:16 +05:00
Renzo Lucioni
bcf6461e0b Merge pull request #6769 from edx/renzo/fix-flaky-bok-choy-tests
Fix intermittent failures in bok-choy tests of payment and verification
2015-01-27 13:32:10 -05:00