Commit Graph

23454 Commits

Author SHA1 Message Date
James Williams 2804626131 show speedgrader link with 'view grades' permission
test plan:
* a course role with the ability to view all grades
 but not manage grades should be able to see a link to
 speedgrader in the sidebar on assignment pages
 (they can already visit them directly)

closes #CNVS-12858

Change-Id: I97f86bcfc0cccc882bb6bca316cdfc5fd41ff4cd
Reviewed-on: https://gerrit.instructure.com/97855
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: David Tan <dtan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2016-12-28 18:58:01 +00:00
James Williams a81d6c3852 master courses: restrict assessment questions and banks
treats questions as part of bank content

TODO: extend to quiz questions

closes #MC-19 #MC-22

Change-Id: Ib3e142832772958495c305e7151c191c2cba2d57
Reviewed-on: https://gerrit.instructure.com/97816
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2016-12-28 15:09:50 +00:00
Transifreq 81eaa99b3b update fa translation
Change-Id: I1b142477d954312126470b5aecefe4e36c4cbd51
2016-12-28 06:07:06 -07:00
Simon Williams 6d8d583c89 pin rainbow gem at 2.1.0
2.2.0 appears to be having issues, see:
https://github.com/sickill/rainbow/issues/40

Change-Id: I915f2cce49d64ac058940de07f90d46e683632a8
Reviewed-on: https://gerrit.instructure.com/98499
Tested-by: Jenkins
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
2016-12-27 22:41:08 +00:00
Pam Hiett 29a73c9667 replace straggler background image icons with updated icons
Fixes: CNVS-33656

test plan:

*peer review icons*
- the set-up for this one is as an admin have an assignment
  that has the “Require Peer Reviews” checked within the edit
  portion of the assignment (http://www.screencast.com/t/sL4jDThnj5A)
  as well as students enrolled that can act as peer reviewers
  once set-up…
- navigate to the “Assignments” link from the course sub-nav
  select the assignment that has the peer review enabled
- from the right-hand side-bar select the “Peer Reviews” link
  the screen should look something like this
  http://www.screencast.com/t/GOB1TxSu0xz

*user settings/approved integrations*
- as an admin click the account > settings link from the sub-nav
- scroll down the page to the “Approved Integrations” area below
  “Web Services” section… if you do not currently have any integrations
  click the “+ New Access Token” button to create one for the sake of
  testing (example: http://www.screencast.com/t/ga93V2vVkKf)

*account profile picture*
- the set-up for this one is to ensure your admin/account has
  users that have avatars… then as one of said users you need to
  flag another users avatar as inappropriate (so you can see that
  on the admin side) once you have the set-up complete navigate to
  your main account under the “Admin” sub-nav
- click the “users” link … then from there the “manage profile pictures”
  from the right-hand side-bar
- there you will have options of viewing all | approved,
  re-reported | reported | etc…
- example: http://www.screencast.com/t/jNnQA1LtQDp

*assignments in locked modules*
- the set-up for this one is to have modules created within a
  course that have assignments within them - the key is to have
  a module that requires a previous module to be completed before
  it can be accessed
- once this set-up is complete… navigate to the first assignment
  as a user (not the admin)
- example: http://www.screencast.com/t/n98QznZaC

*profiles user sidebar*
- the set-up for this one is as an admin ensure “Enable Profile Settings”
  is checked within the account/settings
- navigate to a course that has users enrolled
- click the “People” link from the left-hand sub-nav
- select one of the users by clicking on their name
- the view should look similar to this
  example: http://www.screencast.com/t/pep4xiH1BWzy

Change-Id: I5c897dd6d55b4050b3be78a8b6ff706af70674fc
Reviewed-on: https://gerrit.instructure.com/97269
Tested-by: Jenkins
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
QA-Review: Dan Sasaki
2016-12-27 21:30:05 +00:00
James Williams a7d3ba6fcb add some master/blueprint course details on account course index
also add filtering to only show blueprint courses

will need to follow up to adjust links and add the child course
count

closes #MC-51

Change-Id: Icb7ddc4e696f771c50f39bfece14e6e0908e108f
Reviewed-on: https://gerrit.instructure.com/98458
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2016-12-27 20:55:04 +00:00
Colleen Palmer 4073317ba2 Fix for icon- class fontsize
fixes: CNVS-33929

Test Plan:
- Go to People in a Course
- The fontsize on the string of text for the + Group Set button
and + People button should now be the same

Change-Id: Ia29bd904dfe41d930b4ba38f1982ac6c3d476978
Reviewed-on: https://gerrit.instructure.com/98158
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Tested-by: Jenkins
QA-Review: Dan Sasaki
Product-Review: Stephen Jensen <sejensen@instructure.com>
2016-12-27 20:50:40 +00:00
Landon Wilkins 63d3f61006 spec: fix fragile quiz submission spec
Change-Id: Ie0578d2623f5c09ee655a445675c594d7a735b2e
Reviewed-on: https://gerrit.instructure.com/98491
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Reviewed-by: Derek Bender <djbender@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
2016-12-27 20:41:33 +00:00
Simon Williams 57497719a7 spec: rename the `course` helper to `course_factory`
closes CNVS-34046

test plan: specs should pass

Change-Id: I8684d30e5af7be04566b2d3903db2b7f4b14b24b
Reviewed-on: https://gerrit.instructure.com/98439
Tested-by: Jenkins
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
2016-12-27 20:25:29 +00:00
Simon Williams ece65b5a89 spec: rename the `user` helper to `user_factory`
closes CNVS-34042

test plan: specs should pass

Change-Id: I20709a69f0cb28fb55eba18ca81f89f4d7673b56
Reviewed-on: https://gerrit.instructure.com/98426
Tested-by: Jenkins
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
2016-12-27 20:25:25 +00:00
Pam Hiett 704f74718d remove "by" in the footer login/dashboard instructure svg
Fixes: CNVS-33718

test plan:
- as a user navigate to the canvas login screen
- the insturcture logo should no longer have the word "by" in
  front of it
  example: http://www.screencast.com/t/eOjkx6w6I8w
- same goes for the footer on the dashboard

Change-Id: I24c1df11175089e794c27517b3163a2eb04fba84
Reviewed-on: https://gerrit.instructure.com/97776
Tested-by: Jenkins
QA-Review: Dan Sasaki
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
2016-12-27 20:18:10 +00:00
Derek Bender 242f560257 Gradebook2 -> Gradebook
refs: CNVS-33684

test plan:
 - specs pass
 - simple smoke test on gradebook, srgb, grades pages

Change-Id: I7f03d5f28413137baf8bcb8ff957de582c0e70b8
Reviewed-on: https://gerrit.instructure.com/98399
Reviewed-by: Shahbaz Javeed <sjaveed@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
Tested-by: Jenkins
QA-Review: KC Naegle <knaegle@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2016-12-27 19:47:46 +00:00
Simon Williams 3df1e488ae add shim for user_factory and course_factory
refs CNVS-34042
refs CNVS-34046

test plan: specs should pass

Change-Id: I87a0fbea837ba613cdce4ae16738c59ff4ab1e27
Reviewed-on: https://gerrit.instructure.com/98475
Tested-by: Jenkins
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
2016-12-27 19:18:10 +00:00
Simon Williams 359c6dea13 upgrade many canvas gems to rspec 3 syntax
as of this commit, all canvas gems should be on rspec 3.5, and pass
without deprecation warnings.

closes CNVS-34040

test plan: specs should pass without deprecation warnings

Change-Id: I556b1a4a5aeb791c6ddd50ee35b51c513e025019
Reviewed-on: https://gerrit.instructure.com/98414
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
Tested-by: Jenkins
2016-12-27 18:44:23 +00:00
Simon Williams e402017e17 upgrade canvas_quiz_statistics to rspec 3 syntax
refs CNVS-34040

test plan: specs should pass

Change-Id: Ic81ccbc5382dbc5c3b1e997281d2f988c7e350dc
Reviewed-on: https://gerrit.instructure.com/98413
Tested-by: Jenkins
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
2016-12-27 18:44:20 +00:00
Simon Williams b7fe6659de upgrade incoming_mail_processor to new rspec syntax
refs CNVS-34040

test plan: specs should pass

Change-Id: Ifea91036ccb1f4981c29c3247fe40966b741a4ce
Reviewed-on: https://gerrit.instructure.com/98412
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
Tested-by: Jenkins
2016-12-27 18:37:36 +00:00
Deepeeca Soundarrajan 8276039026 spec: Add specs and match test ids for group files access
Test Plan:
  - passes Jenkins

Change-Id: I8f5f775dc982c980cac0825620c0ffe26c179bd6
Reviewed-on: https://gerrit.instructure.com/98468
Tested-by: Jenkins
Reviewed-by: Benjamin Christian Nelson <bcnelson@instructure.com>
Product-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
2016-12-27 18:31:20 +00:00
Simon Williams 61d8bdd9f7 remove mocha in incoming_mail_processor
refs CNVS-34039
refs CNVS-34040

test plan: specs should pass

Change-Id: Ib630feea70c46d037e0de743ab0bf59b62727367
Reviewed-on: https://gerrit.instructure.com/98411
Tested-by: Jenkins
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
2016-12-27 18:18:43 +00:00
Simon Williams 6c6f10d402 remove mocha from several canvas gems
refs CNVS-34039
refs CNVS-34040

test plan: specs should pass

Change-Id: I9ef587edd9a5f47fcbe2f6fee74cc4c52efca6fb
Reviewed-on: https://gerrit.instructure.com/98410
Tested-by: Jenkins
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
2016-12-27 18:18:38 +00:00
Rob Orton d1bb668a3f remove unused line from sis import controller
if the batch does not exist it will have already
returned a 404

Change-Id: I60ef8817c79559baa46de242ba5b11f1099c05d8
Reviewed-on: https://gerrit.instructure.com/98391
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
2016-12-23 06:37:37 +00:00
Shahbaz Javeed ead14d2851 ensure selected assignment sort order remains through refreshes
closes QA-211

test plan:
* Ensure specs pass

Change-Id: Ib3373af0aaf89433ea10ffd14e5cbf4ab7473805
Reviewed-on: https://gerrit.instructure.com/98403
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Reviewed-by: Neil Gupta <ngupta@instructure.com>
Tested-by: Jenkins
Product-Review: Keith T. Garner <kgarner@instructure.com>
QA-Review: Keith T. Garner <kgarner@instructure.com>
2016-12-23 00:12:38 +00:00
Shahbaz Javeed 8327ceb3de add back broken/skipped selenium #283503
closes QA-201

test plan:
* Ensure specs pass

Change-Id: I530b400b542df21f1f3cbfd5accd71e2227bfe57
Reviewed-on: https://gerrit.instructure.com/98394
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Neil Gupta <ngupta@instructure.com>
Tested-by: Jenkins
Product-Review: KC Naegle <knaegle@instructure.com>
QA-Review: KC Naegle <knaegle@instructure.com>
2016-12-22 23:48:04 +00:00
Neil Gupta 775e2e5c62 MGP Closed Assignment Locking Bug Fixes
Fixes CNVS-33974

Test plan:
* As an admin, setup a grading period that is closed
* Create 2 assignments:
  1) a group assignment that is due in the closed period
  2) a moderated assignment that is due in the closed period
* Masquerade as a teacher
* Try to edit each assignment:
  1) For assignment (1), the "New Group Category" button should be
     disabled.
  2) For assignment (1), you should be able to enable peer reviews,
     automatically assign them, and set reviews per user to any number
     greater than 0. Save should work.
  3) For assignment (2), clicking the moderated grading checkbox should
     not enable the peer reviews checkbox in any browser.

Change-Id: I089e40be543531de711f816636f1fb8712b23ba8
Reviewed-on: https://gerrit.instructure.com/98348
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Tested-by: Jenkins
QA-Review: Nathan Rogowski <nathan@instructure.com>
Product-Review: Neil Gupta <ngupta@instructure.com>
2016-12-22 23:16:10 +00:00
Neil Gupta 23aa80c0c3 Use 100vw and 100vh instead of 100% for better browser support
Refs CNVS-5498

Test plan:
* As a student, submit a large image file to an assignment
* As a teacher, view that submission in Speed Grader

The image should automatically resize to fit within your browser window
in both Chrome and Safari.

Change-Id: I1cff5b99ab0aad805457b7fea8420c19ad6b7542
Reviewed-on: https://gerrit.instructure.com/98384
Tested-by: Jenkins
Reviewed-by: Derek Bender <djbender@instructure.com>
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Product-Review: Neil Gupta <ngupta@instructure.com>
2016-12-22 22:43:01 +00:00
Neil Gupta 6ac13b8326 Fix flaky 'Allow Moderator' checkbox
Fixes CNVS-33899

Test plan:
* Start creating an Assignment
* Check the 'This is a Group Assignment' checkbox
* Check the 'Require Peer reviews checkbox'
* Hover on the 'Allow moderator.... checkbox'. It should be disabled.
* Now go back and uncheck the 'Peer reviews' checkbox
* Also uncheck the 'Group Assignment..' checkbox
* Hover on the 'Allow moderator' checkbox again. It should be enabled.

Change-Id: I3325dade79451e85bae0595e60dd2df76b3eda02
Reviewed-on: https://gerrit.instructure.com/98349
Tested-by: Jenkins
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
QA-Review: KC Naegle <knaegle@instructure.com>
Product-Review: Neil Gupta <ngupta@instructure.com>
2016-12-22 22:17:44 +00:00
Jeremy Stanley f5f78ae746 preserve publish state of external tool module items on copy
test plan:
 - ensure external tool module items preserve published state
   across course copy/export/import

fixes CNVS-33928

Change-Id: Ib44a77756055b34c99f24c4d31a64f2befc507eb
Reviewed-on: https://gerrit.instructure.com/98099
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2016-12-22 20:27:36 +00:00
Deepeeca Soundarrajan 0c033edb40 spec: Add test id to modules spec and split the spec to two
Change-Id: I23855a3141f5a0996ea717433ae888938cf96568
Reviewed-on: https://gerrit.instructure.com/98212
Reviewed-by: Heath Hales <hhales@instructure.com>
Tested-by: Jenkins
Product-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
2016-12-22 20:20:55 +00:00
Neil Gupta ae5e08e927 Resize large images in speed grader
Fixes CNVS-5498

Test plan:
* As a student, submit a large image file to an assignment
* As a teacher, view that submission in Speed Grader

The image should automatically resize to fit within your browser window.

Change-Id: I81e90fba878d644092c2fed93752745590cedf75
Reviewed-on: https://gerrit.instructure.com/98241
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Derek Bender <djbender@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
QA-Review: Anju Reddy <areddy@instructure.com>
Tested-by: Jenkins
Product-Review: Keith T. Garner <kgarner@instructure.com>
2016-12-22 20:10:55 +00:00
MFairbourn 2c44bceae9 spec: fix wiki_and_tiny_teacher_wysiwyg_spec specs to run in chrome
Test Plan:
- Code review (Pedro thats you!)
- Pass Jenkins

Change-Id: I7881c52309b20c54034996b326ba898ebb8ddaf8
Reviewed-on: https://gerrit.instructure.com/98372
Tested-by: Jenkins
Reviewed-by: August Thornton <august@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2016-12-22 19:38:27 +00:00
Deepeeca Soundarrajan 116a4b8f89 spec: Add spec for new scheduler
Test Plan:
  -passes Jenkins

Change-Id: Ied9671ff1e25fcc6e3641918123431b3b79bbf60
Reviewed-on: https://gerrit.instructure.com/98307
Tested-by: Jenkins
Reviewed-by: Heath Hales <hhales@instructure.com>
Product-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
2016-12-22 19:22:26 +00:00
Anju Reddy 94058ccfb6 spec: refactoring repeated lines
Change-Id: I1d9ea2912b575f7fa395afd9f8749d4f00aab419
Reviewed-on: https://gerrit.instructure.com/98371
Tested-by: Jenkins
Reviewed-by: Cemal Aktas <caktas@instructure.com>
Product-Review: Cemal Aktas <caktas@instructure.com>
QA-Review: Cemal Aktas <caktas@instructure.com>
2016-12-22 19:19:44 +00:00
MFairbourn 700cc137e3 spec: fix fragileness add_canvas_image method
test plan:
- code review
- pass jenkins

Change-Id: If9124794cdde7d8995e5c388ca7ad466d3b44a95
Reviewed-on: https://gerrit.instructure.com/98366
Reviewed-by: Pedro Fajardo <pfajardo@instructure.com>
Tested-by: Jenkins
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2016-12-22 18:38:26 +00:00
Shahbaz Javeed 4bff2318c0 add comment text to submit and delete comment buttons for VO
closes CNVS-31561

test plan:
* Create an assignment and open it in speedgrader
* Submit a comment
* Create a draft comment
* Navigate through the comments with VO
* Each delete and submit button should include the comment text

Change-Id: I5d6af7a0f2cdb0fc5379d83246eca5046ceaecf4
Reviewed-on: https://gerrit.instructure.com/97859
Tested-by: Jenkins
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Derek Bender <djbender@instructure.com>
QA-Review: Anju Reddy <areddy@instructure.com>
Product-Review: Nathan Rogowski <nathan@instructure.com>
2016-12-22 18:18:50 +00:00
James Williams 7a953508c5 change the breadcrumb on account course filtering
test plan:
* the "Courses" link after searching for courses in an account
 should link back to the index

closes #CNVS-33926

Change-Id: I2e0fc91d2c8f645a050fdaad3ca628334a43cc02
Reviewed-on: https://gerrit.instructure.com/98141
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2016-12-22 17:33:34 +00:00
James Williams 56d089d235 don't list user_note permission when disabled
it seems to be the only thing using the :if logic but i think
we can strip it out and replace it with :account_allows

but it seems we should also not give the permission if
:account_allows is false so there's that

test plan:
* the "Manage faculty journal entries" permission should not be
 listed in the permissions page unless the faculty journal
 is enabled on the root account

closes #CNVS-33832

Change-Id: I67ff1f1f12af5fc4fb57414938554d3d3e46ad7d
Reviewed-on: https://gerrit.instructure.com/98132
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2016-12-22 15:59:29 +00:00
August Thornton 0cc647a863 spec: moar refactors due to brittle specs
Change-Id: If4e1660ec0c330fc6bd1ac5bcf1a25f4118df954
Reviewed-on: https://gerrit.instructure.com/98332
Tested-by: Jenkins
Reviewed-by: Pedro Fajardo <pfajardo@instructure.com>
Product-Review: August Thornton <august@instructure.com>
QA-Review: August Thornton <august@instructure.com>
2016-12-22 15:29:57 +00:00
Transifreq 5c7cfbad60 update ru translation
Change-Id: Ie07cf78d42b8fdced1aa640c81b5f240be4960ad
2016-12-22 05:26:34 -07:00
Transifreq 1b96ac0274 update pt-BR translation
Change-Id: I4175834ab9d8129e1feebf3262bcb9c17bdc80cd
2016-12-22 05:25:27 -07:00
Transifreq acbe6d71b3 update pt translation
Change-Id: Ibb8fae0beec13591fcfa485ba7f9b108e90ffd3c
2016-12-22 05:24:25 -07:00
Landon Wilkins 75af98699c use gergich in ruby instead of bash
fixes SD-1938

test plan:
* see that gergich still successfully comments on
  linter output on patchset 1

Change-Id: I3beecfab405e57ba0e8705821d6d297fe7423c3e
Reviewed-on: https://gerrit.instructure.com/98317
Tested-by: Jenkins
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2016-12-22 01:31:29 +00:00
Jon Jensen 741a303389 spec: remove unnecessary UI interaction
brings this down from 0:31 -> 0:18

Change-Id: I51a2997ab08634c876a55486fffbf2dff9a24831
Reviewed-on: https://gerrit.instructure.com/98342
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
Tested-by: Jenkins
2016-12-22 00:49:02 +00:00
Jon Jensen 6e9ed80dcf spec: make find_element raise again if it fails
Change-Id: I170378db6b386fe220ecc54068006b1de355c00d
Reviewed-on: https://gerrit.instructure.com/98339
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
Tested-by: Jenkins
2016-12-22 00:23:49 +00:00
Jon Jensen afd941d244 spec: break up terrible spec into little ones
total time is unchanged, but slowest spec in this (sub)group is now 6 sec
instead of 47 sec

Change-Id: I93f2533c308023e8cbf8a495921588556724e7be
Reviewed-on: https://gerrit.instructure.com/98330
Tested-by: Jenkins
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
2016-12-22 00:06:48 +00:00
Jon Jensen a4479773bd spec: refactor implicit waiting, fixes SD-1939
[ci rspec profile]

basically never use built-in implicit waiting, since it makes everything
wait (not just find_element, but attribute lookups, etc.). that means that
StaleElementProtection would automatically always take the full 15 seconds,
because that's how long we'd wait for the StaleElementReferenceError to
come back

instead roll our own, which allows those to recover almost immediately,
and prevents other unnecessary waiting. disable_implicit_wait is also
now much cheaper since it doesn't mean two ruby <-> firefox roundtrips

test plan:
1. specs should be faster, e.g.
   ./spec/selenium/quizzes/quizzes_unpublish_quiz_teacher_spec.rb:20
   now takes 10 sec instead of 25, since it always has a
   StaleElementReferenceError

Change-Id: Ice31e64a274930cdf8af4407b5632e961683cdf6
Reviewed-on: https://gerrit.instructure.com/98295
Tested-by: Jenkins
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
2016-12-22 00:06:45 +00:00
Matthew Berns 1df96a59a8 fix assignments not being moveable when group_id is not locked
fixes CNVS-33952

test plan:
- review test plan for the following commit:
  /canvas-lms/commit/00cef7fadd7fe91e8c8bb0b3eaf3f798babe6a89
- enable the frozen plugin (plugins/assignment_freezer)
- create an assignment in a master course
- enable lock the assignment after being copied
- import that content into another course
- masquerade as a teacher in the imported course
- move the assignment to a different
  group from the assignment page
- confirm assignment can also be moved from
  assignment edit page
- return the plugin setting page and enable option
  to lock assignment_group_id
- import a 2nd assignment into the course and
  masquerade as the teacher again
- the handle to move assignment to a new group
  should be disabled
- confirm assignment can also not be moved
  from assignment edit page
- disable plugin
- assignment should be moveable while logged
  in as a teacher

Change-Id: Ic154a26d75bedf3d0ffbf4e3ece7ffe65db99f72
Reviewed-on: https://gerrit.instructure.com/98283
Tested-by: Jenkins
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Reviewed-by: Michael Brewer-Davis <mbd@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
QA-Review: Alex Ortiz-Rosado <aortiz@instructure.com>
Product-Review: Michael Brewer-Davis <mbd@instructure.com>
2016-12-21 23:18:17 +00:00
Transifreq d48c902c1f update zh-Hant translation
Change-Id: I8e802a2707e3df6213c57c68a9119252e7420d6f
2016-12-21 16:27:14 -07:00
Transifreq 8410a369ef update zh-Hans translation
Change-Id: I29b3d31b73579c818882f578cbd96a4cfe985cde
2016-12-21 16:26:09 -07:00
Transifreq b2857ce4fc update ru translation
Change-Id: I3427467bacf0c3ce9d1cd4dd1910b6e2d0df7899
2016-12-21 16:24:04 -07:00
Transifreq 3e83502aea update pt-BR translation
Change-Id: I4e6d833c317d150d179be9afd53a51f124bc78d7
2016-12-21 16:22:56 -07:00
Transifreq 3ba72a122e update pt translation
Change-Id: I634b0c774613288bf91586f0a50a9af734540bef
2016-12-21 16:21:51 -07:00