Commit Graph

12516 Commits

Author SHA1 Message Date
Ben Patterson
29befd3381 Merge pull request #11148 from edx/benp/teams-page-flaky-ff42
Fix failing condition for firefox 42.
2016-01-06 12:24:50 -05:00
David Ormsbee
d23991024a Merge pull request #11144 from edx/ormsbee/student_dashboard_module_js
Disable Courseware JS from loading on Student Dashboard.
2016-01-06 11:33:03 -05:00
Douglas Hall
8b32148147 Merge pull request #11137 from edx/hasnain-naveed/SOL-1182-final
SOL-1182 / Bokchoy-test
2016-01-06 10:20:25 -05:00
Ben Patterson
bc77ab2d6e Fix failing condition for firefox 42.
Firefox 42 is faster than the version we're currently using for platform tests. This failure
occurs in the brief amount of time where the teams page is reloading. Waiting for the actual
team list to appear before moving on with tests solves the issue. Approx 4 testcases are fixed.

Below is an example of error that was appearing in firefox 42 tests:

```
Error Message

Not on the correct page to use '<common.test.acceptance.pages.studio.users.CourseTeamPage object at 0x7feb9fdb0490>' at URL 'http://localhost:8031/course_team/course-v1:test_org+321550032104190792981383915127220335686+test_run'
-------------------- >> begin captured logging << --------------------
bok_choy.browser: INFO: Using local browser: firefox [Default is firefox]
--------------------- >> end captured logging << ---------------------
Stacktrace

  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/home/jenkins/workspace/edx-platform-test-subset/common/test/acceptance/tests/studio/test_studio_course_team.py", line 147, in test_added_users_cannot_add_or_delete_other_users
    self._assert_user_present(self.other_user, present=True)
  File "/home/jenkins/workspace/edx-platform-test-subset/common/test/acceptance/tests/studio/test_studio_course_team.py", line 78, in _assert_user_present
    description="Wait for user to be present"
  File "/home/jenkins/edx-venv/local/lib/python2.7/site-packages/bok_choy/page_object.py", line 490, in wait_for
    return EmptyPromise(promise_check_func, description, timeout=timeout).fulfill()
  File "/home/jenkins/edx-venv/local/lib/python2.7/site-packages/bok_choy/promise.py", line 92, in fulfill
    is_fulfilled, result = self._check_fulfilled()
  File "/home/jenkins/edx-venv/local/lib/python2.7/site-packages/bok_choy/promise.py", line 118, in _check_fulfilled
    is_fulfilled, result = self._check_func()
  File "/home/jenkins/edx-venv/local/lib/python2.7/site-packages/bok_choy/promise.py", line 173, in <lambda>
    full_check_func = lambda: (check_func(), None)
  File "/home/jenkins/workspace/edx-platform-test-subset/common/test/acceptance/tests/studio/test_studio_course_team.py", line 77, in <lambda>
    lambda: user.get('username') in self.page.usernames,
  File "/home/jenkins/edx-venv/local/lib/python2.7/site-packages/bok_choy/page_object.py", line 66, in wrapper
    self._verify_page()  # pylint: disable=protected-access
  File "/home/jenkins/edx-venv/local/lib/python2.7/site-packages/bok_choy/page_object.py", line 331, in _verify_page
    raise WrongPageError(msg)
"Not on the correct page to use '<common.test.acceptance.pages.studio.users.CourseTeamPage object at 0x7feb9fdb0490>' at URL 'http://localhost:8031/course_team/course-v1:test_org+321550032104190792981383915127220335686+test_run'\n-------------------- >> begin captured logging << --------------------\nbok_choy.browser: INFO: Using local browser: firefox [Default is firefox]\n--------------------- >> end captured logging << ---------------------"
```
2016-01-06 08:40:54 -05:00
Hasnain
b7d7e4d588 remove the flaky decorator. 2016-01-06 09:49:36 +00:00
Kelketek
7af7553175 Merge pull request #10413 from edx/register-dropdown
Add custom fields to registration menu.
2016-01-05 13:44:11 -06:00
David Ormsbee
660d64d7b8 Disable Courseware JS from loading on Student Dashboard. 2016-01-05 13:54:04 -05:00
Toby Lawrence
56fe511a81 Merge pull request #11025 from edx/PERF-224
[PERF-224] Serve course assets from a CDN
2016-01-05 13:40:54 -05:00
Ben Patterson
54d4ea8a80 Merge pull request #11120 from edx/benp/fix-edxnotes-seleniumupgrade
Resolving errors for selenium upgrade.
2016-01-05 11:33:57 -05:00
Jonathan Piacenti
acc0161c0f Add custom registration form extension feature. 2016-01-05 10:14:28 -06:00
Toby Lawrence
77343df0d9 [PERF-224] Support to serve static assets from a CDN.
A base URL can now be configured which is, potentially, prepended to an
asset URL.  This allows a CDN, or caching server, to front static asset
requests, taking load off of the contentstore and speeding up page load
times.

Asset URL generation respects locked vs unlocked assets, and will not
generate links to locked assets that would traverse a CDN (even though
the authorization component of the contentserver middleware wouldn't
allow those links to work anyways).
2016-01-05 10:24:44 -05:00
raeeschachar
c66d3cba20 Merge pull request #11086 from edx/raees/chrome-bokchoy-test-can-create-note-with-tags
Fixed test can create note with tags failing on Chrome
2016-01-05 11:32:11 +05:00
raeeschachar
1bd1230afa Merge pull request #11112 from edx/raees/chrome-bokchoy-test-quality-button-visibility
Fixed test quality button visibility failing on Chrome
2016-01-05 11:31:24 +05:00
Carol Tong
0f3da297f6 Fix help targets in Instructor Dashboard 2016-01-04 15:20:40 -05:00
raeeschachar
0e88264df6 Merge pull request #11111 from edx/raees/chrome-bokchoy-test-url-routing
Fixed test url routing failing on Chrome
2016-01-05 00:10:38 +05:00
Bill DeRusha
77d85614b3 Merge pull request #11058 from edx/bderusha/mailchimp-activate
Mailchimp activation
2016-01-04 13:53:13 -05:00
Bill DeRusha
39b5eccf67 Update isActive column in mailchimp upon activation 2016-01-04 13:00:31 -05:00
Matt Drayer
2c1680a9cb Merge pull request #11080 from edx/saleem-latif/SOL-1529
SOL-1529: Allow PMs to Invalidate Certificates
2016-01-04 10:46:27 -05:00
Ben Patterson
99b029969c Merge pull request #11097 from edx/ziafazal/SOL-1560
ziafazal/SOL-1560:load db_fixures when run with --testsonly
2016-01-04 09:00:38 -05:00
Saleem Latif
9aa0a01cae Allow PMs to Invalidate Certificates 2016-01-04 14:28:32 +05:00
Syed Hasan raza
6a24fd66cc Merge pull request #11005 from edx/shr/bug/TNL-2622-course_import_status_message_fix_test
Shr/bug/tnl 2622 course import status message fix test
2016-01-04 12:33:45 +05:00
Ben Patterson
06147a9e91 Resolving errors for selenium upgrade.
These action chains are invalid for later versions of selenium (which
are needed for upgrading the version of firefox we test on); they will
result in output like this:

```
 WebDriverException: Message: UnknownError: Cannot release a button when no button is pressed.'UnknownError: Cannot release a button when no button is pressed.' when calling method: [wdIMouse::up]
   Stacktrace:
       at FirefoxDriver.prototype.mouseButtonUp (file:///tmp/tmp6LL1Ye/extensions/fxdriver@googlecode.com/components/driver-component.js:10979)
       at DelayedCommand.prototype.executeInternal_/h (file:///tmp/tmp6LL1Ye/extensions/fxdriver@googlecode.com/components/command-processor.js:12534)
       at DelayedCommand.prototype.executeInternal_ (file:///tmp/tmp6LL1Ye/extensions/fxdriver@googlecode.com/components/command-processor.js:12539)
       at DelayedCommand.prototype.execute/< (file:///tmp/tmp6LL1Ye/extensions/fxdriver@googlecode.com/components/command-processor.js:12481)

```
2016-01-02 15:34:17 -05:00
raeeschachar
93f8228e56 Fixed test quality button visibility failing on Chrome 2016-01-01 19:15:14 +05:00
raeeschachar
4694b0a6f9 Fixed test url routing failing on Chrome 2016-01-01 18:35:15 +05:00
Ben Patterson
1ece96a5a8 Merge pull request #11103 from edx/benp/refresh-lettuce-db-cache
Update lettuce db cache with the latest migrations.
2015-12-31 10:30:01 -05:00
Zia Fazal
2f275f31b4 fixed scenario when tests run using cached sql schema 2015-12-31 20:03:28 +05:00
Zia Fazal
7cdeb3300a load db_fixures when run with --testsonly
revert shell script change
2015-12-31 15:39:08 +05:00
Syed Hassan Raza
fe0740b91e set path explicitly for storing cookie 2015-12-31 15:19:40 +05:00
clrux
622413a8e5 Merge pull request #11050 from edx/clrux/ac-296
LMS: re-enable Enter and Space to toggle transcript
2015-12-30 14:43:05 -05:00
Ben Patterson
7d76db555e Update lettuce db cache with the latest migrations. 2015-12-30 13:37:42 -05:00
Syed Hasan raza
a5f7f502f2 Merge pull request #11093 from edx/shr/bug/AN-4509-detail-logging
Detail logging for backend_logger
2015-12-30 22:23:37 +05:00
David Ormsbee
dba12c09a3 Merge pull request #11088 from edx/ormsbee/seq_new_relic_tagging
Add New Relic instrumentation to SequenceModule.
2015-12-30 08:51:08 -05:00
Syed Hassan Raza
a16791baaa Detail logging for backend_logger 2015-12-30 15:41:01 +05:00
Awais Jibran
4f185abc33 Merge pull request #10749 from edx/aj/tnl3779-use-get-courses-summaries-for-staff
Render CMS course listing Using CourseSummary class for staff
2015-12-30 11:49:55 +05:00
David Ormsbee
0219071502 Add New Relic instrumentation to SequenceModule.
The goal of this is to capture more detailed usage and performance
information around the kind of course content we have out there.
Having this information will allow us to more easily query to see
how sequence size and specific block types affect front end
performance.
2015-12-29 19:08:30 -05:00
raeeschachar
9c95b1074a Fixed test can create note with tags failing on Chrome 2015-12-29 19:05:42 +05:00
Awais Jibran
c32823dfa6 Render cms course listing using CourseSummary class. 2015-12-29 17:35:12 +05:00
asadiqbal
624b2ba406 SOL-1358 2015-12-29 16:40:27 +05:00
Nimisha Asthagiri
6bbc46b1b5 Merge pull request #11049 from edx/mobile/catalog-api-overview-field
Update Course Catalog API to support About Overview field
2015-12-28 16:09:15 -05:00
Nimisha Asthagiri
3d84e29218 Update Course Catalog API to include About Overview field. 2015-12-28 15:03:22 -05:00
Peter Fogg
d9b181e83f Merge pull request #11053 from edx/peter-fogg/enrollment-api-slashes
Add optional trailing slashes to the Enrollment API.
2015-12-28 10:29:40 -05:00
raeeschachar
e5cbb1c92e Fixed test cannot upload json translation failing on Chrome 2015-12-23 18:15:09 +05:00
Peter Fogg
3149aaa319 Add options trailing slashes to the Enrollment API.
This allows the edX REST API Client to perform a sucessful GET against
this API, since Slumber (which our client is based off of) appends the
trailing slash by default.
2015-12-22 14:52:27 -05:00
Robert Raposa
f5a63b1e36 Merge pull request #10962 from edx/robrap/TNL-3425
Deprecate escaping in display_name_with_default
2015-12-22 14:49:32 -05:00
raeeschachar
62597a17fd Merge pull request #11036 from edx/raees/chrome-bokchoy-test-cohort-by-csv-unicode
Fixed test cohort by csv unicode failing on Chrome
2015-12-22 22:36:55 +05:00
Robert Raposa
5e69224c32 Deprecate escaping in display_name_with_default
- Remove escaping in display_name_with_default
- Move escaped version to deprecated display_name_with_default_escaped
- Does not include any other changes to remove double-escaping

Thanks to agaylard who initiated this work:
https://github.com/edx/edx-platform/pull/10756

TNL-3425
2015-12-22 11:52:04 -05:00
Ben Patterson
82ca667db4 Merge pull request #11044 from edx/revert-10994-mushtaq/improve_get_item
Revert "Append block item only if it has path to root"
2015-12-22 10:13:26 -05:00
Chris Rodriguez
ac9d866fab LMS: re-adding Enter and Space toggle for transcript control 2015-12-22 09:59:54 -05:00
Usman Khalid
5e972b2a66 Merge pull request #11022 from edx/bookmarking
Bookmarking
2015-12-22 18:25:48 +05:00
raeeschachar
05b96f8c93 Merge pull request #11038 from edx/raees/chrome-bokchoy-test-search-flaky
Fixed test search flaky on Firefox and Chrome
2015-12-22 12:35:35 +05:00