Commit Graph

9922 Commits

Author SHA1 Message Date
Derek DeVries 5bccb99a7d rails3: fixes for take quiz presenter spec
fixed:
- spec was being to clever and was sharing state between tests, Since the let
statement is lazy loaded, there is no need for adding this reload! stuff on
the object at runtime to reset state.

Change-Id: Ie056600653ea1dcb578b3bd15e1e8bb67dc1f61d
Reviewed-on: https://gerrit.instructure.com/30800
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
QA-Review: Derek DeVries <ddevries@instructure.com>
2014-02-25 19:27:24 +00:00
Joel Hough e528dbc346 outcome results index api
fixes CNVS-10898

test plan
- fetch outcome results using the new endpoint
- ensure that outcome results are returned
- fetch outcome results with include[]="alignments"
- ensure that alignments are included

filtering and including is largely identical to the result rollup
endpoint. may want to exercise some of those that make sense, too.
e.g. filtering by user_ids makes sense and should work. including
courses or an aggregate parameter doesn't make sense, so we don't
care if it doesn't work

Change-Id: Ifd1540304cc5e0f98d3c2e6121a3d984b8b662b5
Reviewed-on: https://gerrit.instructure.com/30451
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2014-02-25 18:46:24 +00:00
Brian Palmer 2bd22447ab rails3: the i18n scope for AR error messages changed
Change-Id: Ia739646db69ceec430a1968315d8191221e49d7e
Reviewed-on: https://gerrit.instructure.com/30792
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
2014-02-25 17:54:24 +00:00
Cody Cutrer 55e9b7eb57 fix Bundler patch in case gemfile is run multiple times
Change-Id: I544033693c8b9cdec16bf5ee31539c6f4904aafb
Reviewed-on: https://gerrit.instructure.com/30793
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-02-25 17:49:49 +00:00
Cody Cutrer 76264bb4d9 fix rails 3 building of new has_one objects where the foreign key is the primary key
Change-Id: I356dda316ca47b24012ee830aa133caa085e5c71
Reviewed-on: https://gerrit.instructure.com/30704
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-02-25 17:10:34 +00:00
Cody Cutrer 853f87ddfe log error reports for each failed shard in multi-shard periodic jobs
Change-Id: I37cd3987256dd2ffb0a996c88774c1cd71ce3c55
Reviewed-on: https://gerrit.instructure.com/30692
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-02-25 17:03:24 +00:00
Ahmad Amireh ba316054ba Draft State Quizzes: show multiple due dates
Closes CNVS-9880

This patch enables observers watching students across multiple sections
to see each section's due date for a quiz in the quizzes index page,
it also fixes the dates students get to see when they're in a section
other than the base one.

(BREAKING?) API CHANGES
----------- --- -------

  - when a student queries a quiz, the `due_at`, `lock_at`, and
    `unlock_at` dates they receive are that of the section they're in as
    oppossed to the quiz's global dates
  - when an observer queries a quiz, they receive the dates for the
    sections they're bound to in the `all_dates` field like teachers do

TEST PLAN
---- ----

Two ways to test this patch: a simple way that tests only the case
described by the ticket, or the comprehensive way.

> The simple way

  - turn DS on
  - create a course with multiple sections
  - create a quiz and assign a due date to each section
  - as an observer who's watching more than 1 student in different
    sections, go to the quizzes index:
    - verify that you see "Multiple Dates" for due dates (and
      availability if you set them)
    - hover over the link and verify that you see the proper dates in
      the tooltip

> The comprehensive way

Check this out: https://gist.github.com/amireh/375171767da8303e1b71

Change-Id: I934cb47f0229a43713dc6b4a6d280c047a2263b9
Reviewed-on: https://gerrit.instructure.com/30083
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Product-Review: Ahmad Amireh <ahmad@instructure.com>
2014-02-25 16:51:47 +00:00
Michael Nomitch a9caa8b473 added late and resubmitted indications to srgb
fixes CNVS-11237

test plan:
  - go to a late submission on srgb
    - below the grade input it should say the submission is late
    - on time assigments shouldnt have the late indication
  - go to a resubmitted asignment on srgb
    - below the grade input it should say the assignment was resubmitted
    - when you grade the assignment the indication should go away
  - dropped assignments should work as usual
  - assignments with acombination of late/dropped/resubmitted should
    show all of the necessary indications

Change-Id: I9eaab0fa5f55f72cb86792d633eb28d3e0975047
Reviewed-on: https://gerrit.instructure.com/30433
QA-Review: Amber Taniuchi <amber@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Mike Nomitch <mnomitch@instructure.com>
2014-02-25 16:43:58 +00:00
Michael Nomitch a3a166b05f added sis export to srgb
fixes CNVS-11189

test-plan:
  - on a course with sis export enabled go to srgb
    - there should be a link that takes you to details#tab-grade-publishing
  - on a course without sis export enabled go to srgb
    - there should be no sis export link

Change-Id: Ib8661bcb6f655bb15bc37aac562bb584f5f916e2
Reviewed-on: https://gerrit.instructure.com/30441
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Mike Nomitch <mnomitch@instructure.com>
2014-02-25 16:43:52 +00:00
Cody Cutrer 11470744d8 set shard category for AR Job in rails 3
Change-Id: I29e57c3668059734ab852c984c6608840ffd5daf
Reviewed-on: https://gerrit.instructure.com/30774
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-02-25 16:27:41 +00:00
Cody Cutrer e8767e6655 fix moodle converter spec for rails 3
Change-Id: I5a761e6ce627aa6d12caf6b29daa5d9307445580
Reviewed-on: https://gerrit.instructure.com/30741
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-02-25 16:27:17 +00:00
Simon Williams 1df5ceb651 revert assignment spec fix
refs CNVS-11192

Change-Id: Ifddd43917f25bd99b796ed87f7dafe22a1263ef0
Reviewed-on: https://gerrit.instructure.com/30454
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>
2014-02-25 15:47:32 +00:00
Transifreq cbb8c0257d Updated ja translation 2014-02-25 05:06:53 -07:00
Jeremy Stanley 0ca3fc5b3b don't copy scribd attributes from the root_attachment
test plan:
 - have a course with working scribd documents
 - copy the course
 - documents should still be viewable in the copy
 - if the document is deleted from scribd due to non-use,
   viewing it in either course should trigger a
   re-render

fixes CNVS-10818

Change-Id: Ideb19e5e84575a63727bd2ec78790fa7c1d87f16
Reviewed-on: https://gerrit.instructure.com/30625
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2014-02-25 03:46:28 +00:00
Cody Cutrer 4711ecf90f use https for rubygems source
prevents a possible MITM attack on installed code

Change-Id: I13c4419eb3f469c2f895a8725b18d90e35ccc992
Reviewed-on: https://gerrit.instructure.com/30753
Reviewed-by: Brian Palmer <brianp@instructure.com>
QA-Review: Shawn Meredith <shawn@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2014-02-25 03:02:16 +00:00
Cody Cutrer 1293920ed6 fix FoldersController#api_index pagination
@context is always nil. found by rails 3 specs

Change-Id: I37acb0edfc80987fa414f11bc338b07bebb79364
Reviewed-on: https://gerrit.instructure.com/30723
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-02-25 02:16:21 +00:00
Cody Cutrer 80d7785902 fix lti grade passback spec for rails 3
Change-Id: Id3659d3673ec46fa8658b1c8ca24b9120c0bb918
Reviewed-on: https://gerrit.instructure.com/30698
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-02-25 02:16:07 +00:00
Cody Cutrer 0a8d48cc82 patch bundler to fetch from github over https
thanks @mrphs

Change-Id: Ic7523d12662b7211ffebf7134f3ce6b8c70b8fda
Reviewed-on: https://gerrit.instructure.com/30757
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-02-25 02:14:46 +00:00
Derek DeVries a3cfc0feba rails3: fix specs for assignment override student
fixes:
in rails3 setting the assignment_id in the before_validation :default_values
filter also assigns assignment object to match. this makes it the validation
never fail in rails3

Change-Id: I07c303945484953800a71e9b2eba90cad617f7e3
Reviewed-on: https://gerrit.instructure.com/30756
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
QA-Review: Derek DeVries <ddevries@instructure.com>
2014-02-24 23:55:16 +00:00
Braden Anderson 6cee980493 outcome gradebook: use open arrow icon
fixes CNVS-11118

test plan:
  * enable and open outcome gradebook
  * verify that a hollow arrow icon is used for the sidebar toggle
  * toggle the sidebar
  * verify that the appropriate icons are used

Change-Id: Idee2079a03a1eea4141a5d132045acc7124b5a3c
Reviewed-on: https://gerrit.instructure.com/30710
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Braden Anderson <banderson@instructure.com>
2014-02-24 22:55:16 +00:00
Braden Anderson 68d504049e outcome results: persist tab selection to URL
fixes CNVS-10608

test plan:
  * open gradebook
  * select the learning mastery view
  * verify that you can switch views with your browser's
    back and forward buttons
  * refresh the page
  * verify that you are on the same view

Change-Id: Ia3657f7113cd9473ec9b3583d123eaf59c03d70f
Reviewed-on: https://gerrit.instructure.com/28845
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Braden Anderson <banderson@instructure.com>
2014-02-24 22:54:57 +00:00
Mark Severson 94e536d80f adjust warning alert colors
fixes CNVS-10844

Change-Id: Ia8b6d1966127d2ded89f0864914ea5c9d85bce8c
Reviewed-on: https://gerrit.instructure.com/30707
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2014-02-24 22:40:40 +00:00
Brian Palmer 310cb65611 add turkish to crowd-sourced languages
closes CNVS-11428

test plan:
* change your user settings to Turkish, and verify that the
  new translations appear properly

Change-Id: I7d21a8c32c1e2a80b8bd90e3fc32afc0b8211ab8
Reviewed-on: https://gerrit.instructure.com/30715
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-02-24 22:08:44 +00:00
Derek DeVries b8da82151c rails3: fix some security integrations specs
fixed:
- path doesn't include query params anymore, so we have to check request.fullpath
- need to replace Accept header with HTTP_ACCEPT

Change-Id: Ie1cd0ccbca3174f3788fbcb46066c27a4796569a
Reviewed-on: https://gerrit.instructure.com/30702
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
QA-Review: Derek DeVries <ddevries@instructure.com>
2014-02-24 21:06:25 +00:00
Shawn Meredith 420ec475de spec: vendor_gems test.sh result determination tweak
Change-Id: I68ca527f6e48e0305315d824aaf9a9625ecd8276
Reviewed-on: https://gerrit.instructure.com/30675
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>
2014-02-24 19:54:21 +00:00
James Williams f460a6c453 fix tempfile_for_uri for rails 3
the Tempfile doesn't default to binary in rails 3

Change-Id: I3478f97b8c330c770e517fb6618695fc20cab990
Reviewed-on: https://gerrit.instructure.com/30699
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-02-24 19:31:54 +00:00
Jacob Fugal 34f9e2c425 bump folio version
Change-Id: Ic996e51229dffa509de40c977c3e8a38c18651ce
Reviewed-on: https://gerrit.instructure.com/30705
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-02-24 19:01:35 +00:00
Josh Simpson f538676e16 fix accessibility issue with question groups
fixes CNVS-8252
This commit addresses a problem with screenreader and keyboard
navigation in quiz editing.  When navigating to a question group while
editing a quiz, when you tried to collapse or expand said question
group, the screenreader and browser lost focus due to the element being
hidden during the click event, which ended up causing bizarre errors as
the screenreader/browser focused on other elements.

Test Plan (See CNVS-8252 for Amber's screencast on the issue)
1. Edit a quiz that contains a question group in Safari or Chrome
2. Turn on Voice Over
3. Expand and collapse the question group using keyboard/voice over
navigation.
- The question group should expand and collapse correctly with no
  unwanted side effects.

Change-Id: Ied2bd94bb77a2a9e89589404654836ee8d589188
Reviewed-on: https://gerrit.instructure.com/30639
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Product-Review: Josh Simpson <jsimpson@instructure.com>
2014-02-24 18:30:43 +00:00
James Williams 09332f6b7f spec: fix filter_chain manipulation for rails 3
Change-Id: I3a23c8e7e1fd2ac26073eee1d8595303e6508312
Reviewed-on: https://gerrit.instructure.com/30690
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-02-24 18:11:35 +00:00
James Williams 5145ea3cc9 fix active_model_errors for rails 3 compatibility
Change-Id: I2844bf39fed7694e8c34e1afde0a72299e86231e
Reviewed-on: https://gerrit.instructure.com/30693
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-02-24 17:44:05 +00:00
James Williams 79ba07aca2 explicitly save submission with quiz submissions for rails 3
it was getting saved indirectly through a touch, which no longer
saves in rails 3

Change-Id: Ibeb405fab6de3548d76c92ae7994fd6a7bf99d8a
Reviewed-on: https://gerrit.instructure.com/30691
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-02-24 17:18:22 +00:00
James Williams 896768a1ce fix user_json last_login for rails 3
Change-Id: Ibbeba429a69f9cf066ecb253a1456cb2d832aca7
Reviewed-on: https://gerrit.instructure.com/30679
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-02-24 16:17:59 +00:00
Shawn Meredith 89b2072df3 spec: canvas rspec rake task for vendored_gems
Change-Id: I8aceb8e5aa2b95790eadca83725c8fd03bd28965
Reviewed-on: https://gerrit.instructure.com/30621
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>
2014-02-24 05:47:34 +00:00
James Williams 7a26b534ac spec: explicitly set host in files integration spec for rails 3
Change-Id: I2585fa63345902845450515dd95a517f02a0d5b6
Reviewed-on: https://gerrit.instructure.com/30641
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-02-22 20:16:13 +00:00
Transifreq e4a5c56329 Updated de translation 2014-02-22 05:06:42 -07:00
Mark Severson d7bd9ced1d explicitly require jquery in coffeescript modules
test plan:
 - no javascript-based pages break :\

Change-Id: I00f4bcaa5e6d239d274eeee4245a19606dfe651f
Reviewed-on: https://gerrit.instructure.com/30460
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Mark Severson <markse@instructure.com>
2014-02-21 23:44:52 +00:00
James Williams 44aafc0c16 spec: explicitly save users after enrolling in spec_helper
enroll_user touches the user, but because touch no longer saves,
this changes things for some specs

Change-Id: Ie5be09e0b30ed23e14a8ba2d39905bf7fa4c1346
Reviewed-on: https://gerrit.instructure.com/30608
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-02-21 21:09:07 +00:00
Mark Severson 73f18c4405 explicitly require jquery (rather than using global $)
test plan:
 * set a global javascript include (in account settings)
   (e.g. //code.jquery.com/jquery-1.11.0.min.js)
 * navigating through draft-state wiki pages should all work

Change-Id: I4823e336986ee1eb7a09aa9da3db0068314f62ee
Reviewed-on: https://gerrit.instructure.com/30459
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2014-02-21 20:52:56 +00:00
Jacob Fugal fe136af0d9 bump folio version for rails3
Change-Id: Ib79b1f1bc396b295f74690d2398c9edb4c6ee271
Reviewed-on: https://gerrit.instructure.com/29905
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-02-21 19:59:27 +00:00
James Williams eb6616e31d fix rails2_compatibility_spec for rails 3
still runs :after hooks even though it's pending

Change-Id: Ibb0909084a5f6cc279049d216485db779006b210
Reviewed-on: https://gerrit.instructure.com/30394
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-02-21 19:07:51 +00:00
Cody Cutrer a22380588c don't disconnect the database during tests
Change-Id: I7e182abf124324c7f449adcd1ceb3efbf7c78d8c
Reviewed-on: https://gerrit.instructure.com/30378
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-02-21 19:04:41 +00:00
Cody Cutrer f80f2651d8 fix schema cache clearing during migration in rails 3
Change-Id: I2f4727d4d2afeb32d31930daff3b1515e2b219a8
Reviewed-on: https://gerrit.instructure.com/30350
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-02-21 19:04:24 +00:00
James Williams e874051cee spec: fix encrypted_cookie_store resetting for selenium
Change-Id: I116364f2817ffad64ce6e9b6abe00337d32e58ef
Reviewed-on: https://gerrit.instructure.com/30465
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-02-21 18:09:05 +00:00
Joel Hough cf2a0bc138 outcome results api can side load alignments
fixes CNVS-11056

test plan
- fetch outcome results using the api as usual
- ensure that alignments are not included in the response
- fetch outcome results with "outcomes" include[]'d
- ensure that the included outcomes have a list of alignment id's
- fetch the outcome results with "outcomes" and
 "outcomes.alignments" include[]'d
- ensure that the alignments referenced in the included outcomes
 are also included
- ensure that the included alignment names and html_urls are valid

Change-Id: I0abf38e0f2125899df606bdbc16ac66b495cb726
Reviewed-on: https://gerrit.instructure.com/30353
Reviewed-by: Braden Anderson <banderson@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2014-02-21 17:48:06 +00:00
Matthew Irish ad068dbb1c fix header reading for group weights dialog
fixes CNVS-11101

test plan
=========
- navigate to the group weights dialog in screenreader gradebook or gb2
- verify that the column labels are read properly by the screenreader

Change-Id: Ia0f55e430f406818023f561071cc42ddf2a8cad5
Reviewed-on: https://gerrit.instructure.com/30207
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Aaron Cannon <acannon@instructure.com>
Product-Review: Matthew Irish <mirish@instructure.com>
2014-02-21 17:22:47 +00:00
Brian Palmer 4d615cb823 integrate the active_model-better_errors gem
refs CNVS-6040

This gem will help us output json error responses in the API using error
codes, since by itself ActiveRecord::Errors just deals in human-readable
i18n'd strings, and doesn't store detailed machine-readable information
on the error.

BetterErrors is mostly compatible, there's a few differences that mean I
had to change some unrelated code:

* errors[field_name] always returns an array, even if there's only one
  error on the field. This is an improvement IMO.
* errors is indexed by symbol, not by string
* iterating over the errors object now yields
  |attr, error_object| rather than |attr, string_message|

This includes a backport of the gem to rails 2.3.
On rails 3, we just use the vanilla gem.

The error codes aren't yet documented in the API docs, support for doing
that will come in a subsequent commit.

test plan: specs, plus you can hit the one api endpoint i've converted
so far -- account authorization configs. try to create an invalid
config, such as adding both cas and ldap configs to the same account,
and verify the error response formatting

Change-Id: Iaadd843ca9ff3f52c64e0256d82b64595c5559fb
Reviewed-on: https://gerrit.instructure.com/26178
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-02-21 17:09:53 +00:00
Landon Wilkins 0c7e0c2b85 converts users/admin_merge js_block into js_bundle
test plan:
* regression test users admin merge

Change-Id: I781115b754b5f13bbab440673b5eab2f62928465
Reviewed-on: https://gerrit.instructure.com/29098
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
2014-02-21 16:59:15 +00:00
Rob Orton b2b9431901 prevent scribd resubmit loop
fixes CNVS-11369

test plan
 - have a scribd doc that has been deleted
 - call Attachment.process_scribd_conversion_statuses
 - it should finish and not get stuck in a loop

Change-Id: I9a0e4199e1ee4fc41da7453d973b8db8e14450d0
Reviewed-on: https://gerrit.instructure.com/30450
QA-Review: August Thornton <august@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2014-02-21 16:01:48 +00:00
Cody Cutrer 031a0341b4 avoid dynamic finders on an assocition with an include
the dynamic finder on the association causes scoping to be called
before delegating the dynamic finder to the class, which works
until the preloader tries to load the owning class, and BOOM,
tries to preload itself

fixes at least one spec for rails 3

Change-Id: Ia22b31a013cb6ac984eb77ca29406372538ea57f
Reviewed-on: https://gerrit.instructure.com/30393
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-02-21 12:52:39 +00:00
Transifreq 674d41fb99 Updated fr translation 2014-02-21 05:06:46 -07:00