ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,488 Commits 324 Branches 20,019 Tags 1.7 GiB
Commit Graph

16 Commits

Author SHA1 Message Date
Raphael Weiner dea07dc90f loosen rails version requirements for gems 
fixes: CNVS-12259

test plan:
- run unit tests, run bundle, verify app starts up without rails version
  conflicts

Change-Id: Iddd6167bbb8a4cc61ca015fc979236659e24da73
Reviewed-on: https://gerrit.instructure.com/33126
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
 2014-04-10 20:28:03 +00:00
Raphael Weiner e462a79ad0 Convert canvas_stringex to use rspec2 
Fixes CNVS-11915

No functional changes, only changes to test files.

Change-Id: I0880243af3ce971b44074d6d7afc4099287d720c
Reviewed-on: https://gerrit.instructure.com/32513
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
 2014-03-28 22:00:07 +00:00
Cody Cutrer 36e8d99b46 force a separate lockfile for rails 3 
also move the RAILS3 sentinel into the config folder, for easier
deploys, and normalize how sub-gems decide on rails 3

Change-Id: I39fda434bb3d94cf72e66774b6b9d11c968a3d5a
Reviewed-on: https://gerrit.instructure.com/31632
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-03-10 22:43:47 +00:00
Cody Cutrer cc510233b5 update fake_arel and remove some of our extensions that were merged upstream 
Change-Id: Id8a53c355584206a10d547a0567daa51efb4ec7b
Reviewed-on: https://gerrit.instructure.com/29592
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nick Cloward <ncloward@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
 2014-03-10 18:37:00 +00:00
Simon Williams c1af085ce3 cleanup stringex Gemfile slightly 
Change-Id: I983d64ab39ccfe8af8c48100e0074400c43d0443
Reviewed-on: https://gerrit.instructure.com/30766
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>
 2014-02-25 22:31:14 +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
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
Simon Williams 63830287ea don't use git to build vendored gem specification file list 
fixes CNVS-11072

test plan: in a canvas repository without a .git directory (like a deploy) call
a bundle command (like script/console).  it should not give you warnings about
missing .git directories

Change-Id: I2daa1371d97c94f7c3db81d3fd2bad387fcabaf8
Reviewed-on: https://gerrit.instructure.com/29947
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Stephan Hagemann <stephan@pivotallabs.com>
Product-Review: Stephan Hagemann <stephan@pivotallabs.com>
QA-Review: Stephan Hagemann <stephan@pivotallabs.com>
 2014-02-12 22:58:25 +00:00
Simon Williams 663776ada8 clean up stringex gem tests 
* clean up sqlite db after tests run in stringex gem
* test Redcloth correctly in stringex gem
* move database cleanup to test runner in stringex
* keep rails2 Gemfile.lock after running gem test runners

closes CNVS-11020

test plan:
- stringex tests should still pass in rails 2.3 and 3

Change-Id: Idde773ddf3c8158bb0040a2eae9d4ecc8c8c2d15
Reviewed-on: https://gerrit.instructure.com/29781
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Liz Abinante <labinante@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Reviewed-by: Raphael Weiner <rweiner@pivotallabs.com>
Reviewed-by: Stephan Hagemann <stephan@pivotallabs.com>
 2014-02-11 23:17:51 +00:00
James Williams 55f5f45e1e fix canvas_stringex gem spec for rails 3 
Change-Id: Ibb5a61130a0d0cf9b2b5d97eaa06d8b30711f9bf
Reviewed-on: https://gerrit.instructure.com/29856
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
 2014-02-10 16:30:12 +00:00
Simon Williams 1286381f50 rails 3 compatibility for stringex gem 
closes CNVS-11019

test plan:
- stringex tests should pass in rails3

Change-Id: I2768723eb37cf77deafc4cf567cf314006e17c93
Reviewed-on: https://gerrit.instructure.com/29747
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>
 2014-02-08 13:54:49 +00:00
Simon Williams 923cabad3d use syck for yaml parsing in canvas_stringex gem tests 
it already inherits this parser from canvas, but when running the tests in
isolation it needs to be told to use it explicitly.

closes CNVS-11018

test plan:
- stringex tests should pass in rails 2.3

Change-Id: I280c01523e5f66024a225d2a9cc50ac79896de17
Reviewed-on: https://gerrit.instructure.com/29734
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>
 2014-02-08 13:54:29 +00:00
Raphael Weiner 9044087ae1 use test.sh scripts for all gems 
Change-Id: If97bbe476b8bf747e3b83bb7bf22783e2508da69
Reviewed-on: https://gerrit.instructure.com/29507
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Stephan Hagemann <stephan@pivotallabs.com>
Product-Review: Stephan Hagemann <stephan@pivotallabs.com>
QA-Review: Stephan Hagemann <stephan@pivotallabs.com>
 2014-02-04 22:23:57 +00:00
James Williams aad199bc63 fix canvas_stringex dependency conflict for rails 3 
Change-Id: Id9eb79fb2a4ea546eded22cc4d92e35e2162a7db
Reviewed-on: https://gerrit.instructure.com/29514
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
 2014-02-03 17:52:37 +00:00
Raphael Weiner ad4165d0f0 trying to fix some stringex tests 
Change-Id: Ifcf20a8f6fa5bcd187eead1679e380587d9e8e13
Reviewed-on: https://gerrit.instructure.com/29502
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Stephan Hagemann <stephan@pivotallabs.com>
Product-Review: Stephan Hagemann <stephan@pivotallabs.com>
QA-Review: Stephan Hagemann <stephan@pivotallabs.com>
 2014-01-31 23:02:21 +00:00
Raphael Weiner 455b2fd840 convert stringex plugin to proper gem 
Change-Id: I947b3dee5adc0ac84ef56173c46a1927ca3f2936
Reviewed-on: https://gerrit.instructure.com/29469
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Stephan Hagemann <stephan@pivotallabs.com>
Product-Review: Stephan Hagemann <stephan@pivotallabs.com>
QA-Review: Stephan Hagemann <stephan@pivotallabs.com>
 2014-01-31 00:31:32 +00:00