Commit Graph

236 Commits

Author SHA1 Message Date
Andy Armstrong
f80b6221d9 Fix duplicate calls to search API
TNL-3198

Also fixed a regression with the search breadcrumbs
where it wasn't possible to navigate back to the
full list.
2015-09-14 13:32:45 -04:00
Bill DeRusha
eec2bed0c7 Add edx-search configuration to lms
remove "defensive code" until we can figure out how to actually
catch the errors,
2015-09-11 13:55:39 -04:00
Diana Huang
f37ffc2f03 Add the course as part of the context for teams events.
TNL-3248
2015-09-10 17:24:54 -04:00
Eric Fischer
17e6453546 Merge pull request #9520 from edx/efischer/teams-instructor-toolbar
Teams Instructor Tools bar
2015-09-10 17:24:39 -04:00
Eric Fischer
65cbab739a Team deleted and learner removed events
Now emitting `edx.team.deleted` event where relevant. Includes tests.
Also includes tests to cover learner_removed events that are fired
as part of the deletion process, as well as learner_removed events
fired from the edit membership view.

Adding these deleted events has brought about a change in the teams
API - the DELETE membership endpoint now takes an optional `admin`
query parameter to differentiate between admin removal and self
removal for analytics purposes.

Also includes some changes needed to get page viewed events working
with admin tools changes made in this PR.
2015-09-10 16:37:04 -04:00
cahrens
3662fbc133 Edit Membership functionality and tests
TNL-1913
2015-09-10 16:36:55 -04:00
Peter Fogg
f8da90e533 Merge pull request #9667 from edx/peter-fogg/join-team-redirect
Fix redirecting to topics page after joining a team.
2015-09-10 12:46:29 -04:00
Peter Fogg
0c3be8e121 Delete Team functionality and tests
TNL-3164 TNL-3163
2015-09-10 12:42:33 -04:00
Peter Fogg
146078e2c6 Fix redirecting to topics page after joining a team.
TNL-3232
2015-09-10 11:55:27 -04:00
Daniel Friedman
3b957a7ee9 Add page viewed events to teams app.
TNL-3188
2015-09-09 23:04:44 -04:00
Peter Fogg
1c910cfbbb Merge pull request #9631 from edx/peter-fogg/teams-ajax-errors
Respond to AJAX errors in Teams UI.
2015-09-09 18:49:39 -04:00
Peter Fogg
95339311b0 Respond to AJAX errors in Teams UI.
TNL-3042
2015-09-09 17:04:23 -04:00
Clinton Blackburn
b5d6b210fd Merge pull request #9681 from edx/release
Release 2015-09-09
2015-09-09 12:38:15 -04:00
Diana Huang
0b78ffdf83 Merge pull request #9632 from edx/diana/teams-changed-event
Add events for tracking when teams are edited.
2015-09-08 15:21:49 -04:00
Bill DeRusha
62ef4b5b8f Add more defensive code around elasticsearch connection 2015-09-08 12:12:05 -04:00
Jesse Zoldak
baa7bbdd94 Flag test as flaky SOL-1183 2015-09-08 10:36:10 -04:00
Diana Huang
8c1bf2cd3a Add events for tracking when teams are edited.
TNL-3190
2015-09-04 15:27:40 -04:00
Peter Fogg
d7e1ec1922 Merge pull request #9613 from edx/peter-fogg/team-search-events
Add teams eventing for search.
2015-09-04 13:22:39 -04:00
Sarina Canelake
0dbcd397e9 Merge pull request #9571 from mirjamsk/mirjamsk/TNL-3183
Addresses TNL-3183
2015-09-04 13:01:07 -04:00
Peter Fogg
86cce5f0ef Add teams eventing for search.
TNL-3187
2015-09-04 12:40:37 -04:00
Diana Huang
a743f4a642 Add teams eventing and tests. 2015-09-04 10:45:01 -04:00
Afzal Wali Naushahi
f80720d09e Merge pull request #9541 from edx/afzaledx/extending_auto_auth_for_verified_users
Added the ability to change the enrollment mode in the auto_auth API
2015-09-02 23:27:36 +05:00
Andy Armstrong
4be74937df Add searching to the teams view
TNL-1935
2015-09-02 12:26:07 -04:00
Ben Patterson
e47eb205d4 Merge pull request #9577 from edx/benp/ECOM-1165-declare-it-flaky
Tagging this test as flaky.
2015-09-02 10:36:11 -04:00
Afzal Wali
257aaaee83 Added the ability to change the enrollment mode in the auto_auth API (used for bokchoy and load tests).
Modified some tests to use the modified API.

Quality

Quality

Updated the comment.

Quality
2015-09-02 19:05:34 +05:00
Adam
3792d67fd1 Merge pull request #9567 from edx/merge-release-into-master
Merge release into master
2015-09-02 09:21:45 -04:00
Ben Patterson
b4b0971c04 Tagging this test as flaky.
ECOM-1165
2015-09-02 08:38:05 -04:00
mirjamsk
fb65874930 Addresses TNL-3183 2015-09-02 08:00:42 +00:00
Adam Palay
76fc180cd9 Merge remote-tracking branch 'origin/release' into merge-release-into-master
Conflicts:
	common/lib/xmodule/xmodule/css/capa/display.scss
2015-09-01 16:01:04 -04:00
Jesse Zoldak
7f0b9bceff Decorate flaky test TNL-3183 2015-09-01 15:34:31 -04:00
Syed Hassan Raza
f82662356f Revert "OSPR-535 Partial Credit"
This reverts commit 7624c63362.
2015-09-01 14:04:42 -04:00
Tasawer
58a2dc2466 Removing flaky decorator from test
ECOM-1165
2015-08-31 07:43:17 +00:00
Peter Fogg
2c774fd271 Allow sorting of teams in a topic.
TNL-1937
2015-08-28 15:46:07 -04:00
raeeschachar
39c7e30d4d Merge pull request #9514 from edx/raees-chrome-bok-choy-test-about-me-field
Fixed test_about_me_field failing on chrome bok choy
2015-08-28 19:37:13 +05:00
raeeschachar
a908f287f8 Fixed test_about_me_field failing on chrome bok choy 2015-08-28 16:18:06 +05:00
muzaffaryousaf
b45ffa11cc Changing the createNew teams-tab.js method to use the viewWithHeader.
TNL-2964
2015-08-28 15:59:21 +05:00
muzaffaryousaf
f788caa6cc Edit team page for Instructor only.
TNL-1914
2015-08-28 12:47:15 +05:00
Sarina Canelake
406c9bc556 Merge pull request #9464 from mirjamsk/mirjamsk/TNL-3096
Adresses TNL-3096
2015-08-27 19:36:43 -04:00
mirjamsk
336982e42b Adresses TNL-3096
Add acceptance test for TNL-3096

Adress comments on pull request

Fix test failing and img issue

Modify tests
2015-08-27 15:50:33 +00:00
Peter Fogg
382909b7c3 Add sorting controls on Teams topics page.
TNL-1936
2015-08-25 16:59:52 -04:00
Marko Jevtić
45832b986a Merge pull request #9283 from edx/mjevtic/SOL-1040
(SOL-1040) Indexing capa problems
2015-08-24 14:40:29 +02:00
Colin-Fredericks
7624c63362 OSPR-535 Partial Credit
Squashed commit of the following:

commit 0f7c2af5f7b8caed575dd253a45299293b2729d7
Author: Colin-Fredericks <colin.fredericks@gmail.com>
Date:   Tue Jun 30 12:04:43 2015 -0400

    Forgot icon

commit b48970392741130f774709c54eb6e5ab0089812c
Author: Colin-Fredericks <colin.fredericks@gmail.com>
Date:   Tue Jun 30 11:49:57 2015 -0400

    OSPR-535 Partial Credit

    Squashed commit of the following:

    commit 6dd34f58f994e32d0d54bf1d67bffd04e0f8ef08
    Author: Colin-Fredericks <cof945@dhcp-140-247-184-176.fas.harvard.edu>
    Date:   Tue Jun 30 11:44:01 2015 -0400

        Fixing accidental overwrite.

    commit 1ff8fc4b0e83b90356e8e8dce1022f49bfd162cf
    Author: Colin-Fredericks <cof945@dhcp-140-247-184-176.fas.harvard.edu>
    Date:   Tue Jun 30 11:18:36 2015 -0400

        OSPR-535 Partial Credit

        Revised after first pull discussion.

Fixing scss typos

Fixing check/x display problem

Empty set is not []

Shuffling empty answer code to grade properly.

I don't think I ever wrote this in the first place...

Adding tests for MC and Checkbox

including proper partial-credit marking and scoring

Numerical and OptionResponse tests

Also a few improvements to NumericalResponse problem type and
exception-raising.

CustomResponse tests and more numerical tests

Increasing coverage and fixing typos

Exception added for pylint false positive

Hopefully fixing coverage issue

Retabulating line continuation

Bok Choy test for partial credit

Copypasta fix

Adding tooltip for partial credit

Improving and expanding comments

Minor fixes
2015-08-20 11:18:13 -04:00
Eric Fischer
c170ff44e3 Fixing flaky bokchoy TeamPageTests
The flaky test problems we've been seeing here are coming from not
waiting long enough after performing actions. By forcing
is_browser_on_page checks to wait until the page is fully loaded
instead of just looking for the presence of a single element, we
ensure that there will not be issues interacting with non-loaded
elements.

TNL-3069
2015-08-19 16:51:30 -04:00
Sarina Canelake
25a117613d Revert "Merge pull request #8724 from Colin-Fredericks/ColinF-partial-credit"
This reverts commit cea274dc52, reversing
changes made to 02cf9caca6.
2015-08-19 11:07:14 -04:00
Eric Fischer
ab3b2ebd9a Fixing problematic bok_choy test
By moving the team_page.first_member_username access to occur before
click_first_profile_image() is called, we avoid a potential issue
where the wrapper() method defined in page_object.py, which
decorates the property, calls into _verify_page() and raises a
WrongPageError.
2015-08-18 09:16:26 -04:00
Jesse Zoldak
996ce1d62c Mark TeamPageTest class as flaky TNL-3069 2015-08-14 16:07:54 -04:00
Andy Armstrong
1265d540ad Merge pull request #9302 from edx/andya/team-refresh-handling
Implement model refreshing for Teams tab
2015-08-14 11:50:54 -04:00
cahrens
c84abfab40 Bok choy tests for dynamic updating after team changes. 2015-08-14 11:12:11 -04:00
Andy Armstrong
a24e3cb0fc Implement model refreshing for Teams tab
TNL-2976
2015-08-14 11:12:11 -04:00
chrisndodge
460a4b5f99 Merge pull request #9069 from edx/cdodge/proctoring-lms-integration
Integration of Proctoring into the LMS
2015-08-14 07:18:14 -04:00