spec: parallelized_specs rspect handling

Change-Id: I7f573272b169132908f0f0be5a3e0e558a16b777
Reviewed-on: https://gerrit.instructure.com/26671
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>

Gemfile

@@ -142,7 +142,6 @@ group :test do
   gem 'simplecov-rcov', :require => false
   gem 'bluecloth', '2.0.10' # for generating api docs
   gem 'mocha', :git => 'git://github.com/ccutrer/mocha.git', :require => false
-  gem 'parallelized_specs', '0.4.84'
   gem 'thin', '1.5.1'
   if CANVAS_RAILS2
     gem 'rspec', '1.3.2'

Rakefile

@@ -15,7 +15,7 @@ require 'rdoc/task'
 
 if CANVAS_RAILS2
   require 'tasks/rails'
-  begin; require 'parallelized_specs/tasks'; rescue LoadError; end
+  begin; require 'parallelized_specs/lib/parallelized_specs/tasks'; rescue LoadError; end
 else
   CanvasRails::Application.load_tasks
 end

spec/spec_helper.rb

@@ -16,7 +16,11 @@
 # with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
+<<<<<<< HEAD
 
+=======
+begin; require File.expand_path(File.dirname(__FILE__) + "/../parallelized_specs/lib/parallelized_specs.rb"); rescue LoadError; end
+>>>>>>> spec: parallelized_specs rspect handling
 if ENV['COVERAGE'] == "1"
   puts "Code Coverage enabled"
   require 'simplecov'