Commit Graph

270 Commits

Author SHA1 Message Date
Jon Jensen ca0c0c43b4 fix performance and correctness of triggers, closes #4471, #5168
fixes the behavior such that we only toggle ungraded assignment counts
related to a particular user when his active enrollments in a given
course go from zero to one and vice versa.

also fixes performance issues in mysql. this required a custom trigger
body. see https://github.com/jenseng/hair_trigger/commit/326a10c for
the related hairtrigger commit to support this

Change-Id: Ie36b3d33ced69321f3a87468ab56480b1378d235
Reviewed-on: https://gerrit.instructure.com/6808
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-11-21 09:06:43 -07:00
JT Olds f69d40325a add instafail to rspec
testplan: n/a

Change-Id: Ie3330717a3fbadd58fe19993c3f5d46e27e1077e
Reviewed-on: https://gerrit.instructure.com/6997
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-11-15 16:37:04 -07:00
Bryan Madsen 227614a2a9 upgrade selenium gem to 2.12.0
Change-Id: Ia55e9b6f9f1dcf2ed5acaa4eada1d3f6971e500f
test-plan: n/a
Reviewed-on: https://gerrit.instructure.com/6905
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-11-11 17:19:15 -07:00
Zach Wily edad137315 add support for SAML encrypted assertions; fixes #5299
Change-Id: I12b9db32e324ecff043f4f72051999b0515f4e72
Reviewed-on: https://gerrit.instructure.com/6727
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-11-08 15:54:22 -07:00
Brian Palmer 4efba9ac0a update oauth lib to 0.4.5 and our usage to oauth 1.0a
This gem update required updating our twitter, linkedin, and gdocs
integrations to correctly provide the redirect uri and use the oauth
verifier on return, which we weren't doing before.

As a consequence, google no longer displays a big scary warning about
Canvas not being secure in its oauth usage.

Facebook uses oauth 2.0, so no changes were needed there.

refs #5892

refs #6127 (this stuff needs refactoring)

Change-Id: I04289638915b84dbe439bd57b36da90151c662b9
Reviewed-on: https://gerrit.instructure.com/6585
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-11-01 12:08:10 -06:00
Bryan Madsen 0161a8734b update selenium-webdriver gem to 2.10.0
Change-Id: I951108682c1dc509c5194aab82151c3c44acce4c
Reviewed-on: https://gerrit.instructure.com/6569
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-11-01 10:23:23 -06:00
Brian Palmer a6c537f948 remove rb-fsevent/rb-inotify from the gemfile
This doesn't work with our current deploy process, so it'll need to be
in devs' local Gemfile for now

Change-Id: Ia918672fac851b132c2e688a27bf9f20555f65c3
Reviewed-on: https://gerrit.instructure.com/6598
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-31 15:36:26 -06:00
Ryan Florence 718f9f34ea qunit + AMD javascript specs
new stuff
---------

- added curl.js AMD module loader
- converted existing js specs to use QUnit
- removed jasmine stuff
- added rake task to run js specs

dependencies!
-------------

you'll need to install http://www.phantomjs.org/
if you want to run the specs.

next step is to incorporate curl.js into our app
environment.


Change-Id: I0ba97bc9abe1494f87fdfc0eca51d987a759bc85
Reviewed-on: https://gerrit.instructure.com/6477
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-10-27 12:58:47 -06:00
Brian Palmer 20a2376fe0 switch to mocha mock framework for specs
Change-Id: Iae9689d00d71b684048a9fecfa0eb60794943ed7
Reviewed-on: https://gerrit.instructure.com/6462
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-10-27 08:37:13 -06:00
Jacob Fugal 3b2d4b38af include response-content-disposition in S3 download urls
when downloading a file (attachment) that's on S3, include the
response-content-disposition parameter in the redirect url so that the user
will get a Content-Disposition header from S3 giving the file the correct
disposition (attachment, not in-browser) and the correct filename (the
'natural' filename in S3 is that of the first copy of the file uploaded;
someone else may have uploaded it again with a different filename; we want them
to see the correct filename in the download).

CAVEATS:

 * in the case of duplicate files with different filenames, the content
   disposition will cause the correct filename to be used by the browser in
   saving/prompting-to-save the file, but the actual S3 filename will still be
   present in the URL if inspected.

 * the filename in the content-disposition is correctly quoted as per RFC 2616
   for ASCII, but a lot of browsers do it wrong. we are making no attempt to
   accomodate their idiosyncracies.

 * the http quoting we do is ghetto and doesn't account for multi-byte
   characters.

fixes #4473

Change-Id: I468a6ecdaee2946ab89172984adacf20b491d541
Reviewed-on: https://gerrit.instructure.com/6506
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-10-26 16:00:31 -06:00
Bryan Madsen 38dd77775c Add barista gem to test group
This fixes selenium/handlebars_spec on jenkins

Change-Id: I352e2269d663bdaa3d2a1ebf19db8f8fba5a895f
Reviewed-on: https://gerrit.instructure.com/6145
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-10-12 16:38:26 -06:00
Brian Palmer 1fe1b1ad6b csv lib compat in ruby 1.9.x
fastercsv is not supported in 1.9, instead csv in the stdlib has been
modified to be api compatible with fastercsv. in this first step, we
alias CSV to FasterCSV when running under 1.9. This allows 1.8.7 to
continue working with no changes.

Change-Id: I34c3a9031b6f4946380510e4833203e29a05073a
Reviewed-on: https://gerrit.instructure.com/5835
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-10-12 09:36:18 -06:00
Brian Palmer 5a48da71a1 move barista gems to the development Gemfile group
Change-Id: I14059147bd974cd9cf5d90cc55c7cf970f1464b5
Reviewed-on: https://gerrit.instructure.com/6106
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-10-11 10:42:33 -06:00
Brian Palmer 2ff3d60cbe Gemfile: allow rake 0.9.x
Change-Id: I5c3d45aad0a67f011cdc43ad36fd4beff6ae5ebb
Reviewed-on: https://gerrit.instructure.com/5848
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-10 12:35:09 -06:00
Ryan Shaw 51f7ecf586 add fs-events gem on osx/linux to make guard happy
Change-Id: I004fc6aba99cef99dcc8829ee674aec51e0bb3df
Reviewed-on: https://gerrit.instructure.com/6065
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-10 11:04:33 -06:00
Brian Palmer a72755b5c8 update to rails 2.3.14
Changelog: https://github.com/rails/rails/compare/v2.3.11...v2.3.14

The find_or_create_by_* fix is now integrated: 9f7ff621bd

Change-Id: If9ec011ef0d1bd26364fa18c7a50ff446f6792b1
Reviewed-on: https://gerrit.instructure.com/5847
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-10-10 08:24:38 -06:00
Bryan Madsen a13ae7c11d update test gems
Change-Id: I73ef873dcb8e1f7f2a6816f8466740f30dd2a8c1
Reviewed-on: https://gerrit.instructure.com/5927
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-10-03 09:27:27 -06:00
Jacob Fugal 7dd98cb064 fix google docs integration
use src from <content> element to download, instead of constructing our
own url (fragile!). also, use https instead of http.

Change-Id: I9e2ca48558b63522bc730309d64411208ad92f9c
Reviewed-on: https://gerrit.instructure.com/5922
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Jacob Fugal <jacob@instructure.com>
2011-09-29 16:15:58 -06:00
Ryan Shaw f9acb060ed upgrade compass to latest version
Change-Id: Idc2281df9d35ca8ec9713050fafd6bd1c32d0da3
Reviewed-on: https://gerrit.instructure.com/5851
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-29 12:44:23 -06:00
Ryan Shaw dbe7197867 fix Gaurdfile to handle nested directories
now we can have things like
app/coffeescripts/lib/myWidget.cofffee

(also changed to regex watch pattern to get rid
of deprecation warning)

Change-Id: Ia6561dcb57215b2b1b405bcd64c43d7fd2ded85d
Reviewed-on: https://gerrit.instructure.com/5894
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2011-09-28 15:15:03 -06:00
Ryan Shaw 44089f8ea1 pin coffee-script-source so generated code is same from all devs
Change-Id: I6b7858300250c870a15aaad80a0ab686fc817509
Reviewed-on: https://gerrit.instructure.com/5893
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2011-09-28 15:14:52 -06:00
Ryan Florence 0f9d86d0d8 Added JavaScript Specs and Client-side Templates
- New rake task `rake jst:compile` to precompile
  JavaScript templates into functions.

  Add handlebars templates to app/views/jst and
  they'll get compiled to public/javascripts/jst

- New rake task `rake jasmine` and `jasmine:ci` to
  run JavaScript specs.

  Add specs to spec/coffeescripts and they'll get
  compiled into spec/javascripts

- Added Guard gem `$ guard` that watches
  coffeescript and handlebars files and compiles
  them when changes are made.

- Created Handlebars Ruby class that precompiles
  the templates into JavaScript functions

- Added JS Template constructor to abstract
  our tempting API



Change-Id: Ie993d0fc50d49b161ed94dbc066c4475cefdc427
Reviewed-on: https://gerrit.instructure.com/5813
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-09-26 16:49:18 -06:00
Bryan Madsen d259963460 enable parallelization of selenium tests
Change-Id: I2cbe3f19df3df1442a45479337607bb829b54188
Reviewed-on: https://gerrit.instructure.com/5739
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-09-26 15:45:35 -06:00
Zach Wily cb703c969e add some url filtering to cutycapt websnap processing
Change-Id: I2931e6d10d6b58409c1fd9fe97061d3bda7609b3
Reviewed-on: https://gerrit.instructure.com/5413
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-09-06 14:46:14 -06:00
Bryan Madsen 381c398de0 fix broken selenium tests
Change-Id: I8363cd2fce7b79a07a7d2c2c0c629e0b585cb712
Reviewed-on: https://gerrit.instructure.com/5260
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-09-01 14:51:07 -06:00
Ryan Shaw 43b89f7487 fix markdown'ed text being truncated at first newline
Change-Id: I5b095a6f1269b9a72c97bfbaacc94e5d2b4ef18d
fixes: #5342
Reviewed-on: https://gerrit.instructure.com/5158
Reviewed-by: JT Olds <jt@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-08-19 14:56:12 -06:00
Zach Wily cd762f4129 pin closure-compiler to 1.0.0
Change-Id: I32f600ba35c8b503aaf884357de00169730bf1d1
Reviewed-on: https://gerrit.instructure.com/5096
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Zach Wily <zach@instructure.com>
2011-08-16 10:24:11 -06:00
Brian Palmer 6583ec3e7e pin macaddr gem to 1.0.0 , 1.2.0 has a dependency issue
Change-Id: I68b4d50134a5b1113d282aef2ef4e3892a82b6c7
Reviewed-on: https://gerrit.instructure.com/5031
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-08-10 12:06:07 -06:00
Zach Wily e3f02ecb15 upgrade selenium-webdriver gem
Change-Id: I514798d7be1b0270c3a12f0e0acaf6b27abeb249
Reviewed-on: https://gerrit.instructure.com/4756
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-07-22 09:17:33 -06:00
Brian Palmer 630200c32e support redis as well as memcache for a rails cache store
closes #4498

Change-Id: Icf29882d8c0d351574496ba0494c1d8c518a3e7f
Reviewed-on: https://gerrit.instructure.com/4580
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-07-20 14:59:03 -06:00
Jon Jensen b5035fe0d4 translation import/export scripts
Change-Id: I611fff95935c77caa818386e6ade5c8636df4e75
Reviewed-on: https://gerrit.instructure.com/4685
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-07-20 09:24:39 -06:00
Brian Palmer 6a2cc50391 document our oauth2 native app flow
next step: implement it

Change-Id: I6c6777ce046892d06048a2dcaac9a561a9fb7d3c
Reviewed-on: https://gerrit.instructure.com/4673
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-07-18 22:27:24 -06:00
Brian Palmer cf75405d03 upgrade selenium-webdriver gem to 2.0.1
and add a before check to make sure that the screen size is large enough
to successfully run the specs

Change-Id: I8ea55528add155d805047347965f93c45d64a00a
Reviewed-on: https://gerrit.instructure.com/4644
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Zach Wily <zach@instructure.com>
2011-07-13 16:25:21 -06:00
Bracken Mosbacker fe43ecbe26 update saml gem to allow shiboleth logins
Change-Id: I83d013867464f18f3bee805799ea0c0a060b0512
Reviewed-on: https://gerrit.instructure.com/4352
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-06-23 12:09:13 -06:00
Jon Jensen f544db6bc1 translation checker/extractor for rb/erb files
Change-Id: I019f701758d35d630bf39141bb283911cc483aa5
Reviewed-on: https://gerrit.instructure.com/4237
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-06-17 10:30:02 -06:00
JT Olds 61f3d6154c adding require_relative to gemfile
Change-Id: I959621adb8dff53627c07e66e402d2921220b1b4
Reviewed-on: https://gerrit.instructure.com/4220
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-06-16 08:42:55 -06:00
JT Olds 621bf39201 use UUID gem 2.3.2. closes github issue 27
Change-Id: Ibfa552c0ef3dd8097b9344d88b75504eba7a8b43
Reviewed-on: https://gerrit.instructure.com/4148
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-06-10 13:17:49 -06:00
Jon Jensen 58a25bd462 preliminary i18n setup, closes #4124
* i18n key scoping for controller/model/js/etc.
 * inline English translation support
 * rdiscount gem for markdown'ed translations
 * html_safe interpolation tweaks
 * label helpers
 * crummy tweak to translate symbol keys
 * internationalized most of lib, and some plugins/messages
 * conference i18n (view/model/controller/js)

Change-Id: I42772b9e19a110efbe855dc83a681be49ec98df2
Reviewed-on: https://gerrit.instructure.com/4080
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-06-06 14:19:03 -06:00
Jon Jensen cdcea387eb latest hairtrigger, fixes migration re-run risk
Change-Id: I0e4d598cd8619d12aab10a62fd35f3ef0f11cb31
Reviewed-on: https://gerrit.instructure.com/3952
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-06-01 08:50:34 -06:00
Jon Jensen 1478ac4795 mathml for screen readers, refs #4362
Change-Id: I833656291e55eab7c29dea46331cf096d47808d1
Reviewed-on: https://gerrit.instructure.com/3837
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-05-26 09:57:12 -06:00
Ryan Shaw ac9fa20da3 upgrade webdriver so find_elements works in ff4
Change-Id: I6cdb775d34f21637862f7f92c5b098bf48d4662c
Reviewed-on: https://gerrit.instructure.com/3797
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-24 12:03:52 -06:00
Jon Jensen cb21b51a21 latest hairtrigger, fixes schemadump problem
Change-Id: I7c7a60e0972c624c469b091f5be15dc92b5bccf1
Reviewed-on: https://gerrit.instructure.com/3829
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-24 10:47:25 -06:00
Zach Wily 4cf750ab0f pin the rake version to 0.8.7
Change-Id: I61e980b09122a170d714c92ea2253ca3f1ca8a08
Reviewed-on: https://gerrit.instructure.com/3793
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-23 14:16:57 -06:00
Zach Wily 8761b5e728 move sqlite out of the test group to its own
Change-Id: I8c68d42eafa88144bafc6bc8d29fc35c98ea1863
Reviewed-on: https://gerrit.instructure.com/3760
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-20 17:05:51 -06:00
Brian Palmer 0e0066faa9 add barista and coffeescript initializer
Change-Id: Ibd52c71f7a12d7adae4e3ec9322aebe7c300c19d
Reviewed-on: https://gerrit.instructure.com/3723
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-19 12:13:29 -06:00
Brian Palmer da2c6b922e improved periodic jobs support, refs #4226
periodic jobs are no longer run as a separate worker process, and will
be processed by all job nodes. now there's no longer a concept of a
"master" job node, all job nodes are equivalent.

Change-Id: I7110872c7895453adfea5401d15db504dd73a850
Reviewed-on: https://gerrit.instructure.com/3686
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-19 10:51:12 -06:00
Brian Whitmer 8dca8a0d19 update facebook integration to oauth 2
This should allow open source installs to now set up
their own Facebook apps if desired.  The facebooker
gem is no longer required and configuration now
happens in a plugin instead of a yml file.

fixes #4509

Change-Id: Iec76dc8c31f0ad0276e992319f368826baa4ccc5
Reviewed-on: https://gerrit.instructure.com/3545
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-10 16:18:23 -06:00
Brian Palmer 902cf8cc7c remove rack bug patch, it's been fixed in rack 1.1.2
Change-Id: I2bb16df697738a00fde6fa6bb61f79e72fc4d5d3
Reviewed-on: https://gerrit.instructure.com/3001
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-04-08 15:45:24 -06:00
Cody Cutrer 6283c3a7fc Delegate to CAS for auth. Closes #4130
Change-Id: I6bd3ef11314f75dd14b2fa9d835ecc40e43b5f3b
Reviewed-on: https://gerrit.instructure.com/2994
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-08 15:17:39 -06:00
Cody Cutrer 63bad32df0 Handle incoming mails. Closes #4016.
* Uses Mailman gem
 * Can be configured for POP3, Maildir, or stdin (push from mailserver)
 * Maildir can be chained with fetchmail or similar to support IMAP
 * Can be run as part of the job server, or as a separate process

Change-Id: I000000000000000000000000000001
Reviewed-on: https://gerrit.instructure.com/2971
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-07 10:46:11 -06:00
Jon Jensen 76255c2c98 new hairtrigger gem (now with rake db:schema:dump support)
Change-Id: I03419223c0e33d26a5c6cfc954385dc502422d63
Reviewed-on: https://gerrit.instructure.com/2929
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-04 09:17:55 -06:00
Brian Palmer 5058e00da7 use the redis-store gem rather than the github repo
Change-Id: I49e868a4fd368ee449e4dd1b33564178f87322c4
Reviewed-on: https://gerrit.instructure.com/2880
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-03-29 17:46:53 -06:00
JT Olds a16217d9f1 adding yui-compressor
Change-Id: I30d13183986cbb862d9b71c6b958b2f3c65baee0
Reviewed-on: https://gerrit.instructure.com/2866
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-03-29 15:46:11 -06:00
Zach Wily 42dcbb4157 order gems in Gemfile alphabetically
Change-Id: I61c7427c01a4aae9600c613cb9fadae2b11e9b66
Reviewed-on: https://gerrit.instructure.com/2865
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-29 15:23:55 -06:00
Jon Jensen 2352bb9e10 new rspec-rails (and rspec) to fix sporadic failures
this gets us the fix in https://rspec.lighthouseapp.com/projects/5645/tickets/946

when running "rake spec" without specifying SPEC, vendor/plugins/respondus_soap_endpoint/spec_canvas/integration/respondus_endpoint_spec.rb
is the first to run. because we use transactional fixtures, whichever spec
runs first is the only one to load them, and integration tests were looking
for fixtures in test/fixures. so later tests that use fixtures (currently just
web_conferences stuff) would fail.

Change-Id: I63f6be79614afbf48301b48ca2c3d97135abfdaa
Reviewed-on: https://gerrit.instructure.com/2847
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-29 14:00:01 -06:00
Jon Jensen 22aadd94de hairtrigger bump, new migration. fixes postgres trigger bug
Change-Id: Id949099be3605c2dd6dec79d96c546f6b366bc85
Reviewed-on: https://gerrit.instructure.com/2816
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-25 12:10:36 -06:00
Jon Jensen b1adc54e21 use latest hairtrigger gem for nicer model class loading
Change-Id: Ib3a21b6c6bdd7d7f229f6a7641f09cc65b0d49da
Reviewed-on: https://gerrit.instructure.com/2812
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-03-25 08:34:55 -06:00
Brian Palmer 65e402b1f9 support redis for session store, refs #4051
Change-Id: I8e846b3ce4b760606bff5586c8a94777f1cb93b3
Reviewed-on: https://gerrit.instructure.com/2757
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-23 13:25:04 -06:00
Jon Jensen ef72d6fde4 Merge branch 'dev/postgres' into master
Conflicts:
	config/initializers/active_record.rb

Change-Id: I625080d12e07122351e22d15b0864572c2ea09c5
2011-03-23 10:56:46 -06:00
Jon Jensen 63d09992d4 assignments.needs_grading_count counter to speed things up, closes #3945
Change-Id: I3748a7e0551e49720d06be302df29a8e33528007
Reviewed-on: https://gerrit.instructure.com/2573
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-03-23 10:36:15 -06:00
Jon Jensen f745f40073 Merge branch 'master' into dev/postgres
Conflicts:
	app/models/user.rb
	config/initializers/active_record.rb

Change-Id: Idc3b52dad873146efbb9268ecac28cac840f115e
2011-03-22 16:23:04 -06:00
Jon Jensen 4ea607cea4 postgres support and misc bugfixes, fixes #3574, #3943
Change-Id: I16aa188175a588b02dd6460baa83daae805aec9f
Reviewed-on: https://gerrit.instructure.com/2474
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-11 18:01:02 -07:00
Brian Palmer 3d245a8b7f switch to the C ext json gem
Change-Id: Ied939ad054b99095fbf0568ce262f85b0260f9b5
Reviewed-on: https://gerrit.instructure.com/2622
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-11 16:08:58 -07:00
Ryan Shaw d46070e330 switch to using selenium 2 (webdriver)
local file storage tests work, s3 tests fixed in
https://gerrit.instructure.com/2499

Change-Id: I1281be4343d4fe554733db3519a90e0f88bbd545
Reviewed-on: https://gerrit.instructure.com/2446
Reviewed-by: JT Olds <jt@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-04 13:24:40 -07:00
Brian Whitmer dfd90c83d9 make things work on windows with less hackery
The closure-compiler gem has an undocumented
dependency on Windows with Ruby < 1.9.  I've added
this to the Gemfile and also sent a message to
the gem's owner to hopefully get this fixed.

Change-Id: Ifb06b97013d541238cb834ca1773e16c1db11355
Reviewed-on: https://gerrit.instructure.com/2213
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-10 13:33:26 -07:00
Brian Palmer 9768c13341 put bluecloth in the correct gemfile group
Change-Id: Ic9f201d6bec3c7589957d1f3263c2b8507a8b237
Reviewed-on: https://gerrit.instructure.com/2241
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-10 08:44:41 -07:00
Zach Wily a5b7292710 upgrade to rails 2.3.11
Change-Id: I7043e9c4f4679277c23558da4c3d57d6dc142093
Reviewed-on: https://gerrit.instructure.com/2218
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-09 09:21:27 -07:00
Brian Palmer 93c2785230 add bluecloth to Gemfile for api doc generation
Change-Id: If82284dee307b55ee9c381d5e2d17fe4ac67af76
Reviewed-on: https://gerrit.instructure.com/2212
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-08 14:35:42 -07:00
Ryan Shaw ee7356f097 source only rubygems in gemfile, others are deprecated
gemcutter is now rubygems and github doesn't host
gems any more.

Change-Id: Ibb38fe87a5fe6527d90469eab3263c8dbc421d62
Reviewed-on: https://gerrit.instructure.com/2113
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Zach Wily <zach@instructure.com>
2011-02-05 06:22:22 -07:00
Brian Whitmer 8b8173dcc9 Initial commit.
closes #6988138
2011-01-31 18:57:29 -07:00