Commit Graph

18249 Commits

Author SHA1 Message Date
James Williams b0c3285d8b bump switchman
fixes problems with multiple processes using incorrect connection
 schemas

closes #CNVS-25288

Change-Id: I325d430e36e6afecf8e23f582483310bbff8d93b
Reviewed-on: https://gerrit.instructure.com/67883
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2015-11-25 22:49:40 +00:00
Chris Hart 35eaedbbab Fix Calendar Month view scroll bars
Fixes: CNVS-25207

As Jacob Fugal suggested in #ui, this bug is
caused by a min-height on the .fc-row element
in the calendar plugin. Removing the min-height
fixes the bug and lets the plugin's javascript
correctly resize the calendar without
scrollbars.

Test plan:
- Open calendar at a variety of different screen
  sizes in both legacy and new UI.
- Make sure the main calendar doesn't have vertical
  scrollbars, as shown in the JIRA video.

I have tested in Chrome, Safari, Firefox, IE11 and
Edge, and on the iPad, and the fix doesn't seem to
break anything.

Change-Id: I2620204585850569d95df0a90501f43332a833e7
Reviewed-on: https://gerrit.instructure.com/67587
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Product-Review: Jennifer Stern <jstern@instructure.com>
Tested-by: Jenkins
QA-Review: Myller de Araujo <myller@instructure.com>
2015-11-25 18:35:22 +00:00
Adrian Russell 998a831c2f SPEC: 3 tests for Faculty Journal entry checkbox
Test plan:
- Run spec

Change-Id: I39c2005aa1b40794475cbeb6f5bd87f9015dd3e1
Reviewed-on: https://gerrit.instructure.com/67770
Tested-by: Jenkins
Reviewed-by: Michael Hargiss <mhargiss@instructure.com>
Product-Review: Michael Hargiss <mhargiss@instructure.com>
QA-Review: Michael Hargiss <mhargiss@instructure.com>
2015-11-25 18:19:43 +00:00
gbeckmann 9f20eef4d6 Spec: Replace large event notification spec with smaller ones
Replaced one large spec with several smaller ones, and removed
duplicate and broken logic to create and edit a second event.

Test plan:
Run specs, review refactor

Change-Id: I024c024f719ccc8a1c478bb6ca3c5b980dc505a1
Reviewed-on: https://gerrit.instructure.com/67839
Tested-by: Jenkins
Reviewed-by: Michael Hargiss <mhargiss@instructure.com>
Product-Review: Michael Hargiss <mhargiss@instructure.com>
QA-Review: Michael Hargiss <mhargiss@instructure.com>
2015-11-25 17:26:27 +00:00
Chris Hart f1c0e6145a Change primary nav modal overlay color
Fixes: CNVS-24302

Test plan:

- This is new UI only
- Go into Theme Editor and make your primary
  navigation a brand-new color. Save your
  changes.
- Leave Theme Editor and click the Courses link
  from the primary navigation
- No matter what you chose for a nav color, the
  overlay when the navigation drawer is open
  should be black at 50% opacity:
  rgba(0,0,0,0.5)
  http://screencast.com/t/Vw4G6dIO2xcX

Change-Id: I29e9a22ab1ec12e8dd7de4618d9dd0da41ad4fd2
Reviewed-on: https://gerrit.instructure.com/67511
Tested-by: Jenkins
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Product-Review: Jennifer Stern <jstern@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
2015-11-25 14:26:36 +00:00
Davis McClellan 800b871162 Ensure that anonymous surveys remain anonymous
fixes CNVS-24633

test plan:
1. Statistics
- answer an anonymous survey as a student
- as a teacher go to the quiz statistics page and expand the questions
- ensure that none of the questions have the student's name on them

2. Submissions
- answer an anonymous survey as a student
- as a teacher go to:
  /courses/:course_id/assignment/:assignment_id/submissions/:student_id
- should get "This student's responses are hidden because this
  assignment is anonymous." message

Change-Id: I94e08d0ad1293240ac9722a94d3365ed53ca5f7d
Reviewed-on: https://gerrit.instructure.com/67629
Tested-by: Jenkins
Reviewed-by: Ryan Taylor <rtaylor@instructure.com>
QA-Review: Michael Hargiss <mhargiss@instructure.com>
Product-Review: Jason Sparks <jsparks@instructure.com>
2015-11-25 00:16:56 +00:00
Davis McClellan e24b6193e9 fix sanitization errors in quiz statistics
fixes CNVS-25000

test plan:
- create a quiz with an essay question
- answer the question as a student using '<' and'>'
  ex. "<> < > WHERE rental_duration >= 6 AND rating <> 'R' 1 < 3 > 2"
- as teacher download the student analysis report, ensure that
  answer is the same as what was input

Change-Id: I5575b2398ba983bd8fd3d61bbfa116053b3f6c15
Reviewed-on: https://gerrit.instructure.com/67124
Tested-by: Jenkins
Reviewed-by: Ryan Taylor <rtaylor@instructure.com>
QA-Review: Rajkumar Kethavath <rkethavath@instructure.com>
Product-Review: Jason Sparks <jsparks@instructure.com>
2015-11-25 00:05:33 +00:00
Sterling Cobb 3ae86f74b1 fix ally issue with icon on moderated grade page
fixes CNVS-25201

After an assignments grades have been posted via moderated grades,
there is an attention icon that shows up. The screenreader picks this
icon up in screenreaders. We want to hide this.

Test Plan
Set up an assignment for moderated grading
Post the grades with reviewers
With a screenreader in safari (VO) navigate to the attention alert box
The alert text should be read, however the 'i' icon should be invisible
to screenreaders

Change-Id: If8f3e48ef9565eba6e2f4cab142f783492765c94
Reviewed-on: https://gerrit.instructure.com/67739
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Sterling Cobb <sterling@instructure.com>
2015-11-24 23:32:22 +00:00
Jeremy Putnam 72e445c93e spec: add tiny-mce background color button check
Change-Id: Ic33b2fea44f67d453b4b66e54e8e1bc593656832
Reviewed-on: https://gerrit.instructure.com/66500
Tested-by: Jenkins
Reviewed-by: Derek Hansen <dhansen@instructure.com>
Product-Review: Derek Hansen <dhansen@instructure.com>
QA-Review: Derek Hansen <dhansen@instructure.com>
2015-11-24 23:25:08 +00:00
Davis McClellan 52e3c5cb84 Make close of the assignment group modal consistent
fixes CNVS-24968

test plan:
- edit an assignment
- select "[New Group]" from the assignment groups dialog
- click the 'x' or click `esc` to close the modal
- ensure that the "[New Group]" does not remain on the
  assignment groups dialog

Change-Id: Ibac22923de7503a6b8fe6b6b28abc4dcb1306ea6
Reviewed-on: https://gerrit.instructure.com/67645
Reviewed-by: Matt Berns <mberns@instructure.com>
Tested-by: Jenkins
QA-Review: Michael Hargiss <mhargiss@instructure.com>
Product-Review: Jason Sparks <jsparks@instructure.com>
2015-11-24 23:00:45 +00:00
Joel Hough 0d5fd23f4c assume text/plain for incoming mail with unspecified content-type
fixes CNVS-24061

test plan
- reply to a replyable notification from canvas with an email that
 lacks a Content-Type header (you'll have to use an email client
 with pretty low-level email fiddling capabilities, like a rails
 console)
- ensure that canvas accepts the message and posts the reply

Change-Id: Id1b4485c4adf0cb5a6f39b261d7975d1b2ef499f
Reviewed-on: https://gerrit.instructure.com/66426
Tested-by: Jenkins
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2015-11-24 22:45:55 +00:00
James Williams 373887a671 fix no-op i18n calls
Change-Id: I4398966a3bc37b8cdec416ed7867ea5af65b5036
Reviewed-on: https://gerrit.instructure.com/67766
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2015-11-24 21:19:33 +00:00
gbeckmann 9295df6a25 Spec: remove duplicate appointment group notification specs
Remove duplicated specs, add test rail ids, and fix one spec that
was testing the wrong action.

Test plan:
Run specs, review organization

Change-Id: I4e8e4c989e92d1b0ccf6a0abd7383742787b3834
Reviewed-on: https://gerrit.instructure.com/67819
Tested-by: Jenkins
Reviewed-by: Derek Hansen <dhansen@instructure.com>
Product-Review: Derek Hansen <dhansen@instructure.com>
QA-Review: Derek Hansen <dhansen@instructure.com>
2015-11-24 21:16:31 +00:00
Michael Hargiss 79733a628e spec: add caturday regression specs
Test Plan:
- pass Jenkins
- check for errors
- make sure new test_ids match up to existing test cases in TestRails

Change-Id: Iec3d96c7b34118d4582a27bfe4e1d03c3ab42a78
Reviewed-on: https://gerrit.instructure.com/67743
Tested-by: Jenkins
Reviewed-by: Derek Hansen <dhansen@instructure.com>
Product-Review: Michael Hargiss <mhargiss@instructure.com>
QA-Review: Michael Hargiss <mhargiss@instructure.com>
2015-11-24 20:39:05 +00:00
Jeremy Stanley b523f29c10 improve speedgrader moderation tab keyboard accessibility
test plan:
 - set up a moderated grading assignment with one or more
   students in the moderation set
 - as a moderator looking at speedgrader, ensure the following:
   1. you can focus a moderation tab via the Tab key, and the
      focused tab will contain underlined text, similar to the
      Course Settings page
   2. the arrow keys can be used to change which tab is
      selected. as the selected tab changes, the correct
      provisional grade should be shown below.
   3. you can press Tab to move focus to the "Select" button
      to select a provisional grade, and then press the
      space bar to select the grade. focus should remain
      on the tab, so you can arrow over to a different tab.
   4. you should be able to press Tab to move to the
      "Add Review" link, press the space bar, and operate
      that menu with the keyboard.

fixes CNVS-25141 CNVS-25148 CNVS-25149

Change-Id: Icb4b0b6d270c7aa48e58897c21a5b17abeafade5
Reviewed-on: https://gerrit.instructure.com/67635
Reviewed-by: James Williams  <jamesw@instructure.com>
Tested-by: Jenkins
QA-Review: Ryan Allen <rallen@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2015-11-24 20:30:40 +00:00
Simon Williams a1e7f57c56 webpack tests
closes CNVS-24966

change js specs to work with web pack.
update some dependency references, make some aliases
for external dependencies to get the right version,
and clean up a bunch of leaky state.

TEST PLAN:
js tests should pass in web pack _and_ requires

Change-Id: If37fbce93e7e67021d90bacb470ffc4f1b17402d
Reviewed-on: https://gerrit.instructure.com/66309
Tested-by: Jenkins
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
Product-Review: Ethan Vizitei <evizitei@instructure.com>
2015-11-24 18:40:58 +00:00
James Williams 779b164831 include student submission comments in provisional comments
test plan:
* with a moderated assignment, as a student,
 create a submission and add a comment
* view the submission in speedgrader as
 a provisional grader
* should see the student's comments

closes #CNVS-25212

Change-Id: I393d40e98fd59e7b7ca387daa68818ea5ec9ac62
Reviewed-on: https://gerrit.instructure.com/67609
QA-Review: Clare Strong <clare@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
Product-Review: Cosme Salazar <cosme@instructure.com>
2015-11-24 18:37:12 +00:00
James Williams 870b2abbc9 handle rails 4 flash hashes in session for rails 3
closes #CNVS-20688

Change-Id: Icb9963f78bddb08e014ac480e9eefd030704aea8
Reviewed-on: https://gerrit.instructure.com/67729
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2015-11-24 17:55:09 +00:00
Michael Hargiss e276d20bcc spec: cleanup groups_pages, quizzes specs
Test Plan:
- pass Jenkins
- check for errors

Change-Id: I1306bbaef56a945f98dea6361f33e7515071e346
Reviewed-on: https://gerrit.instructure.com/67624
Tested-by: Jenkins
Reviewed-by: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Taylor Wilson <twilson@instructure.com>
Product-Review: Michael Hargiss <mhargiss@instructure.com>
QA-Review: Michael Hargiss <mhargiss@instructure.com>
2015-11-24 17:28:16 +00:00
Ryan Taylor 7511fdfb2f Restrict when results are available at the QSQ API endpoint
Prevents access according to quiz settings.

Closes CNVS-25204

Test Plan:
  - Attempt to access hidden quiz results via API endpoints
  - Confirm that no access is granted and all question content is hidden
    from students

Change-Id: Ia88fb748fe140782aca21204c0d7b6024add0302
Reviewed-on: https://gerrit.instructure.com/67560
Tested-by: Jenkins
Reviewed-by: Davis McClellan <dmcclellan@instructure.com>
QA-Review: Michael Hargiss <mhargiss@instructure.com>
Product-Review: Jason Sparks <jsparks@instructure.com>
2015-11-24 17:25:14 +00:00
James Williams de99175437 show message if terms are not accepted
test plan:
* create a new user with a login
* try to login as the user
* at the terms of use form, try to submit
 without checking the "I agree" box
* it should pop up with an error

closes #CNVS-25286

Change-Id: Icab93ec1aac091368cb9e58d3533b995707885a5
Reviewed-on: https://gerrit.instructure.com/67769
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2015-11-24 17:21:03 +00:00
Matthew Wheeler 88b10d456a Don't list non-favorite courses with concluded courses
Fixes CNVS-24732

Test Plan:
See repro steps/expected behavior on ticket

Change-Id: I9973a2798a1df129f75ea9ddfafe36e27ef8b085
Reviewed-on: https://gerrit.instructure.com/67453
Reviewed-by: Andrew Butterfield <abutterfield@instructure.com>
Tested-by: Jenkins
QA-Review: Adrian Russell <arussell@instructure.com>
Product-Review: Allison Weiss <allison@instructure.com>
2015-11-24 17:18:52 +00:00
Clay Diffrient 47f17dd97d Change tooltip wording on files toolbar
During the transition to JSX this change was lost :(
Originally it was done as part of this: https://gerrit.instructure.com/#/c/66197/

closes CNVS-24686

Test Plan:
  - Go to files
  - The tooltip in the toolbar for restricted access should say
    manage access instead

Change-Id: I14e2cd220253e1c305aeb488d1d4b9d092704e2d
Reviewed-on: https://gerrit.instructure.com/67759
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
2015-11-24 17:10:33 +00:00
John Corrigan a6849f84d7 assignment group API includes submission information
fixes CNVS-21989

- Moves submissions_hash from AssignmentsApiController to
  Api::V1::Assignment module.
- Adds `submission` flag to index & show assignment groups api
  controller actions.

test plan:
- Have an assignment group including assignments that have submissions
  for a given user, and those that do not.
- Hit the index & show actions without any flags to make sure endpoints
  still behave as expected.
- Hit the index & show actions with the `assignments` flag to make sure
  assignmetns without the submission flag are still returned & behave as
  expected.
- Hit the index & show actions with the `assignments` & `submission`
  flag and observe that a submission object is returned for assignments
  that have a submission for the given user, and that submission objects
  are not returned for assignments without submissions for the given user.
- Hit the index & show actions with only the `submission` flag and make
  sure that neither assignments non submissions are returned (the
  `submission` flag is a noop without also providing the `assignments`
  flag).

Change-Id: I5d216a7caa65c69e0a3c219abcbe9132b6a567aa
Reviewed-on: https://gerrit.instructure.com/67010
Tested-by: Jenkins
Reviewed-by: Matt Berns <mberns@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Brandon Pluim <bpluim@instructure.com>
2015-11-24 16:40:35 +00:00
Cody Cutrer 78f5d855de fix sorting of enrollment invitations in rails 4
fixes CNVS-25295

rails 4 type casts columns coming back from the db that don't
actually correspond to columns, so we don't have to .to_s
things

test plan:
 * be enrolled in a course
 * enable open registration
 * invite your user to a course (by e-mail address; it should
   create a temporary user)
 * you should see the invitation on your dashboard

Change-Id: I78cfea30583117d2faa62dc638dbab02ccf2f696
Reviewed-on: https://gerrit.instructure.com/67733
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Tested-by: Jenkins
Product-Review: Cody Cutrer <cody@instructure.com>
2015-11-24 15:59:26 +00:00
Cameron Matheson a6fc65268d fix Submission#attachments
fixes CNVS-25271
fixes CNVS-25273

Test plan:
  * enable crocodoc
  * disable canvadocs
  * submit a crocodocable assignment
  * enable canvadocs (with annotations)
  * re-submit the assignment (with an attachment)
  * in speedgrader, you should get a crocodoc preview through canvadocs
  * there should be no warnings about crocodoc still processing the doc

Change-Id: Id000354bf4c297a8cd7059b3cd220cb30ff532d7
Reviewed-on: https://gerrit.instructure.com/67742
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Josh Simpson <jsimpson@instructure.com>
2015-11-24 00:36:23 +00:00
Ryan Taylor 43c821cb61 Fix scaling of the score for quiz results in the LMGB
Closes CNVS-23803

Test Plan:
  - Create a quiz with a question bank linked outcome
  - Confirm that student scores on the quiz outcome content (1/2, 3/4...
    etc) are properly scaled to the scale of the associated
    outcome/rubric

Change-Id: I8178de9031f54201b97aa642dc99ba661e3f6074
Reviewed-on: https://gerrit.instructure.com/64526
Tested-by: Jenkins
Reviewed-by: Davis McClellan <dmcclellan@instructure.com>
QA-Review: Landon Holmstead <lholmstead@instructure.com>
Product-Review: Ryan Taylor <rtaylor@instructure.com>
2015-11-23 23:19:38 +00:00
Matthew Berns 0333bf0c24 fix 500 error when submitting a quiz preview with an access code
fixes CNVS-25248
refs CNVS-23643

test plan:
- as a teacher, log into a course
- attempt submit a preview for a quiz with an access code
- you should be able to do it

Change-Id: I86cc9cdcf8a89303f27d1a2b9b7f71f8a065b1cf
Reviewed-on: https://gerrit.instructure.com/67699
Reviewed-by: Davis McClellan <dmcclellan@instructure.com>
Tested-by: Jenkins
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Ryan Taylor <rtaylor@instructure.com>
2015-11-23 19:38:57 +00:00
Dan Minkevitch 73255caf36 Fix Add Review dropdown in Speedgrader
Clicking on 'add review' will now have the dialog box show correctly.

Fixes CNVS-25088

* Have student assignment submitted.
* Have a TA grade the assignment
* As a teacher, go to speed grading
* Click "Add Review"
* You should see all dropdown options stay on the screen.

Change-Id: I3ca58eb96ae79be8b0fc2012eae8231efa50eb74
Reviewed-on: https://gerrit.instructure.com/67625
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Dan Minkevitch <dan@instructure.com>
2015-11-23 18:25:37 +00:00
Jon Jensen 769d08aba1 spec: add missing require
fixes sporadic rails4 failures

otherwise there's no guarantee GroupsCommon will be around (depending on
which other specs are loaded by the executor)

Change-Id: I9597a3210bf71338329e59a63f5149ebcd7c41a3
Reviewed-on: https://gerrit.instructure.com/67692
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins
2015-11-23 17:41:53 +00:00
James Williams aa9af7c96a don't check for avatar service enabled unless needed
improves performance on user_json

closes #CNVS-25270

Change-Id: Ib18d8570dabb3aa7f50571280ab93c269b0adb21
Reviewed-on: https://gerrit.instructure.com/67691
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2015-11-23 17:38:15 +00:00
Keith Garner f9e34b77e9 show correct submission in speedgrader sidebar
Fixes an off-by-one error related to submission select introduced in
an earlier change.

fixes CNVS-25244

test plan:

 o Create an assignment with the file upload option and other options
   intact
 o As a student, submit to the assignment using the file upload option
 o Re-submit to the same assignment using the text entry option
 o Open speedgrader as the instructor, and notice the file upload
   submission is marked as the most recent submission
 o View the previous submission, and notice no submission is visible.

Change-Id: Ia166d05ed730f8e737339762ed6d4d05f5a6e58d
Reviewed-on: https://gerrit.instructure.com/67656
QA-Review: Derek Hansen <dhansen@instructure.com>
Reviewed-by: Derek Bender <djbender@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
Tested-by: Ethan Vizitei <evizitei@instructure.com>
2015-11-22 02:09:37 +00:00
Spencer Olson 607d430a4d load scores faster on grades page
test plan:
 * navigate to the /grades page as:
  - a student enrolled in at least 2 courses
  - an observer observing at least 2 students
    in different courses
  - a teacher teaching at least 2 courses
 * verify the page loads in the cases
   listed above

Change-Id: Ic08e810034da89d7c2ecb4299a72ccbabdd26e64
Reviewed-on: https://gerrit.instructure.com/67652
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Tested-by: Jenkins
QA-Review: Derek Hansen <dhansen@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2015-11-21 19:48:12 +00:00
Jacob Fugal 4f6ab560ad restore styling for completed events in calendar
fixes CNVS-25242

test-plan:
 [as a student]
 - have an assignment with a due date so it shows up on the calendar
 - make a submission for the assignment
 - look at the assignment on the calendar
 - it should show dimmed and with a strikethrough

Change-Id: I24e3b689138028355fb3eb69c5bec22865f7de3d
Reviewed-on: https://gerrit.instructure.com/67647
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: Derek Hansen <dhansen@instructure.com>
Tested-by: Jenkins
Product-Review: Rob Orton <rob@instructure.com>
2015-11-21 18:20:21 +00:00
Davis McClellan 3d82d4b273 Fix OQAAT regression for access codes
fixes CNVS-23169
refs CNVS-25241

test plan:
- take a OQAAT quiz with an access code
- navigate with the sidebar
- shouldn't ask for the access code each time

Change-Id: I2bbbef8ed94956b2961baaa6251d92f0d6f29974
Reviewed-on: https://gerrit.instructure.com/67648
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Reviewed-by: John Corrigan <jcorrigan@instructure.com>
QA-Review: Derek Hansen <dhansen@instructure.com>
Tested-by: Jenkins
Product-Review: John Corrigan <jcorrigan@instructure.com>
2015-11-21 18:13:43 +00:00
Cameron Sutter fb5ecafdeb calendar events as observee
closes MBL-4905

test plan:
- as an observee or admin
- after making a POST to /users/self/observees as a parent with the
  student's token as the access_token
- query the /users/:user_id/calendar_events endpoint just as you would
  the /calendar_events endpoint but make sure the user is the parent
  and the :user_id is the student's id
- it should return all the things the /calendar_events endpoint
  returns for that student

Change-Id: Ib9f9d8f3fb51e9bc240c12f383a3cc86fcc3cd2c
Reviewed-on: https://gerrit.instructure.com/66321
QA-Review: Ben Kirato <benk@instructure.com>
Tested-by: Jenkins
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
Product-Review: Cameron Sutter <csutter@instructure.com>
2015-11-21 00:18:50 +00:00
Cody Cutrer 6ee3f9c14e Merge branch 'jobs_api' of git://github.com/grahamb/canvas-lms into grahamb-jobs_api
Change-Id: I7dc6131446e270656005051fc338ada00f0ebcb3
Reviewed-on: https://gerrit.instructure.com/65539/
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: August Thornton <august@instructure.com>
2015-11-20 16:26:34 -07:00
Rob Orton 4248b98f9f fix include_deleted parameter to be boolean
refs CNVS-24290

test plan
 - pass include_deleted to account reports
 - use true and false and make sure they work

Change-Id: Ia5db2a61931ec1043c808f55178971236e398510
Reviewed-on: https://gerrit.instructure.com/66923
Tested-by: Jenkins
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2015-11-20 22:48:54 +00:00
James Williams 353d1fd7aa ensure common context_stream_item_key between rails 3 and 4
fixes a problem where context stream items were not being
invalidated correctly for rails 4

test plan:
* set up an environment with a server running with rails 4
and delayed_jobs running with rails 3, and a redis cache store
* create a published course with an active student
* create and publish a new assignment
* confirm that the "recent activity" dashboard on the course
 shows the new assignment message for the student

fixes #CNVS-25139

Change-Id: I555f7e082faf5d6f9d933b82cf7f7eec2d1c8fa6
Reviewed-on: https://gerrit.instructure.com/67575
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
QA-Review: August Thornton <august@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2015-11-20 21:16:43 +00:00
Mark Severson 0af1e667c8 remove sis sync status from gradebook
test plan:
 * the sync status should not be shown in the gradebook's section list
   * test with the 'Post Grades to SIS' feature enabled
   * test with a post grades lti tool installed

fixes SIS-1550, SIS-1552

Change-Id: I7dffafc9d1b2cddb397b7656db868c439d59e5ea
Reviewed-on: https://gerrit.instructure.com/67377
Tested-by: Jenkins
Reviewed-by: Andrew Butterfield <abutterfield@instructure.com>
Reviewed-by: Max Stahl <mstahl@instructure.com>
Reviewed-by: Nick Houle <nhoule@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Ken Romney <kromney@instructure.com>
2015-11-20 20:58:33 +00:00
Cameron Sutter b15408cb2a missing submissions endpoint
fixes MBL-5161

test plan:
- send a POST to /users/self/observees as a parent with the
  student's token as the access_token
- as the parent, send a GET to /users/:student_id/missing_submissions
- it should return any assignment due in the past that does not have
  a submission for the student

Change-Id: Idb2bcc3c76ab67d16e18b90f043e3be96f4b8872
Reviewed-on: https://gerrit.instructure.com/67403
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
QA-Review: Ben Kirato <benk@instructure.com>
Product-Review: Cameron Sutter <csutter@instructure.com>
2015-11-20 19:16:42 +00:00
Matthew Berns 85af1f321d prevent gray details box from appearing if not needed
closes CNVS-24957

test plan:
- create an assignment, discussion, and quiz with none of the following:
  -Due Date
  -Lock Date
  -Unlock Date
  -Grading Type
  -Points Possible
  -Submission Type
- the gray details box should not appear in the ePub for these items

Change-Id: I26bf7e889ae54fae62653d9c10de6f435e2577be
Reviewed-on: https://gerrit.instructure.com/66926
Tested-by: Jenkins
Reviewed-by: John Corrigan <jcorrigan@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Cosme Salazar <cosme@instructure.com>
2015-11-20 18:39:59 +00:00
Spencer Olson 36e1315cf2 gradebook history api: ignore deleted submissions
the 'feed' action in the gradebook history api
controller will no longer error due to submissions
being deleted.

closes CNVS-25114

test plan:
* hit the gradebook_history_api_controller#feed
  and verify you get back a list of submissions
* pick any one of the submissions from the list,
  and delete it. you will need to do this via the
  rails console. if you want to delete a submission
  with id 5, this would look like:
    Submission.find(5).destroy
* hit the gradebook_history_api_controller#feed
  again, and verify you get back a list of
  submissions. before this fix, this api call
  would return an error.

Change-Id: I9dfaa270a8d0fae8150fc0c36f8343887c2c5d18
Reviewed-on: https://gerrit.instructure.com/67370
Tested-by: Jenkins
Reviewed-by: Strand McCutchen <smccutchen@instructure.com>
QA-Review: Jason Carter <jcarter@instructure.com>
Product-Review: Spencer Olson <solson@instructure.com>
2015-11-20 16:54:28 +00:00
Keith Garner 3706d2b54b speedgrader remains at top when switching quiz submissions
When you update a score on a quiz question and then click "Update
Scores" the page refreshes and automatically scrolls to the question
again. When you navigate to another submission it will not scroll to
the same question, but remain at the top.

fixes CNVS-19438

test plan:
 - Create a quiz that has enough questions to require scrolling in the
   SpeedGrader
 - Have at least 2 students take the quiz
 - Go into SpeedGrader for the quiz
 - Edit a student's score for a question and click the Update Scores
   button at the bottom.
 - The page should refresh and scroll you to the question you updated.
 - Navigate to any other submission, notice it does not auto-scroll

Change-Id: I454c5976c3c64645b5d85d3bec11aab31a756d3d
Reviewed-on: https://gerrit.instructure.com/67408
Tested-by: Jenkins
Reviewed-by: Spencer Olson <solson@instructure.com>
QA-Review: Jason Carter <jcarter@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2015-11-20 15:50:40 +00:00
Jacob Fugal 8a604e9821 still set originalStart when start is absent
fixes CNVS-25122

set it to null, instead of skipping the assignment

test-plan:
 - create an dated event (start is present)
 - edit the event to make it undated (start becomes absent)
 - after event is saved to server, it should properly move to the
   undated section of the page

Change-Id: I6a7dc6d60d6ef072b6785f373feb13bb01cebcfa
Reviewed-on: https://gerrit.instructure.com/67548
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
Tested-by: Jenkins
QA-Review: Derek Hansen <dhansen@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
2015-11-20 03:48:14 +00:00
Deepeeca Soundarrajan 7826e879a8 spec: Add specs for quizzes hierarchy
Change-Id: Ia5e68149ef7c2ef69d7fcd905bc16f0fbc180673
Reviewed-on: https://gerrit.instructure.com/67527
Tested-by: Jenkins
Reviewed-by: Derek Hansen <dhansen@instructure.com>
Product-Review: Derek Hansen <dhansen@instructure.com>
QA-Review: Derek Hansen <dhansen@instructure.com>
2015-11-19 23:58:40 +00:00
Jeremy Stanley 2726666b1c add advisory text to disabled checkbox's label
test plan:
 1. enable moderated grading feature in a course
 2. create an assignment and check the "require peer reviews" box
 3. note the hover text when you mouse over the "moderated grading"
    checkbox ("cannot be enabled for peer-reviewed assignments")
 4. note that a screenreader-only span containing the same text
    was appended to the checkbox's label so that screenreaders
    will explain why the setting is disabled

fixes CNVS-25048

Change-Id: I01f661f899c3d61ca337238979174d01316fb0b6
Reviewed-on: https://gerrit.instructure.com/67357
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2015-11-19 23:52:13 +00:00
Clay Diffrient 3047ed1cef Update styleguide for React 0.13.3
fixes CNVS-25159

Test Plan:
  - Go to /styleguide
  - The styleguide should function as expected
  - There should be no React related errors/warnings in the
    console.

Change-Id: I9c9891b9c170e4c0675b110a6b41fe59814b60f3
Reviewed-on: https://gerrit.instructure.com/67486
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Tested-by: Jenkins
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
2015-11-19 21:02:08 +00:00
James Williams 41fb99328c show group activity in course activity log
also I18n the index page titles

also log files index access

test plan:
* make sure page views are enabled
* create a course with a student
* add the student to a group
* create group discussions for the course
* participate in group discussions and
 other group content

* as a teacher/admin, visit the students
 "Access Report" (through their course profile page)
* activity in the group should
 show up as entries in the access report

closes #CNVS-10973

Change-Id: I35bd16dbcd3b0943a5f2cea031c97e6850030286
Reviewed-on: https://gerrit.instructure.com/67476
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Ryan Allen <rallen@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2015-11-19 20:45:36 +00:00
Jeremy Stanley 3683d906eb fix docs for "Show provisional grade status"
test plan:
 - render docs
 - the endpoint should be documented
 - the example_request URL should be correct

fixes CNVS-25121

Change-Id: Ia1bfd85da0a02aee095f28c36f2faddc3f19c7e5
Reviewed-on: https://gerrit.instructure.com/67399
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2015-11-19 20:35:09 +00:00