Commit Graph

1174 Commits

Author SHA1 Message Date
Christina Roberts
901cafe57a Merge pull request #11419 from edx/christina/enable-test
Remove skip from studio page bok choy test
2016-02-03 16:37:10 -05:00
cahrens
19162fb752 Asset page is hopefully loading more reliably now. 2016-02-03 15:46:51 -05:00
Peter Fogg
8ed051e3cf Merge pull request #10642 from edx/feature/self-paced
Course home page improvements.
2016-02-03 15:06:59 -05:00
Peter Fogg
71a00bf946 Revert "Move Course Handouts to Course Resources and Tools."
This reverts commit e8909e4439f22a7568d95a7672ab60d4a36f7322.
2016-02-03 13:58:23 -05:00
Peter Fogg
c22677c171 Move Course Handouts to Course Resources and Tools.
The existing course handouts section is moved underneath Course
Updates and News, with updated styling.

ECOM-2808
2016-02-03 13:58:22 -05:00
Peter Fogg
786c4456ea Last-accessed courseware on the home page.
ECOM-2806
2016-02-03 13:58:22 -05:00
Matt Drayer
71a6779dfa Merge pull request #11138 from fghaas/no-video-if-unset
lms: Only show welcome video if show_homepage_promo_video is set
2016-02-03 13:08:31 -05:00
Ahsan Ulhaq
96d030b6d9 Reverse and Rename Courseware and Course Info Tabs
ECOM-2678
2016-02-03 12:20:53 -05:00
Hasnain
d275dd4a70 Added bok choy test for proctoring instructor dashboard 2016-02-03 10:48:55 -05:00
clrux
8a2d989369 Merge pull request #11247 from edx/clrux/ac-313-fixup
CMS: Removing H1 and H2 from editor options; updating editor icons
2016-02-03 09:28:44 -05:00
Florian Haas
fef6f64a7b lms: Only show welcome video if show_homepage_promo_video is set
While show_homepage_promo_video would previously toggle the control to
play the welcome video on and off, the YouTube embed iframe would be
included in index.html unconditionally. This created the ugly
situation that YouTube would try to pull in a non-existent video, and
that a DoubleClick tracking beacon would be introduced to the start
page for no reason.

Instead, make sure show_homepage_promo_video toggles the entire modal
video section on and off, suppressing it altogether unless
show_homepage_promo_video is set.
2016-02-03 09:37:27 +01:00
Chris Rodriguez
4ae40e7bdd Updating icons on problem type editor 2016-02-02 15:41:04 -05:00
Chris Rodriguez
81d86eea42 Changing H2 to H3 in problem templates 2016-02-02 15:41:02 -05:00
Ben Patterson
902126d55c Clarify method intent. Use BrokenPromise rather than assert. 2016-02-02 06:48:30 -05:00
Ben Patterson
07f8b8e9c3 Correct flaky condition on tooltip. 2016-01-30 16:56:12 -05:00
Ben Patterson
d7be722ce7 [firefox upgrade] Wait for code mirror editor to be active
Not an issue for our tests on firefox 28; however, once we upgrade to
Firefox 42 (or later), a new wait condition is needed here. Otherwise,
the content is not set because selenium's action chain is starting too
early.
2016-01-29 20:42:17 -05:00
Douglas Hall
dce3d9ca81 Merge pull request #11014 from edx/douglashall/PHX-219/subsection_gating
PHX-219 Subsection Gating
2016-01-29 11:05:39 -05:00
Asad Iqbal
87d9a07931 Merge pull request #11242 from edx/asadiqbal08/WL-243-manual-lang
WL-243 LMS Language Selection
2016-01-29 14:07:46 +05:00
Douglas Hall
37a7fdc0f2 Added subsection gating feature 2016-01-28 14:05:20 -05:00
asadiqbal
99b883b7be WL-243 LMS Language Selection 2016-01-28 20:07:26 +05:00
Christine Lytwynec
8c8953fe32 Update discussion markdown editor add link and image modals 2016-01-27 14:43:29 -05:00
Jesse Zoldak
fc45b2c82e Merge pull request #11292 from edx/zoldak/phantom-bok-choy
Harden page objects
2016-01-22 11:49:46 -05:00
Ned Batchelder
106a822def Merge pull request #11305 from edx/ned/fix-flaky-test
Add @flaky
2016-01-22 11:11:59 -05:00
raeeschachar
8b24d6380a Merge pull request #11303 from edx/raees/chrome-bokchoy-test-can-create-edit-signatories-of-certificate
Fixed test can create and edit signatories of certificate failing on …
2016-01-22 21:10:17 +05:00
Ned Batchelder
30209b1486 Add @flaky 2016-01-22 09:48:25 -05:00
raeeschachar
8dbf66fbd9 Fixed test can create and edit signatories of certificate failing on Chrome 2016-01-22 18:29:17 +05:00
Jesse Zoldak
6fc490e3d4 Harden page objects 2016-01-21 10:31:37 -05:00
Eric Fischer
2b2f6d18d6 Wait for text to appear
Adding a wait statement to allow ajax calls to finish before making assertions
about text that has changed. Fixes TNL-3943 flaky test ticket.
2016-01-20 14:08:13 -05:00
Ben Patterson
31841bdcbb Merge pull request #11271 from edx/benp/9-bokchoy-shards
Benp/9 bokchoy shards
2016-01-20 12:09:53 -05:00
Muhammad Ammar
4938601cd9 Merge pull request #11177 from edx/ammar/fix-play-video-event
Avoid emitting play_video event during buffering
2016-01-20 17:59:04 +05:00
raeeschachar
536ac77af0 Merge pull request #11263 from edx/raees/chrome-bokchoy-test-course-rerun
Fixed test course rerun failing on Chrome
2016-01-20 12:39:54 +05:00
Ben Patterson
ce716bbbc4 Create additional bok-choy shards for faster feedback. 2016-01-19 17:18:33 -05:00
Matt Drayer
20f6b545fb Merge pull request #11256 from edx/mattdrayer/index-page-bokchoy
mattdrayer/index-page-bokchoy: Refactor+cover Open edX LMS index page
2016-01-19 14:28:46 -05:00
raeeschachar
d440e209e1 Fixed test course rerun failing on Chrome 2016-01-20 00:19:40 +05:00
Matt Drayer
9b35844b98 mattdrayer/index-page-bokchoy: Refactor+cover Open edX LMS index page 2016-01-18 23:12:04 -05:00
muhammad-ammar
c4065f7b33 Avoid emitting play_video event during buffering
TNL-2178
2016-01-18 19:55:37 +05:00
Ben Patterson
699aa4d570 [firefox upgrade] Replace action chain with tinymce JS.
This action chain is not reliable across firefox versions (and
in fact, even on the older firefox, fails locally). Instead we
use native JS tinymce to set the content.
2016-01-16 12:46:49 -05:00
Ben Patterson
0c1fd7ab6b Merge pull request #11240 from edx/benp/ff42-container-block-3
Fix flaky condition for firefox 42 on subsection container block (studio)
2016-01-15 15:15:34 -05:00
cahrens
a47be54050 Un-deprecate teams setting.
TNL-3803
2016-01-15 09:18:46 -05:00
Ben Patterson
ebcafcc103 Better location. 2016-01-14 19:57:15 -05:00
Ben Patterson
29e4ba95e1 Special condition needed for newer firefox version.
On the older firefox version (28), the offset approach fails. This
update is being made as part of an effort to upgrade to firefox 42
incrementally. So we are including logic for Firefox 28 vs 42 that
we can remove after the upgrade.
2016-01-14 19:53:16 -05:00
Ben Patterson
2b731b70d5 Fix flaky condition only appearing in newer firefox versions. 2016-01-14 14:33:19 -05:00
raeeschachar
9cf16cd279 Merge pull request #11201 from edx/raees/chrome-bokchoy-test-annotation-component
Fixed test annotation component failing on Chrome
2016-01-14 00:09:22 +05:00
raeeschachar
c790b62aa0 Fixed test annotation component failing on Chrome 2016-01-13 11:34:46 +05:00
Awais Jibran
ded3786d0c Merge pull request #11157 from edx/aj/tnl3968-mathjax-in-static-pages
Enable MathJax in Course Pages
2016-01-12 18:25:33 +05:00
Awais Jibran
a72d4a04e8 Enable MathJax in Course Pages
TNL-3968
2016-01-12 13:49:30 +05:00
raeeschachar
41f27f1f9f Fixed test quality button works correctly in Video tests failing on Chrome 2016-01-08 16:27:17 +05:00
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
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