Commit Graph

49 Commits

Author SHA1 Message Date
kinezu b858cba8ca Taking appium mobile specs out of the canvas-lms project
They now live in their own private repository.

Change-Id: Id4e9e3f745c1311fc75f99bb62333af44b90f145
Reviewed-on: https://gerrit.instructure.com/66125
Tested-by: Jenkins
Reviewed-by: Taylor Wilson <twilson@instructure.com>
Product-Review: Derek Hansen <dhansen@instructure.com>
QA-Review: Derek Hansen <dhansen@instructure.com>
2015-11-05 16:33:55 +00:00
August Thornton c20ba6d47a remove github testbot dependency
testbot gem is now being referenced on the build machine locally and no longer relies on old github
reference to be used within Canvas

Change-Id: I4966f9afef38d6832bda7b88db125456850d7e57
Reviewed-on: https://gerrit.instructure.com/65259
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins
2015-10-16 22:21:34 +00:00
Jon Jensen 5d5af5827d allow # prefix for tickets
the # is not necessary, but now you won't get misleading linter messages
if you do one, e.g. refs #PROJ-123

test plan:
1. the linter should not complain about this commit message

Change-Id: I3eb9e5de093a5b8948c2892bd3ecdec8c3ea4add
Reviewed-on: https://gerrit.instructure.com/65225
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2015-10-15 17:10:24 +00:00
Derek Bender d6eaed579f create ProvisionalGrade table and model
- extracted some shared behavior between submissions and provisional grades
- improved organization in submissions

refs: CNVS-22006
Change-Id: I4207893362e4548d1d76d066322f3b333357807a
Reviewed-on: https://gerrit.instructure.com/59643
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Derek Bender <dbender@instructure.com>
2015-08-07 17:12:37 +00:00
Taylor Wilson a7ccecd772 Appium Specs for Mobile Apps
This includes a basic set of common methods and environment variables
to be used for both iOS and Android platforms with Appium. Includes the
inclusion of the appium_lib gem in Gemfile.d and a minor modification
to spec/spec_helper.rb to facilitate control of seeding the ID for
DeveloperKeys for Mobile Verify.

To Test:
  - remove skip statements in examples
  - uncomment the call to appium_init()
  - verify appium_lib gem installs during bundle update
  - spin up an Appium server
  - run spec with the QA Nexus 7 connected

Change-Id: Ia9830aeaa0b91635f5739958466e3176f25bf2bb
Reviewed-on: https://gerrit.instructure.com/58562
Tested-by: Jenkins
Reviewed-by: Heath Hales <hhales@instructure.com>
Reviewed-by: Ben Bolton <bbolton@instructure.com>
QA-Review: Ben Bolton <bbolton@instructure.com>
Product-Review: Ben Bolton <bbolton@instructure.com>
2015-07-28 20:26:08 +00:00
Jon Jensen 4a83f6b6a2 selinimum: run the minimum selenium necessary for your commit
What is this?
=============

Selinimum speeds up selenium by only running the specs it needs to for
your commit (iff it can safely determine that). For the purposes of the
initial implementation, that means that if your commit ONLY affects:

1. controllers (but not ApplicationController)
2. views (but not shared / layouts)
3. misc whitelisted stuff (images, .md files, etc.)

then it will only run the selenium specs that actually exercise those.
If your commit touches ANYTHING else (models, lib, etc.), all selenium
specs will run.

But wait, there's more!
=======================

Very soon selinimum will also handle:

1. js/coffee/jsx/hbs (except in the common bundle)
2. scss (except in the common bundle)

We already capture which bundles get used by each spec (see Capture), we
just need to correlate that with the individual files via a dependency
graph (probably using madge and sass-graph)

How does it work?
=================

The new post-merge selenium build will run all the specs with selinimum
capturing enabled. This records any controllers/views/js_bundle/css_bundle
that gets used in the course of each selenium spec, and stores a bunch of
data in S3.

Then when your patchset build runs, it will run Selinimum.minimize (via
corresponding tweak in rspect repo) on the list of spec files. If your
commit's dependents can be fully inferred and synthesized with the spec
dependency data from S3, only the relevant specs will actually be run.

Test Plan
=========

This commit doesn't actually cause selinimum to run on jenkins; that
requires some rspect changes and jenkins config. Refer to the test plan
here: https://gerrit.instructure.com/#/c/58088/

Change-Id: I991574c327a3a580c6fdc3ca3797dcfe0490a096
Reviewed-on: https://gerrit.instructure.com/58085
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2015-07-17 03:20:55 +00:00
Cody Cutrer 11d8f4a019 bump rspec-rails
Change-Id: Ibe94e273fd3df1088db01c115581658f1300d25e
Reviewed-on: https://gerrit.instructure.com/57730
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2015-07-06 23:13:42 +00:00
Cody Cutrer 2a09c45931 bump selenium-webdriver
Change-Id: I0943fd340cb97ecf62bbb63df5852af3fc24dfdb
Reviewed-on: https://gerrit.instructure.com/55729
Tested-by: Jenkins
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2015-06-12 20:55:18 +00:00
Brian Palmer 6b73a5efbd update redcarpet gem
Addresses vulnerability
a6c759d7e7

This gem is only used in dev/test, to generate the API docs. test plan: `rake
doc:api`, verify the docs still render correctly.

Change-Id: Ib1884ec5717bd6d252fa85cbfafb77f1be40ba24
Reviewed-on: https://gerrit.instructure.com/55350
Tested-by: Jenkins
Reviewed-by: August Thornton <august@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2015-06-01 19:35:28 +00:00
Hannah Bottalla cb4a6961e4 update bullet version
Change-Id: If67ffd74302656b8f732f46a2e772e5b6ac8edd1
Reviewed-on: https://gerrit.instructure.com/55352
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Jenkins
Product-Review: Hannah Bottalla <hannah@instructure.com>
QA-Review: Hannah Bottalla <hannah@instructure.com>
2015-05-29 18:16:47 +00:00
Hannah Bottalla 6f45600699 change bullet_instructure version
Change-Id: I5f3a371e0935a7aca1b304ce4cbd30ec16466fb8
Reviewed-on: https://gerrit.instructure.com/53689
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
Tested-by: Jenkins
Product-Review: Ethan Vizitei <evizitei@instructure.com>
QA-Review: Ethan Vizitei <evizitei@instructure.com>
2015-05-07 22:15:31 +00:00
Ethan Vizitei 19a71c6b64 add some ruby linting for jenkins to take advantage of
add migration lint as rubocop cops

create frozen constant linter

find_ids datafixup lint

send_later lint

lint send_later in predeploys

add freeze_constant cop to default config

don't forget to include rubocop when running

get the rubocop runner into the script

lint for wrong algorithm name

lint primary key

lint remove_column in predeploys

get rubocop output as parsed json

diff munging for gergich

disable a few style cops

tweak rubocop setup to allow IDE plugins to work

get gergich comment format right

shell out to gergich if we're in jenkins-land

Change-Id: I6eecc8d8ede17a755c9d9a86121c3658776de9cd
Reviewed-on: https://gerrit.instructure.com/51755
Tested-by: Jenkins
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Product-Review: Ethan Vizitei <evizitei@instructure.com>
QA-Review: Ethan Vizitei <evizitei@instructure.com>
2015-04-09 14:37:37 +00:00
Cody Cutrer b078234eff don't auto-require gems that are just dependencies
we have them in the gemfile to lock them to a specific version,
but normal behavior doesn't auto-require them

also, use 1.9 hash syntax in gemfiles (_except_ _before.rb)

Change-Id: I549c2775c65d48ff23ba1358b43713965df97813
Reviewed-on: https://gerrit.instructure.com/51636
Tested-by: Jenkins
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2015-04-08 15:55:26 +00:00
Zach Wily 5d232f03af initial live events implementation
This commit adds a new module called LiveEvents that knows how to send a
certain set of events to Kinesis. The module is configured via
normal plugin settings per account. Once the plugin is configured with
a Kinesis stream, events will start getting sent to that stream.

Events are sent asynchronously, in a background thread.

test plan:
 * See `doc/live_events.md` for instructions on how to setup a local
   kinesis stream and configure the LiveEvents plugin.
 * Start tailing the stream with the command specified in
   `doc/live_events.md` in a terminal.
 * Perform the actions described in `doc/api/live_events.md` and verify
   that events show up in your Kinesis terminal with the correct data.

Change-Id: Id799688c972205a1eee84a673912f84b0c7abb57
Reviewed-on: https://gerrit.instructure.com/50324
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: Jacob Fugal <jacob@instructure.com>
Product-Review: Zach Wily <zach@instructure.com>
2015-04-03 15:22:33 +00:00
Hannah Bottalla 88ba655dff update simplecov version
Change-Id: I3fb4db517a618b2115c7b692d6e10b9875c60d67
Reviewed-on: https://gerrit.instructure.com/49274
Tested-by: Jenkins
Reviewed-by: Shawn Meredith <shawn@instructure.com>
Product-Review: Shawn Meredith <shawn@instructure.com>
QA-Review: Shawn Meredith <shawn@instructure.com>
2015-02-27 17:04:25 +00:00
Cody Cutrer d34df4bc67 bump rails 3 to github branch for ruby 2.2 compatibility
see https://github.com/rails/rails/pull/18306 for discussion on
why it's not released yet

Change-Id: Id0de57432df9e7db1767c8f4d75c7734799148b9
Reviewed-on: https://gerrit.instructure.com/48828
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-18 22:55:20 +00:00
Cody Cutrer 334863eba2 bump rspec
Change-Id: Ief41ee5726c018747a7be7df9865c387da22b276
Reviewed-on: https://gerrit.instructure.com/48825
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2015-02-17 20:06:26 +00:00
James Williams 118dfa19a7 switch mocha git repo location
Change-Id: Idd7ae75de5294241874bf0bf9f66ebf0ddcd8747
Reviewed-on: https://gerrit.instructure.com/48735
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Tested-by: Shawn Meredith <shawn@instructure.com>
Product-Review: Shawn Meredith <shawn@instructure.com>
2015-02-12 23:32:22 +00:00
Benjamin Porter 1b86f2f51b Make outcomes API use error messages for validation failures
rather than silently changing the values.

Fixes CNVS-17630

Test Plan:

    Using the API:
        - set an outcomes calculation_method to an illegal value
          (anything besides 'decaying_average', 'n_mastery', 'latest',
          and 'highest'
        - Observe that you get an error message telling you it is an
          illegal value.
        - set an outcomes calculation_int to an illegal value
        - Observe that you get an error message telling you it is an
          illegal value.
        - Repeat the check for calculation_int for each calculation_method

Change-Id: Ic310583f7c14b25a0425fa809c0307d1f3194961
Reviewed-on: https://gerrit.instructure.com/46300
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Adam Stone <astone@instructure.com>
Product-Review: Benjamin Porter <bporter@instructure.com>
2015-01-07 18:12:13 +00:00
Cody Cutrer 8311ebb6c0 use bundler platform specifications for ruby 2.2
Change-Id: I14f09ef4a99d7cd5799eb97115c0d6f683957ce7
Reviewed-on: https://gerrit.instructure.com/46382
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2015-01-06 00:00:15 +00:00
Cody Cutrer 122045d219 bump bluecloth for a version that install unders ruby 2.2
Change-Id: I820fafdcc98e66b59564bfd962bd3ac4f03973a5
Reviewed-on: https://gerrit.instructure.com/46320
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:25:44 +00:00
Cody Cutrer 8c557564b2 bump eventmachine for ruby 2.2 support
Change-Id: Ifdee2ccf72083a8f273c71f0330a76e32d3c6c18
Reviewed-on: https://gerrit.instructure.com/46319
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:25:22 +00:00
Shawn Meredith ce8bdc00d1 spec: test thin upgrade
Change-Id: I20e4824a65eac59efbc484b2cc4be9fd11cfce02
Reviewed-on: https://gerrit.instructure.com/43641
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
2014-10-31 15:07:55 +00:00
Brian Palmer fac3b1019a spec: update test_after_commit
My fix was merged upstream.

Change-Id: I43f7b807f65cc738f930616f2a2ee685e78d0981
Reviewed-on: https://gerrit.instructure.com/43502
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-10-29 23:14:05 +00:00
Brian Palmer 5f80487ad9 after_transaction_commit gem extraction
refs CNVS-15881

our delayed_job depends on this, so I'm pulling it out into a gem first,
so that we can fully gemify our fork of delayed_job and use it in other
apps.

I modified the code to be built on top of the after_commit callback
functionality added in rails3, and I pulled in the test_after_commit gem
(after making a fix to it), which emulates transaction callbacks in test
mode. This makes it easier to write tests that interacts with these
callbacks, and cleans up some code in the app that was checking for test
mode and changing behavior. Fortunately, it behaves well with once-ler.

Side note: now that we are on rails3, we could replace some, but not
all, of our usage of after_transaction_commit with after_commit AR
callbacks. I didn't do that in this commit, to minimize churn.

test plan: things that happen in commit callbacks should still happen as
expected. for instance, with caching enabled, changing a /plugins
setting should still take effect immediately, because the cache is
cleared in a commit callback.

Change-Id: I66af5f66bf9fa9354352ed37edec8bd92d8e39c8
Reviewed-on: https://gerrit.instructure.com/41819
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-10-24 20:45:49 +00:00
Jon Jensen 50960779fd spec: fix once-ler/sharding issues
while recording, we weren't wrapping the default shard in a transaction,
so side effects could carry over to other groups/examples.

additionally, the previous version of once-ler added recording hooks to
any sharding group, whether or not it actually had any recordings. this
was sub-optimal, and also problematic for non-transactional tests.

this fixes a slew of the rerun failures.

also get rid of the ConnectionEnumerator, since an array suffices and is
easier to reason about (it was just like an array, except #each yielded
connections)

Change-Id: I8cf4d6fb74f2b048017a33c4fc50313cc8e5c19c
Reviewed-on: https://gerrit.instructure.com/38713
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2014-10-21 21:19:59 +00:00
Cody Cutrer be44418405 upgrade to rspec 3
fix a blocking thing, and add a compatibility gem

and a few final missed things

fixes CNVS-16239

Change-Id: I6ffa4569f936173393eaf7225f7463a4ccba1c7c
Reviewed-on: https://gerrit.instructure.com/42715
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Braden Anderson <braden@instructure.com>
Product-Review: Braden Anderson <braden@instructure.com>
QA-Review: Braden Anderson <braden@instructure.com>
2014-10-17 18:39:43 +00:00
Shawn Meredith 71b5d1f2a1 spec: selenium driver clean up and chrome handling
Change-Id: I6f4664c819122b4a3661ecdbf077587b3c26f1a4
Reviewed-on: https://gerrit.instructure.com/42210
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Hannah Bottalla <hannah@instructure.com>
Product-Review: Shawn Meredith <shawn@instructure.com>
QA-Review: Shawn Meredith <shawn@instructure.com>
2014-10-15 16:25:14 +00:00
Shawn Meredith 934209a6f3 spec: testbot rspec tagging
Change-Id: I20a5069fee3a5b75cc0208f312ea4135fd525bc4
Reviewed-on: https://gerrit.instructure.com/41519
Reviewed-by: Kyle Rosenbaum <kyler@instructure.com>
Product-Review: Shawn Meredith <shawn@instructure.com>
QA-Review: Shawn Meredith <shawn@instructure.com>
Tested-by: Shawn Meredith <shawn@instructure.com>
2014-09-22 20:30:38 +00:00
James Williams 064d3f198e bump selenium-webdriver gem
Change-Id: Ibe4b77daac743f545112985e4afb26cc443f6170
Reviewed-on: https://gerrit.instructure.com/41104
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Shawn Meredith <shawn@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
2014-09-15 17:34:25 +00:00
Cody Cutrer c689ac0add use ruby 2.1 compatible mocha with all versions of ruby
makes the lockfile the same between 1.9 and 2.1

Change-Id: I3ab1c3c7a7fcb8e6a5aba0170744d04739029209
Reviewed-on: https://gerrit.instructure.com/40753
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-09-09 00:42:00 +00:00
Shawn Meredith 3088d92cd9 spec: tesbot fragile specs and testbot fork
Change-Id: I088dee811f1f27cff6488fa32eac3efa08bffd85
Reviewed-on: https://gerrit.instructure.com/40349
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Kyle Rosenbaum <kyler@instructure.com>
Reviewed-by: Shawn Meredith <shawn@instructure.com>
Product-Review: Shawn Meredith <shawn@instructure.com>
QA-Review: Shawn Meredith <shawn@instructure.com>
Tested-by: Shawn Meredith <shawn@instructure.com>
2014-09-04 17:37:57 +00:00
Shawn Meredith 7031a47387 spec: testbot gems
Change-Id: I6277b485f40dc584a1157952b2e3f305dfa6a462
Reviewed-on: https://gerrit.instructure.com/38216
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>
Tested-by: Jenkins <jenkins@instructure.com>
2014-08-22 17:19:05 +00:00
James Williams 81558f728c remove rails 2 support
closes #CNVS-14261

Change-Id: I1b0e8a4438ab659ecd1ac8462bc3559d810989b3
Reviewed-on: https://gerrit.instructure.com/38744
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-08-06 18:16:19 +00:00
Hannah Bottalla 23a1ee79f8 add bullet_instructure gem and config
Change-Id: I044b10725d73cabccdee07403b4fa269c1d10944
Reviewed-on: https://gerrit.instructure.com/38279
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>
Reviewed-by: Adam Ard <aard@instructure.com>
2014-08-04 16:17:09 +00:00
Jon Jensen 4ce900eb07 spec: bump once-ler
Change-Id: I19c034e891b777e3d54539ca1ca563db56ee0e94
Reviewed-on: https://gerrit.instructure.com/37392
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-07-09 14:38:09 +00:00
Cody Cutrer e793f03740 spec: bump rspec
closer to 3.0, which we probably don't want to go to until
we can drop rspec 1 (rails 2)

Change-Id: I8affc4882bfc927a6d3b9bcc9c43fe5ab92cd3b7
Reviewed-on: https://gerrit.instructure.com/37326
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-07 23:16:53 +00:00
Jon Jensen c82a9bf2e0 spec: update once-ler
fix a couple issues so we don't have to do weird workarounds when
once-ler'ing certain specs. see:

https://github.com/instructure/once-ler/commit/2259e27
https://github.com/instructure/once-ler/commit/4f21997
https://github.com/instructure/once-ler/commit/8ec55d2

Change-Id: I516e9d2c4c66cabcd3b48460e65878e27bc2d379
Reviewed-on: https://gerrit.instructure.com/37167
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Dave Donahue <ddonahue@instructure.com>
Product-Review: Dave Donahue <ddonahue@instructure.com>
QA-Review: Dave Donahue <ddonahue@instructure.com>
2014-07-02 15:57:28 +00:00
Cody Cutrer c55c29371e allow ruby master to run with scary warning
sometimes it's needed to debug stuff in 2.1, cause it
fixes SystemStackError

bundler doesn't support it yet, so we have to use conditionals
instead of platform options

Change-Id: I88614634d24f36d7c18c999c1dc65eb91df65a32
Reviewed-on: https://gerrit.instructure.com/37010
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-02 02:45:59 +00:00
Jon Jensen f42af73427 spec: basic once-ler integration, speed up some specs
see https://github.com/instructure/once-ler

in rails3, reduce spec/models/a* runtime by ~45% (15min -> 8.5min locally)

Change-Id: Ia7bbc36c3602c3c3742c1b894e539584323f3e14
Reviewed-on: https://gerrit.instructure.com/37043
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Dave Donahue <ddonahue@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2014-07-01 02:59:23 +00:00
Shawn Meredith 5f75e6486e spec: remove bullet-instructure gem
Change-Id: I0881a9f5329b5c594fe55127548d4a54ba45ad60
Reviewed-on: https://gerrit.instructure.com/36964
Reviewed-by: Hannah Bottalla <hannah@instructure.com>
Product-Review: Hannah Bottalla <hannah@instructure.com>
QA-Review: Hannah Bottalla <hannah@instructure.com>
Tested-by: Hannah Bottalla <hannah@instructure.com>
2014-06-26 22:43:41 +00:00
Cody Cutrer 53160dfd4d use an unreleased mocha on ruby 2.1
Change-Id: I3bb3a6e51fc5f76d5fc31a1c894e83ea5d5b22ec
Reviewed-on: https://gerrit.instructure.com/36737
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-06-24 19:39:23 +00:00
Hannah Bottalla 55292628a2 add bullet_instructure gem to RAILS3
Change-Id: I3d0ae2c2d7ed9665f920d4aab79ae6837c67d32d
Reviewed-on: https://gerrit.instructure.com/36694
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Kyle Rosenbaum <kyler@instructure.com>
Product-Review: Hannah Bottalla <hannah@instructure.com>
QA-Review: Hannah Bottalla <hannah@instructure.com>
Tested-by: Hannah Bottalla <hannah@instructure.com>
2014-06-23 20:28:51 +00:00
Shawn Meredith 73c81c56a8 spec: selenium upgrade 2.42
Change-Id: I470f89d9cc9c73046dca54e451d0ee234f60d0a0
Reviewed-on: https://gerrit.instructure.com/36098
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>
2014-06-11 15:20:35 +00:00
Anthus Williams bd2eefce9a re-add indentation semantics to Gemfile
during a previous commit
(SHA 10e7b5b003bea9aea3286b9170f5e04b8a9e3735)
we removed indentation of gems, but this indentation
had semantic significance for us: any gem which was
not required by canvas but was required by another
gem required by canvas was indented. This allowed us
to clarify that canvas didn't actually use the gems
while still locking into specific versions of each

Also added a comment explaining this to Gemfile

Change-Id: I0f476e1bed6156f2f5969e54d56d44ded5442a0f
Reviewed-on: https://gerrit.instructure.com/32588
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Anthus Williams <awilliams@instructure.com>
QA-Review: Anthus Williams <awilliams@instructure.com>
2014-04-01 20:06:50 +00:00
Shawn Meredith 5e8cbc8d39 Revert "Revert "spec: selenium 2.40 firefox 2.70 upgrades""
This reverts commit 4498b890bd.

Change-Id: I73865e62e6953f78fa583427a99855719e300880
Reviewed-on: https://gerrit.instructure.com/32578
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>
Tested-by: Shawn Meredith <shawn@instructure.com>
2014-04-01 07:44:48 +00:00
Shawn Meredith 4498b890bd Revert "spec: selenium 2.40 firefox 2.70 upgrades"
This reverts commit de462a82d2.

Change-Id: I70f6ae29a4e8955b84d2be03672b3a7c9c1a6bd3
Reviewed-on: https://gerrit.instructure.com/32575
Reviewed-by: Shawn Meredith <shawn@instructure.com>
Product-Review: Shawn Meredith <shawn@instructure.com>
QA-Review: Shawn Meredith <shawn@instructure.com>
Tested-by: Shawn Meredith <shawn@instructure.com>
2014-03-31 08:38:50 +00:00
Shawn Meredith de462a82d2 spec: selenium 2.40 firefox 2.70 upgrades
Change-Id: I1b07116abbc86fe72cc2bda571fc07c71c016d0c
Reviewed-on: https://gerrit.instructure.com/32573
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>
Tested-by: Shawn Meredith <shawn@instructure.com>
2014-03-31 07:20:33 +00:00
Anthus Williams 5ed608bb72 partition Gemfile
this is a proof-of-concept to see if partitioning
our Gemfile helps more than it hurts. It's modeled
after the way the Squash team handles its dependencies

this doesn't implement any of the particularly nice
things that can be found in the Squash set up, such
as conditionally loading gems based on the contents
of our configuration files (we can already sort of
do this with groups in bundler), but it's a start.

In particular, it allows us to add non-OSS gems to
Gemfile.d without necessarily having to release it
as part of our open-source packaging

Change-Id: If7ff1fe97409de4cd09867ad5be1c4134c5d0117
Reviewed-on: https://gerrit.instructure.com/32442
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nick Cloward <ncloward@instructure.com>
Product-Review: Anthus Williams <awilliams@instructure.com>
QA-Review: Anthus Williams <awilliams@instructure.com>
2014-03-28 16:44:56 +00:00