Commit Graph

19 Commits

Author SHA1 Message Date
Cody Cutrer 1acbe1bc91 make CanvasKaltura.cache aware that Rails.cache is dynamic
Change-Id: I1b1aa95632b4e270d729c69f184e4507899cd3af
Reviewed-on: https://gerrit.instructure.com/142666
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2018-03-06 05:46:59 +00:00
Rob Orton a4d09a8479 handle nil assets for kaltura client
Change-Id: Icb30de01eb7630acee0ffeaf414c148cd5f727a7
Reviewed-on: https://gerrit.instructure.com/127684
Tested-by: Jenkins
Reviewed-by: Ben Rinaca <brinaca@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
2017-10-03 04:19:57 +00:00
Landon Wilkins c5b5cc786d da licença part 53
add consistent license headers to all source files

Change-Id: I405d2def01ad68c76533b9254983497485cd7073
Reviewed-on: https://gerrit.instructure.com/110160
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Tested-by: Jenkins
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2017-05-01 21:06:11 +00:00
Simon Williams 359c6dea13 upgrade many canvas gems to rspec 3 syntax
as of this commit, all canvas gems should be on rspec 3.5, and pass
without deprecation warnings.

closes CNVS-34040

test plan: specs should pass without deprecation warnings

Change-Id: I556b1a4a5aeb791c6ddd50ee35b51c513e025019
Reviewed-on: https://gerrit.instructure.com/98414
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
Tested-by: Jenkins
2016-12-27 18:44:23 +00:00
Cody Cutrer f552f4fc00 simplify gem test harnesses
rely on test_all_gems.sh to output header and trailer,
and use `set -e` in each test.sh to simplify passing
through errors

Change-Id: I3ba724ad2539ddfe31195394c43f646acfc73920
Reviewed-on: https://gerrit.instructure.com/70469
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2016-01-19 17:52:58 +00:00
Simon Williams e25816ab6f Revert "handle nil responses from kaltura client"
This reverts commit ec9937e026.

fixes CNVS-24746

the commit being reverted fixed a bug in handling for a specific client
kaltura instance, but in the process, caused a regression in handling
for our normal instructure media processing flow. we are reverting the
fix for now, and will look into a better fix for the client specific
issue.

test plan:
- upload a file instructure's default media processing instance
- it should successfully generate a preview which can be viewed from the
  files page.

Change-Id: I61691c680b1b46d369d3dc1dac1d66dd5d4faf17
Reviewed-on: https://gerrit.instructure.com/66696
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
Tested-by: Jenkins
QA-Review: August Thornton <august@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2015-11-10 20:50:37 +00:00
Michael Nomitch ec9937e026 handle nil responses from kaltura client
fixes CNVS-20610

test plan:
  - configure account to use kaltura (is this possible)
  - upload a very short video via the new files page
  - upload works
  - after a reasonable amount of time (waiting for it
    to transcode) you can preview the file via the files
    pages

Change-Id: Ie874eca7fe9943e491282aac15019f25ec0c7713
Reviewed-on: https://gerrit.instructure.com/63604
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
2015-09-25 14:12:32 +00:00
Cody Cutrer dc8f37287a don't (directly) depend on libxml-ruby
nokogiri is better maintained, and java compatible (both
are based on libxml2)

Change-Id: Ia7c8edea15ec001cf4861b00494e480832bd2c63
Reviewed-on: https://gerrit.instructure.com/49467
Tested-by: Jenkins
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2015-03-02 20:01:02 +00:00
Steven Burnett 992d13ceee fixes podcast media links
fixes the rss page crashing when a media link
was added to a discussion page.

fixes CNVS-10547

test plan:
- create a discussion with podcast and podcast reply enabled
- post a video from the side wiki bar(any format)
- click to get the rss feed of the current discussion
  notice no crashing.

Change-Id: I02353a05ff10a3448f36693adca5893acfeef1c9
Reviewed-on: https://gerrit.instructure.com/49388
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2015-03-02 17:20:51 +00:00
Cody Cutrer f9f37c0c93 bump nokogiri to latest
Change-Id: I53258f7dc243c0a9083b9f86c12a1b81f90c9d3e
Reviewed-on: https://gerrit.instructure.com/49022
Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2015-02-19 19:15:29 +00:00
Cody Cutrer f62bb4fd5d bump nokogiri slightly
refs CNVS-18275

to the minimum version required by ruby-saml2

Change-Id: Icc66b62ab3828e6142785cb08855534b89167b34
Reviewed-on: https://gerrit.instructure.com/48720
Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2015-02-13 16:55:57 +00:00
Cody Cutrer 1df26ccf47 bump libxml-ruby for ruby 2.2 support
Change-Id: I89cdb646dd6b519d5fb10d31004432a39957b06f
Reviewed-on: https://gerrit.instructure.com/46321
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-12-30 04:26:00 +00:00
Paul Hinze 9e3739e553 bugfix: don't strip hyphens from media thumbnail URLs
some media ids have dashes in them, but sanitization in the canvas
kaltura client was stripping them, causing video thumbnails to not work
in some cases.

this fixes the sanitization so those ids are handled properly.

Change-Id: I23b4c392dfc79eff4d57bea84c3509a1e6bf3137
Reviewed-on: https://gerrit.instructure.com/39694
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Paul Hinze <paulh@instructure.com>
QA-Review: Paul Hinze <paulh@instructure.com>
2014-08-28 21:11:02 +00:00
Paul Hinze 071d6d8a96 align rspec version in gems with parent
update spec_helpers to fix deprecation warning after upgrade

Change-Id: I31b370d1d60f73d5256c69a8d5e69418657f880d
Reviewed-on: https://gerrit.instructure.com/39144
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Paul Hinze <paulh@instructure.com>
QA-Review: Paul Hinze <paulh@instructure.com>
2014-08-12 22:27:39 +00:00
Jacob Fugal d9c6e2a0cd clarify Slug vs. UUID and fix event stream
refs CNVS-13987

what was called CanvasUuid was *not* generating UUIDs. it was generating
slugs. by default, its generate method only creates 4 character slugs.
these should obviously not be used as UUIDs. the misnomer already caused
a bug in EventStream where it used these slugs as UUIDs, causing
collisions. to fix:

 (1) rename canvas_uuid gem to canvas_slug, and rename it's primary
     class CanvasUuid to CanvasSlug
 (2) create new canvas_uuid gem, with class CanvasUUID, extracted from
     lib/uuid_singleton for actual UUID generation
 (3) fix event stream use CanvasUUID, rather than following the rename
     of CanvasUuid to CanvasSlug

test-plan:
 - have cassandra set up for audit logs
 - create an audit log entry (e.g. change a grade)
 - look at the generated audit log entry's id field; it should be a UUID
   value, not a 4 character slug

Change-Id: I19758fff4433cd6cb2e21219217dced19ee05c5a
Reviewed-on: https://gerrit.instructure.com/37506
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-07-11 16:58:42 +00:00
Cody Cutrer 92ea7c5be5 bundle check before bundle install for gem tests
they're likely already installed, and it will save a ton of trips
to rubygems.org

Change-Id: I9ccf2194619a6e8f97d7f21b4e232dac7ff20d3c
Reviewed-on: https://gerrit.instructure.com/35694
Reviewed-by: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-06-03 20:09:10 +00:00
Shawn Meredith e6de56a029 spec: vendored_gems pin rspec versions
Change-Id: Ibad1c172e58a69eb3a5a9ff2c874e861086ae227
Reviewed-on: https://gerrit.instructure.com/35756
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-06-03 14:54:02 +00:00
Simon Williams dc3b16f9bf add gem names to gem script runners
Change-Id: I0dad5345aae75e552af97f5b54ded10bbfebbe37
Reviewed-on: https://gerrit.instructure.com/33925
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
2014-04-28 15:51:28 +00:00
Nick Cloward f1009a38fe canvas kaltura gem
fixes CNVS-10479

test plan:
  - in a course with kaltura enabled
    - go to a discussion and add media
    - upload a video (use right tab, not the webcam)
    - save the video/discussion post
    - the video should be saved properly and viewable
      (this sometimes takes a minute of two)

Change-Id: I40b9174807707dd1fb41125e04705422a8711d5d
Reviewed-on: https://gerrit.instructure.com/32024
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-04-16 19:39:45 +00:00