Commit Graph

8095 Commits

Author SHA1 Message Date
Shawn Meredith 7cfc3272fa spec: selenium and firefox upgrade spec fixes
Change-Id: I7bd9b169e5905310b035b681e37bf4ee46056c30
Reviewed-on: https://gerrit.instructure.com/24060
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
2013-09-16 17:45:53 +00:00
Ryan Florence 86585ff3e6 stop using hashes in the tour guide
closes CNVS-8083

Change-Id: I3fa1bb635850c3985691f9970dc9957fea5c4789
Reviewed-on: https://gerrit.instructure.com/24291
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Product-Review: Ryan Florence <ryanf@instructure.com>
QA-Review: Ryan Florence <ryanf@instructure.com>
2013-09-16 17:29:35 +00:00
Braden Anderson 2b41cd6d56 discussions: allow subscribing after reply to topic requiring reply
fixes CNVS-8019

The ticket says that IE9 used to refresh the page when adding a reply to
a topic with "Users must post before seeing replies" turned on and that
it was useful because it displayed the subscription button. Instead of
restoring that behavior, this change just displays the subscription
button on the client side after adding a reply, so all browsers can see
it.

Test plan:
  * open a topic with "Users must post before seeing replies" enabled
      as a student who has not replied
  * add a reply
  * verify that, in addition to seeing the other replies, you now
      immediately see the subscription button

Change-Id: Ieb91938d2f320f996c1d2d48ca5eb26675c4e465
Reviewed-on: https://gerrit.instructure.com/24353
QA-Review: Cam Theriault <cam@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
Product-Review: Braden Anderson <banderson@instructure.com>
2013-09-13 23:27:21 +00:00
Josh Simpson 234ec37d14 fix answer corruption when a question is regraded twice
fixes CNVS-7989
when a question is updated then regraded without refreshing the page,
the answer ids on the question are rewritten by the assessment question
id because of DOM corruption.  this mitigates that by ensuring the duped
id isn't present in the object that's applied to the answer templates.

Test plan:
1. Create a quiz with a multiple answer question
2. Take the quiz as a student
3. Edit the quiz and question as a teacher
4. Change the correct answer for the question
5. Choose the "update without regrading" option and update the question
6. Choose another regrade option and update the question
7. Save and publish the quiz
- The student's overview of their submission should have both the
  correct and selected answer labeled correctly.
- The quiz should work and be scored normally.

Change-Id: I9588197ec10a332e62356371235262c6fa64bf61
Reviewed-on: https://gerrit.instructure.com/24340
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Product-Review: Josh Simpson <jsimpson@instructure.com>
2013-09-13 23:07:36 +00:00
Derek DeVries c08bad102b fix regrading partially correct multiple answer questions and questions in groups
fixes CNVS-8125, CNVS-8073

test plan for cnvs-8125:
- create a quiz with multiple answers question (2 correct answers) make it
  3 points total
- have the student take the quiz and get 100%
- do a regrade, don't change the previous correct answers, just add another
  correct answer. Use the option that only gives points if student chose the
  correct answer (should be options #1 out of the 3) student should now get 2/3
- do another regrade and take off the correct answers that the student got and
  leave the other correct answer that the student did not get
- the scores should reflect the changes to the answers correctly

test plan for cnvs-8073:
- create a quiz question group worth 25 points
- make a question in the group
- have a student answer the question correctly, should show 25/25
- as a teacher change the answer with regrade option #1 (keep previous and current)
- save and regrade the quiz
- the student should continue to have 25/25 points

Change-Id: Ic083eff3df266559ccfd7fe6e0c39a4183d5723c
Reviewed-on: https://gerrit.instructure.com/24349
QA-Review: Myller de Araujo <myller@instructure.com>
Reviewed-by: Josh Simpson <jsimpson@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
2013-09-13 23:06:45 +00:00
Zach Pendleton aaff1ae592 hide new conversations ui
test plan:
  * navigate to conversations as a site admin and verify
    that you can still switch between the old/new
    interfaces;
  * navigate to conversations as a user in another role and
    verify that you cannot switch to the new ui.

Change-Id: Id1f629958f5870a8700310419959722c361ce3ce
Reviewed-on: https://gerrit.instructure.com/24355
QA-Review: Cam Theriault <cam@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
Product-Review: Zach Pendleton <zachp@instructure.com>
2013-09-13 22:43:00 +00:00
Brandon Broschinsky 8fd37a4f88 added report helper method to format timezone string
fixes PS-534

Change-Id: I04329795ddd8eee2082b7e6523189d008013f342
Reviewed-on: https://gerrit.instructure.com/24356
Reviewed-by: Nathan Mills <nathanm@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Brandon Broschinsky <brandonbr@instructure.com>
QA-Review: Brandon Broschinsky <brandonbr@instructure.com>
2013-09-13 22:22:18 +00:00
Duane Johnson 556bb0785e disambiguate "List users" api summary
The GroupCategories, Courses, and Accounts controllers hav a
"List users" api summary that ends up producing API method names with
the same name. This patch disambiguates the three.

Change-Id: Ide0028f140be82c467dbe39c50433664a5c94095
Reviewed-on: https://gerrit.instructure.com/24320
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nathan Mills <nathanm@instructure.com>
Product-Review: Duane Johnson <duane@instructure.com>
QA-Review: Duane Johnson <duane@instructure.com>
2013-09-13 21:52:16 +00:00
James Williams 5f99f8023d grading scheme editing accessibility
test plan:
* visit "/courses/:course_id/grading_standards"
* the tables should have descriptive screenreader-only
captions
* when editing a scheme,
 * "Scheme Name" should be labelled correctly
 * The "name" textboxes in the first column should
 have a "Name" label
 * should be able to tab to the second column, which
 describes the "lower limit of range"
 * third column textboxes should have a label describing
 them as the "upper limit of range"
 * the "X" boxes should have a label describing them
 ("remove row")
 * using tab to shift focus should move the "insert here"
 link in between the rows

fixes #CNVS-6519

Change-Id: I2611f22bf72ba89a42cf223cd83457f6f72ae759
Reviewed-on: https://gerrit.instructure.com/24243
QA-Review: Hannah Bottalla <hannah@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-09-13 21:23:57 +00:00
Stanley Stuart 41e27ec77a put quiz regrade behind a flag
test plan:
  - As a teacher, create a quiz with a few questions.
  - As a student, take the quiz.
  - As a teacher in an account without the :enable_quiz_regrade setting,
    you should not see quiz regrade options when editing the answer
    for a quiz question.
  - Enable quiz regrading by calling Account.all.each(&:enable_quiz_regrade!)
  - As the teacher, you should now be able to set a quiz regrade option
    when changing the answer to a quiz question.

fixes CNVS-8136

Change-Id: Ic19893441d3a111cd4824c99a9a4b9ba1985505d
Reviewed-on: https://gerrit.instructure.com/24341
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Product-Review: Stanley Stuart <stanley@instructure.com>
2013-09-13 20:17:42 +00:00
Shawn Meredith d5282ddb17 spec: jstest timeout increase
Change-Id: I9d6db9ec379d97f3c026b6c63e8987630fbdad03
Reviewed-on: https://gerrit.instructure.com/24314
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Tested-by: Bryan Madsen <bryan@instructure.com>
2013-09-13 19:58:03 +00:00
Mark Severson 171f8d72a9 miscellaneous fixes and style tweaks for pages
behaviors:
 - general
   - prevent links to unauthorized pages (course/pages index)
 - index page
   - add loading indicator
 - show page
   - prevent unauthorized attempts to query sequence footer
 - edit page
   - editing with the sidebar works again
   - removed the toolbar
   - will not prompt to save an unedited page
     (when the user doesn't have rights to modify the title)

style:
 - sticky toolbar
   - margins (left & right)
   - drop shadow
 - index page
   - hide empty toolbar
   - fills the entire page width & height
   - inner border color
   - prevent sort headers from wrapping
 - show page
   - hide empty toolbar
   - adjusted margins for the 'Front Page' label
 - sequence footer
   - faster animation
   - print stylesheet

test plan:
 * ensure all wiki draft state pages still function correctly

closes CNVS-7756

Change-Id: I3b13a672b4caacb3a41fa28a1b1c2b29d35140f3
Reviewed-on: https://gerrit.instructure.com/24308
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Matt Goodwin <mattg@instructure.com>
QA-Review: August Thornton <august@instructure.com>
QA-Review: Hannah Bottalla <hannah@instructure.com>
2013-09-13 19:54:48 +00:00
Cameron Matheson 8a069215d8 speedgrader: support multiple quiz attempts
fixes CNVS-1614

Test plan:
  * make a quiz that allows multiple attempts
  * make multiple attempts on the quiz with a student
  * view the quiz in speedgrader
  * you should be able to view any of the attempts (just like
    assignments with multiple submissions)

Change-Id: Ib10a4e0579538cf0d92247393c039a78b155474b
Reviewed-on: https://gerrit.instructure.com/24170
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-09-13 19:45:52 +00:00
Shawn Meredith 0cc9bcf1be spec: external_tools spec pending temp
Change-Id: I76d0ba0a9e92e369adbbf470b3ffe300b4c1cc90
Reviewed-on: https://gerrit.instructure.com/24339
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-09-13 19:44:41 +00:00
Brian Palmer 032e265d25 make access token last_used update threshold a Setting
Change-Id: Ice322e7226e32506f65b96d255de9dae0cfc33a5
Reviewed-on: https://gerrit.instructure.com/24266
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-09-13 18:18:45 +00:00
Cody Cutrer 89b82aad95 wiki_page_comments doesn't exist anymore
Change-Id: Ic74c2a9ef33b03e68aa54b9fa25806175be528e8
Reviewed-on: https://gerrit.instructure.com/24336
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Tested-by: Cody Cutrer <cody@instructure.com>
2013-09-13 16:13:23 +00:00
Cody Cutrer 796bb0803c raise error in dev and test for too-long-index-names
also fix migration that was broken cause of this

Change-Id: Icbba288d606a1b9d1ad266fdb2ee4d351e98616a
Reviewed-on: https://gerrit.instructure.com/24276
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2013-09-13 16:02:25 +00:00
Simon Williams 76616ab373 add a tooltip explaining assignment group drop rules
fixes CNVS-7672

test plan:
- create an assignment group with drop rules on the new assignment index page
- when you hover over the "2 Rules" text you should see a tooltip explaining
  the rules
- this should be visible to teachers and students

Change-Id: Ib787600e10f7cb82b818f15353fbe0512a850889
Reviewed-on: https://gerrit.instructure.com/23603
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
2013-09-13 15:11:20 +00:00
Derek DeVries d1b64c6fb9 fix issue regrading questions added to a quiz after a submission has been made
fixes CNVS-8098

test plan:
- have a student take a quiz (unlimited attempt quiz)
- teacher goes back in and adds a question (does not do any regrading)
- student retakes the quiz with the new question
- teacher does a regrade on the new question
- log in as the student
- verify: question was not regraded

Change-Id: Icaeac389dc77aa0471b502da6dccd210932f6b41
Reviewed-on: https://gerrit.instructure.com/24325
QA-Review: Myller de Araujo <myller@instructure.com>
Reviewed-by: Josh Simpson <jsimpson@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
2013-09-13 04:00:45 +00:00
Derek DeVries bbc07d7272 make answer comments update to match the correct answer for regrade options
fixes CNVS-8010

test plan:
  - as a teacher create a quiz with both Right/Wrong answer comments
  - as a student take the quiz and get the answer correct
  - as a teacher regrade the quiz and change the answer so that the student's
    regraded answer is incorrect and choose option "Award points for both"
  - it should show the "Wrong answer comments" for student
  - perform the same test for regrade option 3 (full credit)

Change-Id: I5c7f374dbaf4396e32eb8c1958308fae4b424d4a
Reviewed-on: https://gerrit.instructure.com/24295
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-09-13 02:05:06 +00:00
Jacob Fugal 6c158f4dc8 avoid unnecessary sql join when possible
when looking up messageable users within a specific course or section,
we already know the relevant course's workflow_state in ruby-land, so we
don't need to join in the courses table just to check the workflow_state
and branch in the query.

test-plan:
  regression tests around conversation recipient searching and user
  search

Change-Id: I197276d68f4684539c9907941008bc46cc5fc44e
Reviewed-on: https://gerrit.instructure.com/24165
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
2013-09-12 22:27:21 +00:00
Cody Cutrer d3f0b18684 validate nullness in the db on a bunch of columns
fixes CNVS-7414

Change-Id: I60978f66d88d916dc5736dbb975715172bd1e14b
Reviewed-on: https://gerrit.instructure.com/23141
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-09-12 22:20:39 +00:00
Cameron Sutter 1f16c3d5d8 draggable anywhere on index page
fixes CNVS-7998

test plan:
 - assignments and assignment groups should be draggable
   just as before
 - you should be able to grab an assignment or ag anywhere on it
   and be able to drag and drop it normally (not just the up/down arrow)

Change-Id: I1c31b94031f5e843c7f0ee0aaac4b1c4d0fb8d14
Reviewed-on: https://gerrit.instructure.com/24190
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Liz Abinante <labinante@instructure.com>
Product-Review: Liz Abinante <labinante@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
2013-09-12 21:51:24 +00:00
Landon Wilkins 72a51ce0b9 refactor notification exclusions for self enrollment
make it possible to have notifications that are sent during
self enrollment, rather than unilaterally skipping them all

test plan:
* self enroll in a course
* verify that you don't get any emails

relevant to CNVS-7624

Change-Id: I2b151dc004b2123eeaf44b6c12d93cc92d68cc63
Reviewed-on: https://gerrit.instructure.com/24242
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-09-12 21:12:02 +00:00
Simon Williams 1c1303bbb4 element toggler + item group accessibility
fixes CNVS-7150

test plan:
- make sure the expand/collapse text for the assignment, discussion, and quiz
  index pages is accessible

Change-Id: I57f77a774faabb7a95203d0e10678e786e5172b1
Reviewed-on: https://gerrit.instructure.com/22667
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2013-09-12 20:51:08 +00:00
James Williams 233538509e draft state - module student progressions page
test plan:
* enable draft state
* visit the new modules progressions page at
"/courses/:course_id/modules/progressions"
* confirm that clicking on students shows their
module progress

closes #CNVS-7694

Change-Id: I95404d88785b6be4997214091e7b63728330bd07
Reviewed-on: https://gerrit.instructure.com/24176
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Hannah Bottalla <hannah@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2013-09-12 20:32:37 +00:00
Cody Cutrer 5051b79c0e create folder shard-safely
fixes CNVS-8069

test plan:
 * have a user on one shard. use the API to upload a file to
   a specific folder for that user
 * arrange to have a user on another shard with the same local
   id (either by creating the user in script/console and assigning
   the id before saving, or just creating both users on a fresh
   shard each, so they both end up as id 1)
 * use the API to upload a file to the second user *with the same
   path*
 * it should not error out due to foreign key constraints

Change-Id: I06724e148df82d15629b4133a0a5c75bdf32caf7
Reviewed-on: https://gerrit.instructure.com/23991
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2013-09-12 20:19:51 +00:00
Cody Cutrer 9048af982c add unique index on ContextModuleProgressions
we recently started using unique_constraint_retry instead of
wonky code with Rails validations, but this index didn't exist.
so create it, and clear out dups first

Change-Id: I5abcc6f85f85021128f7eef8ccc5309184b87830
Reviewed-on: https://gerrit.instructure.com/24275
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2013-09-12 20:09:03 +00:00
Cody Cutrer 7fbc099986 batch up due date cachers during user list
refs CNVS-8071

test plan:
 * create a course and a section with an SIS ID
 * create a an assignment, and override it's date for that section
 * enroll two users via UI into the course; one with no section
   (i.e. the default section), and one into the section with the override
 * confirm that the users show appropriate due dates for the assignment

Change-Id: I5e06f812dbe8afe08eebb8c8809699c8ef685746
Reviewed-on: https://gerrit.instructure.com/24257
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2013-09-12 20:08:44 +00:00
Cody Cutrer b8470a85e8 batch up due date cachers during sis imports
fixes CNVS-8071

test plan:
 * create a course and a section with an SIS ID
 * create a an assignment, and override it's date for that section
 * enroll two users via SIS into the course; one with no section
   (i.e. the default section), and one into the section with the override
 * confirm that the users show appropriate due dates for the assignment

Change-Id: I0e2b64d1d7095d370ba981b3b0f3ec4d1742f15b
Reviewed-on: https://gerrit.instructure.com/24254
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-09-12 20:08:32 +00:00
Zach Pendleton 24c6084499 fix conversations autocomplete
disallow teachers from selecting message participants
without a context.

test plan:
  * as a teacher, navigate to new conversations;
  * attempt to create a new conversation and verify that
    the to: field is disabled until you select a context.

Change-Id: I3d455290af61b8f1dde0fc67774ad7ee66a95585
Reviewed-on: https://gerrit.instructure.com/24290
QA-Review: Cam Theriault <cam@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
Product-Review: Zach Pendleton <zachp@instructure.com>
2013-09-12 20:02:50 +00:00
James Williams b0722a97e0 remove course settings users tab
closes #CNVS-8062

Change-Id: Ia1c5acd9d42e13786d3fd7131c9ad9f4454f5a69
Reviewed-on: https://gerrit.instructure.com/24237
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Hannah Bottalla <hannah@instructure.com>
Product-Review: Matt Goodwin <mattg@instructure.com>
2013-09-12 18:40:01 +00:00
David Scoville 06ff919b48 added drag handle icon
Change-Id: I94bac2e77a91d94626c589e8c5865740a00ab947
Reviewed-on: https://gerrit.instructure.com/24114
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Product-Review: David Scoville <davids@instructure.com>
2013-09-12 18:38:48 +00:00
Matthew Irish bff6fc10b0 add never drop rules
changed the never drop rules to NeverDropCollection that extends
the UniqueDropdownCollection and it now has a corresponding
view, NeverDropCollectionView (which extends CollectionView)

you can customize how UniqueDropdownCollection adds new items
to the takenValues Collection by overriding #findNextAvailable

moved handler for removing a view to the ItemView (NeverDropView)

moved handler for adding a rule to the CollectionView

moved translations to the handlbars template

when rendering a new never-drop select, the dialog will automatically
scroll down to show it, and its value will be determined from the front
of the availableValues collection

fixes CNVS-7192

test plan
=========
- enable draft state
- on the new assignment index page, create an assigment group
- edit the group
- under never drop, click the "add an assignment" link
- verify that after one assignment is added the link should read "add
  another assignment"
- verify that when an assignment is added, a <select> box is added, and
  focused
- click "add another assignment" and verify that the value selected
  in the new <select> is no longer an option in any of the other <select>s
- continue adding never drop rules until the number there matches
  the number of assignments and veryify that the "add another assignment"
  link disappears
- with more than one <select>, but fewer selects than there are
  assignments, change the value of the select. verify that its previous
  value is now available as in option in other selects, but that its
  current value is not
- with more than one <select>,remove an assignment and verify that its
  value is now available as in option in other selects
- add an never drop rule and save, then go back into edit,
  verify that the saved rule should be rendered as a span (not a select)
  and that its value is not available as an <option> when adding another
  assignment
- after saving, return to edit, add an assignment, then remove the saved
  assignment and verify that its value is now available in the other
  selects

Change-Id: I7fe707959fb353378870caaa9b7326a3295b8f84
Reviewed-on: https://gerrit.instructure.com/24078
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: David Scoville <davids@instructure.com>
2013-09-12 17:33:44 +00:00
Mark Severson fd7556e4cd make visual styling of the module sequence footer more user-friendly
test plan:
 * navigate to a page (that is not in a module)
   - the module sequence footer should never show
 * navigate to another page (that is in a module)
   - the module sequence footer should be shown shortly after page load
 * ensure that long pages do not get cut-off by the footer

Change-Id: Iba2a2b6373fdf153ccf9785fde9b039e8ac32909
Reviewed-on: https://gerrit.instructure.com/24283
QA-Review: Hannah Bottalla <hannah@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Matt Goodwin <mattg@instructure.com>
2013-09-12 17:23:45 +00:00
James Williams 2e98db240c fix account term date processing
test plan:
* visit "/accounts/:account_id/terms"
* term date fields should accept various date formats
as detailed in the ticket (e.g. "MM/DD/YYYY")

closes #CNVS-5177

Change-Id: I5ab41502b5b1598cb2d1dee4f485b2e966e87af3
Reviewed-on: https://gerrit.instructure.com/24245
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2013-09-12 16:49:34 +00:00
Zach Pendleton 8476de2f3b position conversations on page load
the absolute positioning of the new conversations ui
has the potential to break custom css that changes
the height of the canvas header.

this commit avoids that by waiting to position the
new ui until the header height can be read with javascript.

test plan:
  * load the new conversations ui;
  * verify that its content is correctly positioned below
    the header;
  * load custom css that modifies the header height;
  * load the new conversations ui and verify that it is
    still correctly positioned below the header.

Change-Id: I06cb8131fc61cacf704c95c08649dc6de7f2fd30
Reviewed-on: https://gerrit.instructure.com/24096
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-09-12 15:14:26 +00:00
Jon Willesen 5a7ed71bdc visual change to sending message status in new conversations
graying out the messages pane while a message was sending was
acting weird if you selected a new conversation from the
conversation list which was not being grayed out. So instead of
graying out the pane, we'll add a "sending" badge to the header
bar while the message is sending.

fixes CNVS-7950

test plan:
 - navigate to the new conversations page.
 - compose a new message and send it. you should see a
   "sending" badge with a spinner in the header bar.
 - reply to a message and send it. you should see the sending
   badge in this case as well.
 - interact with other messages while the message is sending.
   This shouldn't result any visual issues, and the sent
   message should still be added to the correct conversation,
   and the correct conversation should be moved to the top of
   the list.

Change-Id: I2b058978cd4c3d3b8cc574e9d304f39a6c80cef5
Reviewed-on: https://gerrit.instructure.com/24282
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Product-Review: Matt Goodwin <mattg@instructure.com>
2013-09-12 14:58:49 +00:00
Kyle Rosenbaum ea776c2ac6 spec: selenium upgrade spec fix
Change-Id: I9df27d2abdf4222d0be79cf146ba5111c8f8360a
Reviewed-on: https://gerrit.instructure.com/24095
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Shawn Meredith <shawn@instructure.com>
Product-Review: Shawn Meredith <shawn@instructure.com>
QA-Review: Shawn Meredith <shawn@instructure.com>
2013-09-12 06:44:10 +00:00
Shawn Meredith 45752584a1 spec: ruby gem sel upgrade
Change-Id: I45334b2801e9b97bbb97aac540a7b52d9fb269e4
Reviewed-on: https://gerrit.instructure.com/24293
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Kyle Rosenbaum <kyler@instructure.com>
Product-Review: Kyle Rosenbaum <kyler@instructure.com>
QA-Review: Kyle Rosenbaum <kyler@instructure.com>
Tested-by: Kyle Rosenbaum <kyler@instructure.com>
2013-09-12 03:23:14 +00:00
Jon Willesen b758116ff5 apply the new module_sequence_footer to discussion topics
fixes CNVS-8014

test plan:
 - add a discussion topic to a module.
 - navigate to the discussion topic and see the old module
   navigation at the bottom of the page.
 - enable draft state on the account. in the console:
     a = Account.find(your_account_id)
     a.enable_draft!
 - refresh the discussion topic page and see the new module
   navigation at the bottom of the page.
 - create and navigate to a group discussion and make sure
   there are no errors.
 - create a graded group discussion and add it to a module.
 - navigate to the graded group discussion as a teacher and
   make sure the new footer appears.
 - navigate to the graded group discussion as a student, which
   will redirect you to the student's specific group discussion.
   make sure the new footer appears.

Change-Id: Ib380fb6d3390ef3f4f5029349466b1a0e43ff8a1
Reviewed-on: https://gerrit.instructure.com/24201
Reviewed-by: Braden Anderson <banderson@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Product-Review: Jon Willesen <jonw@instructure.com>
2013-09-11 22:54:15 +00:00
James Williams 144de56e73 preserve checkbox state in add users dialog
test plan:
* in a course with 2 or more sections, add a
teacher or TA through the 'People' page
* after adding the user(s), click "Add more users"
to start over on the first dialog screen
* confirm that the "Can grade students..." checkbox
has not changed from its previous state

fixes #CNVS-7928

Change-Id: I6fba94f13a32f3d0eee8913529ddeb7dc19355de
Reviewed-on: https://gerrit.instructure.com/24154
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2013-09-11 22:00:39 +00:00
Mark Severson 6a4c53d2b8 add lolz translation generator
test plan:
 - run rake i18n:generate_lolz
 - run rake canvas:compile_assets
 - with translations enabled, change language to LOLZ
 - all translated strings should be LOLZ-ified

Change-Id: Id2d3823bc69b8c305d465c15e5d1f8a64431e79b
Reviewed-on: https://gerrit.instructure.com/24205
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2013-09-11 21:08:03 +00:00
Mark Ericksen 87f68ffa42 improve error handling for ePortfolio section editing
fixes CNVS-5727

testing steps:
- on an ePortfolio page, click "Organize Sections"
  to add a new section.
  - blank out the name and hit enter (nothing happens)
    you should now be able to set some valid text and
    save it. (previously it would not save valid text
    until refreshing the page)
  - set a name that is too long (> 255 chars) and
    verify a popup/alert message reports that the name
    is too long and the invalid entry is removed from
    the page
- editing an existing section
  - clearing the name and trying to save (nothing
    happens) then setting to something should now save
  - set a name that is too long (> 255 chars) and
    verify that an error message is displayed on the
    section name input with a meaningful error message

Change-Id: I04dfab3cd741c4b04c5f8b2990aee8216aa34d7f
Reviewed-on: https://gerrit.instructure.com/24164
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2013-09-11 20:36:14 +00:00
Josh Simpson 22ca033722 fix time elapsed display when taking untimed quiz
fixes CNVS-7924
This fixes a bug introduced when fixing CNVS-6858.  When an untimed quiz
was taken, the time was not being displayed correctly (NaN due to
incorrect parsing and logic). It also fixes a bug with the countdown
becoming stalled when the window is out of focus.

Test plans:
1. Take an untimed quiz
- the time elapsed should be shown correctly
- and a timed quiz should show the time left correctly

2. Take a timed quiz
- go to a different browser window for 30 seconds
- go back to the quiz
- the quiz's countdown should sync immediately

Change-Id: I402a14930af9dd79dbc8f2646cb4a72162fd1662
Reviewed-on: https://gerrit.instructure.com/24167
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Product-Review: Josh Simpson <jsimpson@instructure.com>
2013-09-11 19:37:54 +00:00
Brian Palmer d252c2e9a5 i18n: add en-AU and en-GB
Also tweak the transifex import process to deal with the fact that they
use underscores and we use dashes

closes CNVS-8070

Change-Id: I1167cc90be7dc0a938781b8fd6741420a6ba826e
Reviewed-on: https://gerrit.instructure.com/24202
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2013-09-11 19:05:19 +00:00
Derek DeVries 660fff9681 fix issues with failing assignment view specs
Change-Id: Ia1a63fa86988209ef57ded307e01f54fae7bcef7
Reviewed-on: https://gerrit.instructure.com/24211
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
2013-09-11 18:53:19 +00:00
Derek DeVries 721fc1ac7e remove "award points for both" option when regrading multiple answer questions
fixes CNVS-7993

test plan:
- as a teacher - create a quiz with a multiple answer question type
- as a student - take the quiz
- as a teacher - change the answers for the multiple answer question type
- it shouldn't show the option to "Award points for both corrected and previously correct answers"
- adding additional answers should always show the "regrade options" box

- as a teacher - create a quiz with a multiple choice question type
- as a student - take the quiz
- as a teacher - change the answers for the multiple choice question type
- you should still be able to "Award points for both corrected and previously correct answers"

Change-Id: I5cdf834803da55b2c3db7b7caa7866a7d29f9079
Reviewed-on: https://gerrit.instructure.com/24261
Reviewed-by: Josh Simpson <jsimpson@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
2013-09-11 18:52:56 +00:00
James Williams 71fe7697a8 fix file/folder locking date field processing
test plan:
* in the files page, click on the lock icons
to lock a folder or a file
* uncheck the "lock until I manually unlock it"
 box to open the date fields
* should accept various date formats, as described
in the ticket

fixes #CNVS-4232

Change-Id: I92423fc19a3cbc2f962f034b13354dc082c6b67c
Reviewed-on: https://gerrit.instructure.com/24244
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: August Thornton <august@instructure.com>
2013-09-11 15:58:25 +00:00
Jeremy Stanley bd25b5e1ff don't try to load the module sequence header for a group page
test plan:
 - enable draft state
 - view a wiki page in a group
   - there should not be a failed ajax call to
     /api/v1/module_item_sequence
 - view a wiki page that is in a module in a course
   - the module sequence footer should work

fixes CNVS-8041

Change-Id: I3d127876cde87771955c736c44d9fb6e6fb26f1b
Reviewed-on: https://gerrit.instructure.com/24197
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2013-09-11 15:46:14 +00:00