summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-06-10 01:38:36 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-06-10 01:38:36 -0400
commit11c611bc620519badeb4ce4a6bbb5d53ac96c207 (patch)
tree70efeb6706c315fa07cbb458a819e5c545b49795
parent700d4387ce3d57330ed76e6b8545f27996d99c5f (diff)
downloadgitlab-ce-11c611bc620519badeb4ce4a6bbb5d53ac96c207.tar.gz
Fix shoulda-matchers require
-rw-r--r--Gemfile2
-rw-r--r--spec/spec_helper.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index c73fab4ed7c..642df54c173 100644
--- a/Gemfile
+++ b/Gemfile
@@ -255,7 +255,7 @@ end
group :test do
gem 'simplecov', require: false
- gem 'shoulda-matchers', '~> 2.8.0'
+ gem 'shoulda-matchers', '~> 2.8.0', require: false
gem 'email_spec'
gem 'webmock', '~> 1.21.0'
gem 'test_after_commit'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 8cd00bdb2f9..9c8004ab555 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,7 @@
ENV["RAILS_ENV"] ||= 'test'
require File.expand_path("../../config/environment", __FILE__)
require 'rspec/rails'
+require 'shoulda/matchers'
require 'email_spec'
require 'sidekiq/testing/inline'