Commit Graph

7471 Commits

Author SHA1 Message Date
Bracken Mosbacker 1da8ffad6d pre-populate start/end dates in new migration UI if possible
If the new or old course has start/end dates, they will be
pre-populated in the date shift form

Test Plan:
 * with a course that has start/end dates and with one that doesn't:
   * go to migration page
   * view date shift forms for any type; there should dates or no dates as expected for the course, and no error
   * for a course copy type, choose courses with/without start/end dates
   * the date shift fields should populate/clear as appropriate

closes CNVS-7241

Change-Id: I0f427da5962c945314fd5efd19f543adec8cbb3a
Reviewed-on: https://gerrit.instructure.com/22815
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
QA-Review: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-08-01 18:37:01 +00:00
Landon Wilkins 366857fdb6 quick sinon-patch tweak to fix cascading request processing
fixes failing specs in RandomlyAssignUsersViewSpec

also comments out some failing specs in TopicSpec
  and admin settings spec

also fixes the 404 spec error

Change-Id: I3de289c9731bced52c227c92c28ae61ba4981085
Reviewed-on: https://gerrit.instructure.com/22839
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2013-08-01 18:22:31 +00:00
Mark Ericksen e90d764623 ensure @domain_root_account is set on error pages
refs CNVS-6888

testing notes:
* on a 404 or 500 page, the terms/privacy links
  should still show in the footer

Change-Id: Ia47ccccc4f7b8d7f7912c278a26a34f3b79eedc0
Reviewed-on: https://gerrit.instructure.com/22844
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Mark Ericksen <marke@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
Tested-by: Mark Ericksen <marke@instructure.com>
2013-08-01 16:40:09 +00:00
Brad Humphrey 00bb64f854 enable a borderless LTI launch without canvas navigation
Test Plan
  * create a tool
  * launch it using '/courses/:course_id/external_tools/retrieve?url=:launch_url&borderless=1
  * The tool should launch without any canvas navigation

Change-Id: I69c48d35876594f72f5b7f96f5013c72b13fe551
Reviewed-on: https://gerrit.instructure.com/22736
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
Reviewed-by: Mark Severson <markse@instructure.com>
Product-Review: Brad Humphrey <brad@instructure.com>
2013-08-01 16:19:49 +00:00
James Williams 05f42cd94f fix day_substitutions setting for content migration forms
test plan:
* run a content migration, checking the box to
 "adjust events and due dates" and adding day
 substitutions
* confirm that the day substitutions work

fixes #CNVS-7230

Change-Id: If07cc577f0619de7e277550592b275ec96ea96d9
Reviewed-on: https://gerrit.instructure.com/22817
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
2013-08-01 00:13:00 +00:00
Brian Palmer 5cb135741a statsd: escape "." to avoid creating graphite folders
The redis_name is usually a fqdn, which was creating very annoying
folder structures

Change-Id: If8aecd3a523673321406fedc8769a92eee6d1a78
Reviewed-on: https://gerrit.instructure.com/22744
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
2013-07-31 21:45:50 +00:00
Brian Palmer 9835a23678 switch to rails lts for continuing rails 2.3 support
closes CNVS-7093

the changelog from rails 2.3.18 is at https://github.com/makandra/rails/commits/2-3-lts
so far it's mostly packaging changes, with explict config options to opt
out of some stuff like enable_xml_parsing

test plan:
* without RAILS_LTS file, specs should pass, general regression testing
* ditto with RAILS_LTS file pointing at the private gem repo (ask for
  creds, we aren't allowed to share them publicly)

Change-Id: I3526c57ce5769dd73c84ffe8055fa084874b2bd5
Reviewed-on: https://gerrit.instructure.com/21654
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
2013-07-31 21:43:17 +00:00
Mark Ericksen 44f098c431 apply group conditions after sharding applied
fixes CNVS-7183

test steps ensure CNVS-6975 works correctly

testing notes:
- create a user that is a member of an account level group and a
  course level group
- using the api (api/v1/users/self/groups), ensure that all groups
  are returned
- ensure that only the account level group is returned when the
  context_type parameter is set to 'Account'
- ensure that only the course level group is returned when the
  context_type parameter is set to 'Course'
- ensure that the user's group index page works as it did before

Change-Id: I782e90eb629e272ed2ed5c868e18713735857bb4
Reviewed-on: https://gerrit.instructure.com/22799
Reviewed-by: Joel Hough <joel@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-07-31 21:31:16 +00:00
Mark Ericksen c8414e19ee add root account setting for custom terms/privacy
fixes CNVS-6888

testing steps:
* from a console, set a custom privacy and terms url
  Setting.set('privacy_policy_url', 'http://custom.example.com/privacy')
  Setting.set('terms_of_use_url', 'http://custom.example.com/terms')
* verify the following location all display the new links:
  * <canvas>/enroll/<join_code> - with self_enrollments enabled for
    the course and currently logged out
    * when self registration is disabled at the root account,
      will be prompted to authenticate, "View Privacy Policy"
    * when self registration is enabled at the root account,
      will be prompted to authenticate or register, "View Privacy Policy"
    * when logged in as a teacher, prompted to confirm enrollment
      "View Privacy Policy"
  * <canvas>/register_from_website  - when logged out
    * page footer links for "Terms of Use" and "Privacy Policy"
    * "I'm a teacher", both links at bottom of dialog
    * "I'm a student", both links at bottom of dialog
    * "Parents sign up here", both links at bottom of dialog
  * <canvas>/accounts/<id>/users - click "Add a New User" from
    the right sidebar. "View Privacy Policy" in modal dialog.

Change-Id: Ic80c369dcea8483c93fb8adfcd9a80c1d6d3ad6a
Reviewed-on: https://gerrit.instructure.com/22712
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
2013-07-31 18:26:54 +00:00
Mark Severson a861300693 fix pages api to not return the body of a locked page
test plan:
 - as a student
 * query the pages api for a page that is currently locked
 * ensure the response payload does not include the page body

fixes CNVS-7211

Change-Id: I2a073e9d8a3703b63ff3492cddcef893043c1380
Reviewed-on: https://gerrit.instructure.com/22737
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2013-07-31 17:21:00 +00:00
Braden Anderson 079095a713 conversations: course filter
fixes CNVS-6402

test plan:
  * open conversations beta page
  * choose options from course and scope dropdowns
  * verify that the messages are constrained by their intersection
  * verify that changing your filters updates your URL
  * verify that refreshing/bookmarking/sharing URLS keeps state
  * verify that the course filter includes non-favorite courses
  * verify that you can filter the message list by a non-favorite course
  * verify that the "More Courses" list excludes favorite courses
  * verify that the current course filter display at the top of the
    messages list is updated with the current course name and code
  * verify that the current course filter display is present but empty
    if "All Courses" is selected
  * verify that the styling matches the spec, aside from
      different optgroup formatting

Change-Id: Ie3215096ac2410b77be81e2f9dad44ea1ac0d98e
Reviewed-on: https://gerrit.instructure.com/22675
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Product-Review: Zach Pendleton <zachp@instructure.com>
2013-07-31 16:07:34 +00:00
Brandon Broschinsky 530edcb631 additional partner data on kaltura upload
--test plan
upload or record file via tinyMCE media widget
additional partner_data should be available on kaltura
should include sis_course_id, sis_user_id where applicable
and also a context_source including where media uploaded from
fixes PS-321

Change-Id: Id32a0c72ef93e41991e8ee8b6234d36d5c02893a
Reviewed-on: https://gerrit.instructure.com/22607
QA-Review: Adam Phillipps <adam@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Brandon Broschinsky <brandonbr@instructure.com>
2013-07-31 15:49:28 +00:00
Christina Chang cc91892353 render href link in collaboration email template 2013-07-31 09:39:21 -06:00
Cody Cutrer a2ed19fc2f cancel messages against the correct shard
refs CNVS-7177

Change-Id: I341eb1bed07a6d7d1e42ba9114510a1827a5b445
2013-07-31 09:38:33 -06:00
Bracken Mosbacker 01eb2ebe52 separate announcements/topics in selective migration UI
Don't list announcements in the discussion topic are of the
selective content pop-up in the new UI

Also don't show deleted items in that UI

Test Plan:
 * create an announcement
 * it shouldn't show up under discussion topics in selection UI
 * create a discussion/assignment/wiki/whatever/etc.
 * delete that item
 * it shouldn't show up in selection UI

closes CNVS-7227

Change-Id: I4190e0b450ee3474d80b37cdba46a50a070450c3
Reviewed-on: https://gerrit.instructure.com/22772
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-07-30 21:07:43 +00:00
James Williams 9b2bf3ffeb more miscellaneous accessibility fixes
test plans:

CNVS-6520
* on course settings, sections tab:
 confirm that using the Tab key changes focus
 from left to right

CNVS-6527
* on course settings, apps tab:
 inspect html of the "Extensions" header and confirm
 that it is not followed by an empty '<th>&nbsp;</th>'

CNVS-6614
* on the course front page, (if set to the wiki, module, or
syllabus) inspect the course title element, confirm that
it is now a <div> tag instead of an <h2> tag (but
otherwise appears the same)

CNVS-6617
* on the syllabus page, when triggering the 'Jump to Today'
link using the keyboard, confirm that focus is set to the
destination date's link

fixes #CNVS-6520 #CNVS-6527 #CNVS-6614 #CNVS-6617

Change-Id: If099e7bcaeb280329ccd66cb1b01a26f54453a1d
Reviewed-on: https://gerrit.instructure.com/22329
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
2013-07-30 20:12:13 +00:00
Bracken Mosbacker d1651922c4 add link to source course in new migration ui
adds a column to the new migration UI that has a link to
either the uploaded file or to the source course.

also sorted the content type box and put course copy and
canvas packages first.

Test Plan:
 * run a file upload migration and a course copy one
   (or just go to a page with existing ones)
 * There should be a link to the uploaded file and the source course
 * The type column should also make more sense, for example,
   it'll say 'Course Copy' instead of 'Copy Canvas Course'
 * The content type box should be in the order of: course copy,
   canvas cartridge, .zip file, then alphabetical

closes CNVS-7178

Change-Id: I639e00db0188ce5119daac792119abd1da546908
Reviewed-on: https://gerrit.instructure.com/22742
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2013-07-30 19:31:17 +00:00
Jeremy Stanley 4b858465ac allow students/observers to list multiple submissions
test plan:
 - as a student, submit multiple assignments
 - use the "List submissions for multiple assignments" api as
   the student, to list those submissions
   - try with and without student_ids (caller is assumed)
   - ensure you can't view another student's submissions
 - enroll an observer that is linked to students with submissions
 - ensure the observer can retrieve submissions for multiple
   linked students via the api
 - ensure the API returns an 'unauthorized' error if the observer
   includes a non-linked student in student_ids
 - ensure the API returns an 'unauthorized' error if the observer's
   enrollment is concluded

fixes CNVS-7028

Change-Id: Ib5de0b78cbe5d7c3796cc8b7681f1cb1012e5404
Reviewed-on: https://gerrit.instructure.com/22700
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2013-07-30 19:01:53 +00:00
Bracken Mosbacker bae514f754 make course copies import immediately
since course copies weren't marked as import_immediately,
there was a short window where the workflow state made the
new UI show the select content button even though the user
has already done that step.

Test Plan:
 * do a selective course copy for an at least medium sized course
 * after the progress bar appears after selecting content it should
   never revert to the select content button
 * try it a few times to verify

closes CNVS-7216

Change-Id: Idbfdd20f7ce29915dda5a61b629c2076d26e40ae
Reviewed-on: https://gerrit.instructure.com/22748
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2013-07-30 19:01:23 +00:00
Cody Cutrer 86af8ba7ac keep track of redis failures per server
fixes CNVS-7021

test plan:
 * have two separete redis servers (one being localhost and one being
   soemthing that does exist is sufficient) configured in
   cache_store.yml
 * make sure one is inaccessible (i.e. it doesn't exist)
 * run canvas. always reload every page. inspect your logs - on the
   second request, approximately half of the cache lines should be
   a cache hit, and half a cache miss
 * you can be more fine grained by doing Rails.cache.write('key',
   true); Rails.cache.fetch('key') in script/console for different
   keys. Half of the time it should return true, and half of the time
   it should return nil.

Change-Id: I85898e9ac5e01c01d042ce7340ad463865a0ba73
Reviewed-on: https://gerrit.instructure.com/22661
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2013-07-30 18:25:05 +00:00
Sterling Cobb ae85385895 search course via endpoint in content migrations
fixes CNVS-7090

Test Plan
1. Go to the content migrations page and start to
create a new course copy migration
2. Notice there is now a checkbox that says
"include completed course"
3. Clicking on it should include completed courses
in the list.
4. Searching for a course now searches all courses
you can manage.
5. The drop down should also group courses by
their terms.

Change-Id: Ie36aa5cfec6d2a1db5190dcf5b4c04aa27701922
Reviewed-on: https://gerrit.instructure.com/22636
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2013-07-30 18:11:26 +00:00
Joel Hough 03ec8fb077 added participating_user_ids to conversation_message_json
fixes CNVS-7130

test plan
- retrieve conversations via the api
- ensure that the participating_user_ids field for each message
 lists the messages participating user ids

Change-Id: I3d7a579d610e70f06dd646d3089c8568db9bc10d
Reviewed-on: https://gerrit.instructure.com/22720
Reviewed-by: Braden Anderson <banderson@instructure.com>
QA-Review: Braden Anderson <banderson@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2013-07-30 16:40:30 +00:00
James Williams bfb4e5c227 import assignments into groups on selective import
test plan:
* export a course with assignments in assignment groups
(or use the package referenced in the ticket)
* import the package with "select migration content" checked
* import the assignments
* confirm that the imported assignments are in
their original groups (rather than the default
"Imported Assignments" group)

* copy a course with assignment groups, again choosing
to select the content to copy
* should preserve the assignment groups

fixes #CNVS-7103

Change-Id: I7fd36e2ea65e125b7078fe4ca9f5ba740eb08ac7
Reviewed-on: https://gerrit.instructure.com/22690
QA-Review: August Thornton <august@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2013-07-30 13:31:36 +00:00
Brian Palmer e2ce6c6a44 filter sensitive parameters in page views
Filters on both generation of new page views, and reads of existing page
views already in the data store.

refs CNVS-7202

test plan:
* make an api request that gets logged as a page view such as
  /api/v1/courses/X/discussion_topics?access_token=XXX
* verify that when you view your page views, the access token is
  filtered out.

Change-Id: I517523c25f7518a1e8bb9745765d412db2f16eb6
Reviewed-on: https://gerrit.instructure.com/22724
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2013-07-30 00:15:26 +00:00
Stanley Stuart bd24ff0518 update plugins to use a styleguide table
Test plan:
  - make sure the plugins index page (/plugins) looks alright.
  - make sure that all the links work ilke they did before.
  - make sure that links in the "website" column go to the rgiht place
    like they did before.
  - make sure the plugins page is still accessible.

fixes CNVS-6870

Change-Id: If5fef9193387cda033e9e94cb825f8144614d6d9
Reviewed-on: https://gerrit.instructure.com/22308
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Product-Review: Stanley Stuart <stanley@instructure.com>
2013-07-29 22:14:00 +00:00
Jacob Fugal 123eb0b224 don't change case of responses in multiple FitB
fixes CNVS-7085

test-plan:
 - create a quiz with a multiple fill in the blank question with two
   blanks, each with the correct answer in mixed case
 - in a submission for that quiz
   - fill in the first blank with a correct answer but with differing case
   - fill in the second blank with an incorrect answer with mixed case
 - review the quiz submission
   - the correct answer should be marked as correct, but retain the
     casing of the response (not the key)
   - the incorrect answer should be marked as incorrect and retain the
     casing of the response

Change-Id: I1f7c1a9912c13574360203bdf943ffa25b246a1b
Reviewed-on: https://gerrit.instructure.com/22593
Reviewed-by: Stanley Stuart <stanley@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
2013-07-29 22:04:36 +00:00
Simon Williams 7fca0a2718 move published status to styleguide
closes CNVS-7161

test plan:
- check out the styleguie, and see that published buttons/text has moved to the
  'Published State' left menu
- make sure the published state still looks good at the top of the assignment
  and quiz edit pages

Change-Id: I6f22d5629b76ca9b805c51d6526cc7a46004bdc4
Reviewed-on: https://gerrit.instructure.com/22662
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-07-29 21:16:46 +00:00
Simon Williams 1d4e1dd142 cleanup and renaming
closes CNVS-7160

test plan:
- the new assignment index page should still load

Change-Id: I9c2cae774fbd37190b68d8f2ce2b86a15050e981
Reviewed-on: https://gerrit.instructure.com/22609
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-07-29 21:16:39 +00:00
Landon Wilkins 9ebb185dc3 add randomly assign unassigned users functionality to new group ui
fixes CNVS-6732

normal test plan:
0) change the "true" on the first line of
    app/coffeescripts/bundles/manage_groups.coffee to "false"
    to enable the test bed (feel free to change the GroupCategory ID as well)
1) go to the new group ui test bed (http://localhost:3000/courses/1/groups)
2) ensure that the GroupCategory you pick is not student organized, nor
    self signup restricted
3) click the cog
4) click "Randomly Assign Students"
5) click "Okay"
6) verify that everything in the #content area is replaced with a progress bar
7) wait for the progress bar to reach 100%
8) verify that the #content area changes back to show the groups, with the
     previously unassigned students distributed among the available groups

api test plan:
1) ensure delayed jobs is not running
2) navigate to the new group ui test bed
3) perform a random assignment, which should result in being stuck in progress
4) open up Postman in another tab
5) perform a GET request to http://localhost:3000/api/v1/group_categories/1
     (replace the 1 with your test GroupCategory's ID)
6) verify that the response includes a progress
7) verify that if you refresh the tab you did the random assignment in, you
     still see a progress bar
8) start delayed jobs and verify that the progress bar completes
9) verify the api documentation for a GroupCategory now includes a progress
     description (look in the box under "A Group Category object looks like:")

Change-Id: Ia8b24d899f428ad8ed50a9790a03802ca60d746d
Reviewed-on: https://gerrit.instructure.com/22288
Reviewed-by: Mark Ericksen <marke@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-07-29 20:17:47 +00:00
James Williams 894ff18370 change course#named_scopes specs to be more robust
fixes #CNVS-7154

Change-Id: I04a015442692332a1eb4fc3a82d490e3b793d862
Reviewed-on: https://gerrit.instructure.com/22707
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
2013-07-29 20:06:34 +00:00
Simon Williams b6d60a3ea2 fix more fragile specs
fixes CNVS-7158

test plan:
- watch for offending specs in the CI run
- they should pass the first time an not show up in the reruns

Change-Id: I153380a9edef68634506010e327f8fe64ddae344
Reviewed-on: https://gerrit.instructure.com/22698
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cameron Matheson <cameron@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
2013-07-29 19:54:40 +00:00
Ryan Florence 6b6bdfb3ff quiz statistics - don't include preview data
closes #6331

test plan:
1. create a new quiz with one question
2. preview it as the teacher (and submit)
3. publish the quiz
4. take the quiz as a student (and submit)
5. go to quiz statistics as the teacher
6. click the "item analysis" link on the right
   - observe there is only one row in the csv
     download, previously quiz previews created
     new rows but shouldn't have

Change-Id: Idedd643d02d6af23006852a2e35620f430a133d8
Reviewed-on: https://gerrit.instructure.com/22527
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Product-Review: Ryan Florence <ryanf@instructure.com>
2013-07-29 15:56:36 +00:00
Cody Cutrer 13815b8a9c alerts are announcements
Change-Id: I4e0387d77eea0deeae3b30dff5c06118b328f584
Reviewed-on: https://gerrit.instructure.com/22687
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2013-07-29 15:14:13 +00:00
James Williams 226d675be3 re-reading a discussion topic should fulfill requirement
test plan:
* create a course with a student and a discussion topic

* as the student:
 * read the discussion topic

* as the course admin:
 * add the discussion topic as a context module item
 * add the topic as a module completition requirement
 that students "Must view" to complete

* as the student:
 * reading the discussion topic again should fulfill
 the requirement

fixes #CNVS-6987

Change-Id: I10f0113ad1b38f9bf6635cd18494a7a160ddaa3c
Reviewed-on: https://gerrit.instructure.com/22579
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2013-07-29 13:51:42 +00:00
James Williams 4d0f645310 people page - edit sections dialog accessibility changes
test plan:
* section search bar should have a descriptive title
* links to remove sections (the 'x' icon) should be
able to be tabbed to and triggered using the keyboard,
and should have descriptive titles

fixes #CNVS-6522

Change-Id: I9355e8705345f69bd707ed4a5b064648d3cd7640
Reviewed-on: https://gerrit.instructure.com/22327
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2013-07-29 13:51:05 +00:00
Braden Anderson e5ec3206d1 Kaltura: display error message for actionscript exception
fixes CNVS-7015

test plan:
  * open the media comments dialog, such as through conversation composing
  * don't have kaltura set up properly
  * switch to the "Upload Media" tab
  * verify that you get a useful error message
  * verify that the message shows up in IE
  * if possible, verify that you do not get the error message
      if kaltura is set up properly

Change-Id: Ib47633fab427258b35552de9a4ab6f4cb019d217
Reviewed-on: https://gerrit.instructure.com/22526
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Product-Review: Zach Pendleton <zachp@instructure.com>
2013-07-29 13:04:51 +00:00
Braden Anderson 722d2d6c91 conversations beta: fix attachments focus handling
fixes CNVS-6210

test plan:
  * compose a message in the new conversations interface
  * attach files to the message, sometimes cancelling
      the file selection dialog
  * verify that after adding an attachment, focus remains
      on the add button, even if you clicked a file
  * give one of the attachments focus
  * verify that upon focus the icon is styled with
    a blue drop-shadow
  * verify that when you press "delete", focus moves
      to another element
  * verify that the attachments pane closes when all
      attachments are removed
  * verify that the delete icon shows when focused on
      an attachment and that you can tab to it with
      the keyboard (note: broken in Firefox on OS X)
  * verify that you can activate the delete control
      while it is focused by pressing enter or space
  * verify that in Chrome, you can also delete an
      attachment by cancelling the file selection dialog
  * verify that you can change an attachment by double-clicking
      or pressing enter or space while it is focused,
      with appropriate icon updates
  * verify that you can move focus with the left/right arrow keys
  * verify that focus is preserved when shift-tabbing
      in Safari through all tabbables in a modal
  * verify that the remove icon isn't underlined when hovered

Change-Id: Id99af12c5bbe07ed0cedf36fadf5e792bbb88478
Reviewed-on: https://gerrit.instructure.com/22560
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Product-Review: Zach Pendleton <zachp@instructure.com>
2013-07-29 13:04:33 +00:00
Zach Pendleton c93c266355 add google analytics tracking.
now tracking "sent" filter in conversations and the
star/unstar/mark as read/mark as unread buttons on
individual conversations.

Change-Id: I36428af61451736b600ffa666530cc5d4881d11c
Reviewed-on: https://gerrit.instructure.com/22459
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Braden Anderson <banderson@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Product-Review: Zach Pendleton <zachp@instructure.com>
2013-07-26 23:23:39 +00:00
Cameron Sutter b2a93cc4a9 add modules to assignments index page
fixes CNVS-5678

test plan
- add some assignments/quizzes/discussions to a module
(or multiple modules)
- enable draft state and load the assignments index page
- the assignments should show the correct module
- assignments with multiple modules should say so and have
a hover over that lists the modules

Change-Id: Id68aade1d32422285f2fdee10c44626e69ccbea9
Reviewed-on: https://gerrit.instructure.com/22604
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2013-07-26 23:12:29 +00:00
Joel Hough c6568bc4b3 gear menu for new conversations
fixes CNVS-7037

test plan
- ensure the gear menu is disabled when there isn't a conversation
 selected
- ensure the gear menu is enabled when a conversation is selected
- select a conversation
- ensure that clicking 'Mark as unread' marks the conversation as
 unread in the display. Note that the conversation will not
 actually be marked as unread on the backend yet
- ensure that clicking 'Forward' will bring up the compose window.
 note that the button works the same as the 'Compose' button right
 now because the compose window can't disable the subject and
 context fields yet

Change-Id: I92740643b0eed9881c5e35326be8b43fd83915fe
Reviewed-on: https://gerrit.instructure.com/22634
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Product-Review: Zach Pendleton <zachp@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-07-26 23:06:24 +00:00
Jon Jensen 29e5e5e95a remove spurious label, fixes CNVS-6440
label was added in b6645074 in order to get the font sizes the same. now
just change it so that labels inside paragraphs have the same font size as
other text

test plan:
1. go to /profile/settings
2. the Web Services paragraph and checkbox text should be the same size
3. the paragraph should not have a label around its text

Change-Id: If6a7a98449b0f6158bda883849ebd409b140a37a
Reviewed-on: https://gerrit.instructure.com/22686
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
2013-07-26 22:44:13 +00:00
Mark Ericksen 298b17bc0e add group edit dialog for changing name
fixes CNVS-6215

testing steps:
* on the groups page, use the gear menu to edit a group
* change the group name and save it
* verify the name was changed in the display
* re-open the edit dialog, the new name should
  be displayed for editing
* cancel the edit dialog and verify no saving action
  happens
* reload the page and the name change should remain
* verify group name is required
* verify error displayed when group name is too long

Change-Id: Ic87d592ec4cfe4cba504c85762c4cc3a2b1e0358
Reviewed-on: https://gerrit.instructure.com/22583
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-07-26 22:32:01 +00:00
Zach Pendleton dc8250ba73 darken inbox header buttons
fixes CNVS-7120

test plan:
  * as a site admin, navigate to /conversations/beta
    and verify that the header buttons are sufficiently
    dark.

Change-Id: I27bcf01255ade199c029a0248001bd0a4c53111c
Reviewed-on: https://gerrit.instructure.com/22696
Reviewed-by: Braden Anderson <banderson@instructure.com>
QA-Review: Braden Anderson <banderson@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Zach Pendleton <zachp@instructure.com>
2013-07-26 22:24:16 +00:00
Mark Severson b06b9388de change wiki permissions to be simpler and more consistent
test plan (on a course wiki and group wiki):
 - the following roles should interact with the wiki as they did before:
   - admin (non-enrolled)
   - teacher
   - student
   - member (group wiki)
   - public (non-enrolled)
 - course setting set to "Teachers and Students" (or "Anyone")
   - students (or anyone) can create pages
   - students (or anyone) can edit an existing page (unless the page is set to "Teachers only")
   - students (or anyone) cannot edit pages set as "Teachers only"
 - non-enrolled admins behave as an enrolled teacher

fixes #CNVS-7046

Change-Id: I677d52a53e83580a56aa9b5b834a50610719e42f
Reviewed-on: https://gerrit.instructure.com/22606
QA-Review: August Thornton <august@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2013-07-26 21:53:08 +00:00
Joel Hough df2eaa5830 allow filtering by context_type on group index api
fixes CNVS-6975

test plan:
- create a user that is a member of an account level group and a
  course level group
- using the api (api/v1/users/self/groups), ensure that all groups
  are returned
- ensure that only the account level group is returned when the
  context_type parameter is set to 'Account'
- ensure that only the course level group is returned when the
  context_type parameter is set to 'Course'
- ensure that the user's group index page works as it did before

Change-Id: I3751e0a29157481431a26a5daa554f2b54c090bd
Reviewed-on: https://gerrit.instructure.com/22550
Reviewed-by: Jon Willesen <jonw@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2013-07-26 21:45:31 +00:00
Cameron Matheson 8ee71f6077 cheap hack to skip overriding assignments
refs CNVS-6747

Test plan:
  * Make sure the new assignments index page still shows correct dates
    (test in a course that has assignments with and without overrides)
  * Test the assignments index api action and make sure it returns the
    right dates too

Change-Id: Ibb6baaa5009fe95b68e160af2fb4e91d5ac8ef37
Reviewed-on: https://gerrit.instructure.com/22612
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
2013-07-26 21:43:01 +00:00
Cody Cutrer 920a6bffe9 fix mysql problems with boolean cast and temp tables
refs CNVS-7032

 * mysql doesn't have boolean
 * mysql will auto-commit the transaction unless you explicitly say
   TEMPORARY when dropping the temp table

Change-Id: Iaca3ddd5768f509a0b610925f601e1712e9b7d42
Reviewed-on: https://gerrit.instructure.com/22666
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2013-07-26 19:38:23 +00:00
Derek DeVries d230897849 update admin cog colors and accessibility in styleguide
fixes cnvs-7005

test plan
  styleguide
  - admin toolbar cog and content cogs are accessible

  quizzes index
  - toolbar cog button is accessible
  - settings cogs on quizzes are accessible

  quizzes show
  - toolbar cog button is accessible

Change-Id: Iae22c076e023dc50d8bb24c8f9dc050bc48b743a
Reviewed-on: https://gerrit.instructure.com/22671
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Reviewed-by: Stanley Stuart <stanley@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
2013-07-26 18:49:37 +00:00
Simon Williams b18d89c641 assignment publishing ui
closes CNVS-5686

test plan:
- click the cloud icon on the new assignment index page to publish and
  unpublish an assignment.
- click the publish button on the assignment show page to publish and unpublish
  an assignment.
- make sure that no other assignment fields (especially overrides and turniting
  settings) change when an assignment is published.
- try all the above a few times in a row without a page reload.
- check the assignment show page without the enable_draft? flag set and make
  sure the publish button doesn't show up.

Change-Id: I14cfd7145a9a58f18165a4242a492de0335e0187
Reviewed-on: https://gerrit.instructure.com/22466
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Reviewed-by: Cameron Sutter <csutter@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2013-07-26 18:33:46 +00:00
Stanley Stuart 6036657ccc handle sharding for migration for loading quiz needs submission notification
Change-Id: Id31f807dd9dea392f20033f9ff5a37e0c4d3ca02
Reviewed-on: https://gerrit.instructure.com/22674
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Product-Review: Stanley Stuart <stanley@instructure.com>
2013-07-26 17:58:55 +00:00