Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,207 Commits 1 Branch 0 Tags
5cef287c5dfb2db7aa90ff0478587f1f12e505fd
Commit Graph

925 Commits

Author SHA1 Message Date
Sarina Canelake
25eb6942b6 Merge pull request #8051 from edx/sarina/add-flaky-TNL-2199 
Add flaky test decorator (TNL-2199)
 2015-05-14 15:26:43 -04:00
Christina Roberts
3f2c370d58 Merge pull request #7923 from edx/christina/show-notes 
Tags Tab in Student Notes
 2015-05-14 12:30:38 -04:00
Sarina Canelake
f3f0f08422 Add flaky test decorator (TNL-2199) 2015-05-14 12:10:42 -04:00
cahrens
abd25b8b45 Add a "tags" view in student notes. 
TNL-1926
 2015-05-14 11:36:48 -04:00
Diana Huang
362c632ad7 Catch BSON errors as well as PyMongo errors when emitting 
MongoDB events.

TNL-2035
 2015-05-13 12:21:53 -04:00
Diana Huang
ac8b75ca7f Merge pull request #7804 from edx/diana/progress-summary-refactor 
Implement the Weighted Problem Grade Report
 2015-05-13 09:10:02 -04:00
Daniel Friedman
3acd7a008c Refactor and add tests for new grade report. 
* Handle grading errors
 2015-05-13 06:58:02 -04:00
Daniel Friedman
84f3c33df7 Address doc review 2015-05-12 16:32:01 -04:00
Andy Armstrong
2fafaec053 Implement grade report analytics 
TNL-1988
 2015-05-12 16:32:01 -04:00
Adam Palay
42fb7bd6cb Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/github.txt
 2015-05-12 15:13:28 -04:00
Ben Patterson
07c5bbd96d Look for a consistent css class. 
The former class, while less-flaky, does not always appear. (For example, if cohorts
are being toggled off.) This css class always appears. Initial findings point to
flakiness being a non-issue if we look for this class.
 2015-05-12 13:38:05 -04:00
Ben Patterson
31e56e77ae Make edxnotes bok-choy tests chrome-friendly. 
This eliminates some flakiness related to the loading of the notes page. It also
sets the 'no content' version of that page as a separate page object so testing
that case is more explicit.

TE-849
 2015-05-11 15:02:00 -04:00
Adam
4a8cd270a1 Merge pull request #7988 from edx/shr/bug/PLAT-612-video-component-missing-tests 
edx-val-Fix VAL error on re-import
 2015-05-11 13:25:43 -04:00
Syed Hassan Raza
103fa38860 edx-val-Fix VAL error on re-import 2015-05-11 20:00:55 +05:00
Adam
58b34e1cc4 Merge pull request #7974 from edx/merge-release-to-master 
Merge release to master
 2015-05-08 14:24:14 -04:00
Adam Palay
8243d934e4 Merge remote-tracking branch 'origin/release' into merge-release-to-master 
Conflicts:
	common/test/acceptance/tests/video/test_video_times.py
 2015-05-08 10:23:04 -04:00
Ben Patterson
609feaae71 Ensure cohort management section has loaded. 
TNL-2120, TE-849

The parent .cohort-management class was loading faster than its children (which makes sense). However,
flakiness existed on these tests because browser actions were depending on child elements that had not
painted yet.

Tested this using chrome with no X11 forwarding for extra speed. That exposed the ajax call
as well as the sub-class rendering issues.
 2015-05-08 09:04:42 -04:00
Adam Palay
2842029a7f skip failing test 2015-05-07 14:34:44 -04:00
Gabe Mulley
411df0ae3a Merge pull request #7802 from edx/gabe/user-track 
Make user_track use eventtracking
 2015-05-07 08:43:21 -04:00
Gabe Mulley
4a8b0c5ef5 Make user_track use eventtracking 2015-05-06 20:57:46 -04:00
Muzaffar yousaf
0ca9f9667a Merge pull request #7810 from edx/muzaffar/tnl1261-studio-prview 
Enable unit preview by default.
 2015-05-06 21:06:49 +05:00
Ben Patterson
259092696e Merge pull request #7931 from edx/benp/chrome-add-user-to-team 
Bok-choy on chrome: fix sequence for adding user to team.
 2015-05-06 11:58:08 -04:00
Ben Patterson
02800dcd12 Bok-choy on chrome: fix sequence for adding user to team. 
TE-849

This passes fine in firefox; however in chrome, the click is occurring before
the page is ready; and then the click itself is not specific enough. Also
refactored the add button method so it more-clearly returns the expected
end-state.
 2015-05-06 11:56:48 -04:00
Ben Patterson
c049684dfd Merge pull request #7939 from edx/benp/tnl-1619-flaky 
Mark test as flaky. TNL-1619
 2015-05-06 10:27:34 -04:00
Ben Patterson
0a9ef9c422 Merge pull request #7935 from edx/benp/chromefix-csv-upload-wait 
On faster browsers, we need to wait for the toggle option to appear.
 2015-05-06 10:10:18 -04:00
muzaffaryousaf
f5de0bbf43 Enable unit preview by default. 
TNL-1261
 2015-05-06 12:40:44 +05:00
Ben Patterson
eacf25673a Mark test as flaky. TNL-1619 2015-05-05 19:37:55 -04:00
Ben Patterson
314accdf4d On faster browsers, we need to wait for the toggle option to appear. 
TE-849
 2015-05-05 17:25:20 -04:00
Ben Patterson
0cd749f6fc Merge pull request #7920 from edx/benp/fix-cohort-wait-chrome 
Add wait for upload form.
 2015-05-05 15:21:46 -04:00
Christina Roberts
7c7b0dd7c2 Merge pull request #7915 from edx/christina/flaky-search 
Label flaky test test_reindex.
 2015-05-05 12:46:18 -04:00
Ben Patterson
7d9ac7da80 Merge pull request #7917 from edx/benp/pdf-tabs-skip 
Setting this test to skip. TNL-2083.
 2015-05-05 10:53:16 -04:00
Ned Batchelder
4cba033bbc Merge pull request #7854 from edx/ned/te-855 
Run pylint on all our code, and only our code. TE-855
 2015-05-05 10:37:48 -04:00
Ben Patterson
6a0787de61 Add wait for upload form. 
This is necessary for automation using chrome. TE-849
 2015-05-05 09:04:39 -04:00
E. Kolpakov
fab123829d Added flaky decorator to potentally flaky test test_cohort_course_wide_discussion_topic 2015-05-05 12:52:24 +03:00
Christina Roberts
31a19c0f63 Merge pull request #7823 from edx/christina/notes-tagging 
Add tags plugin.
 2015-05-04 20:56:52 -04:00
Ben Patterson
8d81398e92 Setting this test to skip. TNL-2083. 2015-05-04 20:34:59 -04:00
cahrens
353caea766 Label flaky test test_reindex. 
SOL-835
 2015-05-04 17:03:39 -04:00
cahrens
64047478d3 edxnotes is now enabled in bok choy configuration 2015-05-04 16:00:23 -04:00
cahrens
5fe384ca2b Add tags plugin. 
TNL-1924
 2015-05-04 16:00:18 -04:00
Ned Batchelder
24e0c2c80f Run pylint on all our code, and only our code. TE-855 
With the old logic, we weren't running pylint on openedx at all.  We
were also running it on lms/lib/comment_client twice, and on the
installed xblock third-party library.
 2015-05-04 15:23:55 -04:00
Ben Patterson
fad6ad77df Merge pull request #7899 from edx/benp/annotation-flaky 
Flag test as flaky.
 2015-05-04 09:38:09 -04:00
Ben Patterson
0847f8c24e Flag test as flaky. 2015-05-04 07:00:57 -04:00
Awais Jibran
e9f26a99a8 Merge pull request #7829 from edx/aj/tnl1530-discussion-section-jump-to-bottom 
Switching between discussion threads take focus to bottom of the page.
 2015-05-04 12:03:51 +05:00
Ben Patterson
8cd5f42ca9 Merge pull request #7850 from edx/benp/bok-choy-shard-5 
Add bok-choy shards 4 and 5. New default is 'shard 6'
 2015-05-01 09:26:32 -04:00
Ben Patterson
5f0cd587fd Add bok-choy shards 4 and 5. When no shard is specified on a test, it 
will fall in 'shard 6'
 2015-04-30 17:34:24 -04:00
Adam
af3519ce15 Merge pull request #7835 from edx/release 
Release (DO NOT MERGE)
 2015-04-30 16:24:47 -04:00
Awais Jibran
6e6aa036e7 Switching between discussion threads take focus to bottom of the page. 
TNL-1530
 2015-04-29 20:28:52 +05:00
Ben Patterson
1bed97e952 Merge pull request #7821 from edx/benp/flaky-TNL-2083 
Flag test as flaky. TNL-2083.
 2015-04-28 09:34:51 -04:00
Jim Abramson
70d837ab62 Merge pull request #7777 from edx/jsa/baskets 
use commerce api v2.
 2015-04-27 22:30:37 -04:00
jsa
efde11d552 Use ecommerce api v2. 
XCOM-213 XCOM-214
 2015-04-27 16:57:17 -04:00