Skip to content
Browse files

Merge pull request #27 from ppworks/bundle_update

bundle update
  • Loading branch information...
2 parents e6fcaff + 39005ba commit 50667f664d2fa76fa2c414902a129a7116d554b0 @ppworks committed Apr 2, 2016
Showing with 201 additions and 193 deletions.
  1. +1 −1 .travis.yml
  2. +10 −11 Gemfile
  3. +183 −181 Gemfile.lock
  4. +7 −0 spec/spec_helper.rb
View
2 .travis.yml
@@ -1,5 +1,5 @@
before_script: cp config/application.yml.example config/application.yml
-before_install: gem install bundler --pre
+before_install: gem install bundler -v 1.11.2
language: ruby
rvm:
- 2.3.0
View
21 Gemfile
@@ -2,14 +2,14 @@ source 'https://rubygems.org'
ruby '2.3.0'
gem 'rails', '~> 4.2.5'
-gem 'responders', '~>2.0'
-gem 'jquery-rails', '>= 4.0.4'
+gem 'responders'
+gem 'jquery-rails'
gem 'turbolinks'
gem 'jquery-turbolinks'
-gem 'jbuilder', '~> 2.0'
-gem 'sass-rails', '~> 4.0'
-gem 'coffee-rails', '~> 4.0'
-gem 'uglifier', '>= 2.7.2'
+gem 'jbuilder'
+gem 'sass-rails'
+gem 'coffee-rails'
+gem 'uglifier'
gem 'haml-rails'
gem 'figaro'
gem 'pg'
@@ -27,7 +27,7 @@ gem 'omniauth-facebook'
gem 'omniauth-github'
gem 'fb_graph'
gem 'twitter'
-gem 'devise', '>= 3.5.4'
+gem 'devise'
gem 'validates_email_format_of'
gem 'enumerize'
gem 'dekiru'
@@ -41,7 +41,7 @@ end
group :development do
# Debugs
- gem 'annotate', git: 'git://github.com/ctran/annotate_models.git'
+ gem 'annotate'
gem 'awesome_print'
gem 'better_errors'
gem 'binding_of_caller'
@@ -73,17 +73,16 @@ group :test, :development do
gem 'guard-annotate'
gem 'guard-rspec', require: false
gem 'launchy'
- gem 'nokogiri', '>= 1.6.7.2'
+ gem 'nokogiri'
gem 'poltergeist'
gem 'rails-db-resetup'
gem 'rb-fsevent', require: RUBY_PLATFORM.downcase =~ /darwin/ ? 'rb-fsevent' : false
gem 'rspec-rails'
gem 'shoulda-matchers'
- gem 'spring', github: 'jonleighton/spring'
+ gem 'spring'
end
group :production, :staging do
gem 'rails_12factor'
gem 'newrelic_rpm'
end
-gem 'rails-html-sanitizer', '~> 1.0.3'
View
364 Gemfile.lock
@@ -1,17 +1,3 @@
-GIT
- remote: git://github.com/ctran/annotate_models.git
- revision: 52ffefcbe4e89cb172e2007eda0f74ac40798727
- specs:
- annotate (2.6.8)
- activerecord (>= 3.2, <= 4.3)
- rake (~> 10.4)
-
-GIT
- remote: git://github.com/jonleighton/spring.git
- revision: f18afb8c5ac951b7553c812482d491001b1425a8
- specs:
- spring (1.3.4)
-
GEM
remote: https://rubygems.org/
specs:
@@ -34,7 +20,7 @@ GEM
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- active_decorator (0.5.1)
+ active_decorator (0.7.0)
activejob (4.2.6)
activesupport (= 4.2.6)
globalid (>= 0.3.0)
@@ -51,12 +37,14 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- addressable (2.3.8)
+ addressable (2.4.0)
+ annotate (2.7.0)
+ activerecord (>= 3.2, < 6.0)
+ rake (~> 10.4)
arel (6.0.3)
- attr_required (1.0.0)
- autoprefixer-rails (5.1.8.1)
+ attr_required (1.0.1)
+ autoprefixer-rails (6.3.5)
execjs
- json
awesome_print (1.6.1)
bcrypt (3.1.11)
better_errors (2.1.1)
@@ -65,58 +53,65 @@ GEM
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
- bootstrap-sass (3.3.4.1)
- autoprefixer-rails (>= 5.0.0.1)
- sass (>= 3.2.19)
- brakeman (3.0.2)
+ bootstrap-sass (3.3.6)
+ autoprefixer-rails (>= 5.2.1)
+ sass (>= 3.3.4)
+ brakeman (3.2.1)
erubis (~> 2.6)
- fastercsv (~> 1.5)
haml (>= 3.0, < 5.0)
- highline (~> 1.6.20)
- multi_json (~> 1.2)
- ruby2ruby (~> 2.1.1)
- ruby_parser (~> 3.6.2)
+ highline (>= 1.6.20, < 2.0)
+ ruby2ruby (~> 2.3.0)
+ ruby_parser (~> 3.8.1)
+ safe_yaml (>= 1.0)
sass (~> 3.0)
+ slim (>= 1.3.6, < 4.0)
terminal-table (~> 1.4)
buftok (0.2.0)
- bugsnag (2.8.4)
- multi_json (~> 1.0)
+ bugsnag (4.0.0)
builder (3.2.2)
- bullet (4.14.4)
+ bullet (5.0.0)
activesupport (>= 3.0.0)
- uniform_notifier (>= 1.6.0)
- byebug (4.0.5)
- columnize (= 0.9.0)
- capybara (2.4.4)
+ uniform_notifier (~> 1.9.0)
+ byebug (8.2.2)
+ capybara (2.6.2)
+ addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
- celluloid (0.16.0)
- timers (~> 4.0.0)
chronic (0.10.2)
- chunky_png (1.3.4)
+ chunky_png (1.3.5)
cliver (0.3.2)
- coderay (1.1.0)
- coffee-rails (4.1.0)
+ coderay (1.1.1)
+ coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
- railties (>= 4.0.0, < 5.0)
+ railties (>= 4.0.0, < 5.1.x)
coffee-script (2.4.1)
coffee-script-source
execjs
- coffee-script-source (1.9.1.1)
- columnize (0.9.0)
- compass (0.12.7)
+ coffee-script-source (1.10.0)
+ compass (1.0.3)
chunky_png (~> 1.2)
- fssm (>= 0.2.7)
- sass (~> 3.2.19)
- compass-rails (2.0.0)
- compass (>= 0.12.2)
- daemons (1.2.2)
- database_cleaner (1.4.1)
+ compass-core (~> 1.0.2)
+ compass-import-once (~> 1.0.5)
+ rb-fsevent (>= 0.9.3)
+ rb-inotify (>= 0.9)
+ sass (>= 3.3.13, < 3.5)
+ compass-core (1.0.3)
+ multi_json (~> 1.0)
+ sass (>= 3.3.0, < 3.5)
+ compass-import-once (1.0.5)
+ sass (>= 3.2, < 3.5)
+ compass-rails (3.0.2)
+ compass (~> 1.0.0)
+ sass-rails (< 5.1)
+ sprockets (< 4.0)
+ concurrent-ruby (1.0.1)
+ daemons (1.2.3)
+ database_cleaner (1.5.1)
debug_inspector (0.0.2)
- dekiru (0.0.14)
+ dekiru (0.0.16)
http_accept_language (>= 2.0.0)
rails
delorean (2.1.0)
@@ -129,80 +124,84 @@ GEM
thread_safe (~> 0.1)
warden (~> 1.2.3)
diff-lcs (1.2.5)
- enumerize (0.11.0)
+ domain_name (0.5.20160310)
+ unf (>= 0.0.5, < 1.0.0)
+ enumerize (1.1.1)
activesupport (>= 3.2)
- equalizer (0.0.11)
+ equalizer (0.0.10)
erubis (2.7.0)
- eventmachine (1.0.7)
+ eventmachine (1.2.0.1)
execjs (2.6.0)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.5.0)
+ factory_girl_rails (4.6.0)
factory_girl (~> 4.5.0)
railties (>= 3.0.0)
- faker (1.4.3)
+ faker (1.6.3)
i18n (~> 0.5)
- faraday (0.9.1)
+ faraday (0.9.2)
multipart-post (>= 1.2, < 3)
- fastercsv (1.5.5)
fb_graph (2.7.17)
httpclient (>= 2.4)
multi_json (>= 1.3)
rack-oauth2 (>= 0.14.4)
tzinfo
- ffi (1.9.8)
- figaro (1.1.0)
+ ffi (1.9.10)
+ figaro (1.1.1)
thor (~> 0.14)
formatador (0.2.5)
- fssm (0.2.10)
globalid (0.3.6)
activesupport (>= 4.1.0)
- guard (2.12.5)
+ guard (2.13.0)
formatador (>= 0.2.4)
- listen (~> 2.7)
+ listen (>= 2.7, <= 4.0)
lumberjack (~> 1.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12)
shellany (~> 0.0)
thor (>= 0.18.1)
- guard-annotate (2.1)
+ guard-annotate (2.3)
annotate (~> 2.4, >= 2.4.0)
guard-compat (~> 1.2, >= 1.2.1)
guard-compat (1.2.1)
- guard-rspec (4.5.0)
+ guard-rspec (4.6.4)
guard (~> 2.1)
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
- haml (4.0.6)
+ haml (4.0.7)
tilt
haml-rails (0.9.0)
actionpack (>= 4.0.1)
activesupport (>= 4.0.1)
haml (>= 4.0.6, < 5.0)
html2haml (>= 1.0.1)
railties (>= 4.0.1)
- hashie (3.4.1)
- highline (1.6.21)
- hike (1.2.3)
+ hashie (3.4.3)
+ highline (1.7.8)
hirb (0.7.3)
hirb-unicode (0.0.5)
hirb (~> 0.5)
unicode-display_width (~> 0.1.1)
- hitimes (1.2.2)
html2haml (2.0.0)
erubis (~> 2.7.0)
haml (~> 4.0.0)
nokogiri (~> 1.6.0)
ruby_parser (~> 3.5)
- http (0.6.4)
+ http (1.0.4)
+ addressable (~> 2.3)
+ http-cookie (~> 1.0)
+ http-form_data (~> 1.0.1)
http_parser.rb (~> 0.6.0)
+ http-cookie (1.0.2)
+ domain_name (~> 0.5)
+ http-form_data (1.0.1)
http_accept_language (2.0.5)
http_parser.rb (0.6.0)
- httpclient (2.6.0.1)
+ httpclient (2.7.1)
i18n (0.7.0)
- jbuilder (2.2.13)
- activesupport (>= 3.0.0, < 5)
+ jbuilder (2.4.1)
+ activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jquery-rails (4.1.1)
rails-dom-testing (>= 1, < 3)
@@ -212,21 +211,20 @@ GEM
railties (>= 3.1.0)
turbolinks
json (1.8.3)
- jwt (1.4.1)
+ jwt (1.5.1)
kaminari (0.16.3)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
launchy (2.4.3)
addressable (~> 2.3)
- letter_opener (1.3.0)
+ letter_opener (1.4.1)
launchy (~> 2.2)
- listen (2.10.0)
- celluloid (~> 0.16.0)
+ listen (3.0.6)
rb-fsevent (>= 0.9.3)
- rb-inotify (>= 0.9)
+ rb-inotify (>= 0.9.7)
loofah (2.0.3)
nokogiri (>= 1.5.9)
- lumberjack (1.0.9)
+ lumberjack (1.0.10)
mail (2.6.4)
mime-types (>= 1.16, < 4)
memoizable (0.4.2)
@@ -240,57 +238,55 @@ GEM
multi_json (1.11.2)
multi_xml (0.5.5)
multipart-post (2.0.0)
- naught (1.0.0)
- nenv (0.2.0)
- newrelic_rpm (3.11.2.286)
+ naught (1.1.0)
+ nenv (0.3.0)
+ newrelic_rpm (3.15.1.316)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
- notiffany (0.0.6)
+ notiffany (0.0.8)
nenv (~> 0.1)
shellany (~> 0.0)
- oauth (0.4.7)
- oauth2 (1.0.0)
+ oauth (0.5.1)
+ oauth2 (1.1.0)
faraday (>= 0.8, < 0.10)
- jwt (~> 1.0)
+ jwt (~> 1.0, < 1.5.2)
multi_json (~> 1.3)
multi_xml (~> 0.5)
- rack (~> 1.2)
- omniauth (1.2.2)
+ rack (>= 1.2, < 3)
+ omniauth (1.3.1)
hashie (>= 1.2, < 4)
- rack (~> 1.0)
- omniauth-facebook (2.0.1)
+ rack (>= 1.0, < 3)
+ omniauth-facebook (3.0.0)
omniauth-oauth2 (~> 1.2)
omniauth-github (1.1.2)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
- omniauth-oauth (1.0.1)
+ omniauth-oauth (1.1.0)
oauth
omniauth (~> 1.0)
- omniauth-oauth2 (1.2.0)
- faraday (>= 0.8, < 0.10)
- multi_json (~> 1.3)
+ omniauth-oauth2 (1.4.0)
oauth2 (~> 1.0)
omniauth (~> 1.2)
- omniauth-twitter (1.1.0)
- multi_json (~> 1.3)
- omniauth-oauth (~> 1.0)
+ omniauth-twitter (1.2.1)
+ json (~> 1.3)
+ omniauth-oauth (~> 1.1)
orm_adapter (0.5.0)
- pg (0.18.1)
- poltergeist (1.6.0)
+ pg (0.18.4)
+ poltergeist (1.9.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
- polyamorous (1.2.0)
+ polyamorous (1.3.0)
activerecord (>= 3.0)
- pry (0.10.1)
+ pry (0.10.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
- pry-byebug (3.1.0)
- byebug (~> 4.0)
+ pry-byebug (3.3.0)
+ byebug (~> 8.0)
pry (~> 0.10)
- pry-doc (0.6.0)
+ pry-doc (0.8.0)
pry (~> 0.9)
yard (~> 0.8)
pry-rails (0.3.4)
@@ -301,9 +297,9 @@ GEM
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.4)
- rack-mini-profiler (0.9.3)
- rack (>= 1.1.3)
- rack-oauth2 (1.1.1)
+ rack-mini-profiler (0.9.9.2)
+ rack (>= 1.2.0)
+ rack-oauth2 (1.3.0)
activesupport (>= 2.3)
attr_required (>= 0.0.5)
httpclient (>= 2.4)
@@ -331,107 +327,111 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
- rails-i18n (4.0.4)
- i18n (~> 0.6)
+ rails-i18n (4.0.8)
+ i18n (~> 0.7)
railties (~> 4.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_autolink (1.1.6)
rails (> 3.1)
- rails_serve_static_assets (0.0.4)
- rails_stdout_logging (0.0.3)
+ rails_serve_static_assets (0.0.5)
+ rails_stdout_logging (0.0.5)
railties (4.2.6)
actionpack (= 4.2.6)
activesupport (= 4.2.6)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.5.0)
- ransack (1.6.6)
+ ransack (1.7.0)
actionpack (>= 3.0)
activerecord (>= 3.0)
activesupport (>= 3.0)
i18n
polyamorous (~> 1.2)
- rb-fsevent (0.9.4)
- rb-inotify (0.9.5)
+ rb-fsevent (0.9.7)
+ rb-inotify (0.9.7)
ffi (>= 0.5.0)
- rdoc (4.2.0)
+ rdoc (4.2.2)
+ json (~> 1.4)
responders (2.1.2)
railties (>= 4.2.0, < 5.1)
- rspec (3.2.0)
- rspec-core (~> 3.2.0)
- rspec-expectations (~> 3.2.0)
- rspec-mocks (~> 3.2.0)
- rspec-core (3.2.3)
- rspec-support (~> 3.2.0)
- rspec-expectations (3.2.1)
+ rspec (3.4.0)
+ rspec-core (~> 3.4.0)
+ rspec-expectations (~> 3.4.0)
+ rspec-mocks (~> 3.4.0)
+ rspec-core (3.4.4)
+ rspec-support (~> 3.4.0)
+ rspec-expectations (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.2.0)
- rspec-mocks (3.2.1)
+ rspec-support (~> 3.4.0)
+ rspec-mocks (3.4.1)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.2.0)
- rspec-rails (3.2.1)
+ rspec-support (~> 3.4.0)
+ rspec-rails (3.4.2)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
- rspec-core (~> 3.2.0)
- rspec-expectations (~> 3.2.0)
- rspec-mocks (~> 3.2.0)
- rspec-support (~> 3.2.0)
- rspec-support (3.2.2)
- ruby2ruby (2.1.3)
+ rspec-core (~> 3.4.0)
+ rspec-expectations (~> 3.4.0)
+ rspec-mocks (~> 3.4.0)
+ rspec-support (~> 3.4.0)
+ rspec-support (3.4.1)
+ ruby2ruby (2.3.0)
ruby_parser (~> 3.1)
sexp_processor (~> 4.0)
- ruby_parser (3.6.5)
+ ruby_parser (3.8.1)
sexp_processor (~> 4.1)
- sass (3.2.19)
- sass-rails (4.0.4)
+ safe_yaml (1.0.4)
+ sass (3.4.22)
+ sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
- sass (~> 3.2.2)
- sprockets (~> 2.8, < 2.12)
- sprockets-rails (~> 2.0)
+ sass (~> 3.1)
+ sprockets (>= 2.8, < 4.0)
+ sprockets-rails (>= 2.0, < 4.0)
+ tilt (>= 1.1, < 3)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
- sexp_processor (4.5.0)
+ sexp_processor (4.7.0)
shellany (0.0.1)
- shoulda-matchers (2.8.0)
- activesupport (>= 3.0.0)
- simple_form (3.1.0)
- actionpack (~> 4.0)
- activemodel (~> 4.0)
+ shoulda-matchers (3.1.1)
+ activesupport (>= 4.0.0)
+ simple_form (3.2.1)
+ actionpack (> 4, < 5.1)
+ activemodel (> 4, < 5.1)
simple_oauth (0.3.1)
+ slim (3.0.6)
+ temple (~> 0.7.3)
+ tilt (>= 1.3.3, < 2.1)
slop (3.6.0)
- sprockets (2.11.3)
- hike (~> 1.2)
- multi_json (~> 1.0)
- rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
- sprockets-rails (2.3.3)
- actionpack (>= 3.0)
- activesupport (>= 3.0)
- sprockets (>= 2.8, < 4.0)
+ spring (1.6.4)
+ sprockets (3.5.2)
+ concurrent-ruby (~> 1.0)
+ rack (> 1, < 3)
+ sprockets-rails (3.0.4)
+ actionpack (>= 4.0)
+ activesupport (>= 4.0)
+ sprockets (>= 3.0.0)
tapp (1.5.0)
thor
- terminal-table (1.4.5)
- thin (1.6.3)
+ temple (0.7.6)
+ terminal-table (1.5.2)
+ thin (1.6.4)
daemons (~> 1.0, >= 1.0.9)
- eventmachine (~> 1.0)
+ eventmachine (~> 1.0, >= 1.0.4)
rack (~> 1.0)
thor (0.19.1)
thread_safe (0.3.5)
- tilt (1.4.1)
- timers (4.0.1)
- hitimes
+ tilt (2.0.2)
turbolinks (2.5.3)
coffee-rails
- twitter (5.14.0)
+ twitter (5.16.0)
addressable (~> 2.3)
buftok (~> 0.2.0)
- equalizer (~> 0.0.9)
+ equalizer (= 0.0.10)
faraday (~> 0.9.0)
- http (~> 0.6.0)
+ http (~> 1.0)
http_parser.rb (~> 0.6.0)
json (~> 1.8)
memoizable (~> 0.4.0)
@@ -441,27 +441,30 @@ GEM
thread_safe (~> 0.1)
uglifier (3.0.0)
execjs (>= 0.3.0, < 3)
+ unf (0.1.4)
+ unf_ext
+ unf_ext (0.0.7.2)
unicode-display_width (0.1.1)
- uniform_notifier (1.8.0)
- validate_url (1.0.0)
+ uniform_notifier (1.9.0)
+ validate_url (1.0.2)
activemodel (>= 3.0.0)
addressable
- validates_email_format_of (1.6.2)
+ validates_email_format_of (1.6.3)
i18n
- view_source_map (0.1.0)
+ view_source_map (0.1.1)
rails (>= 3.2)
warden (1.2.6)
rack (>= 1.0)
web-console (3.1.1)
activemodel (>= 4.2)
debug_inspector
railties (>= 4.2)
- websocket-driver (0.5.4)
+ websocket-driver (0.6.3)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
xpath (2.0.0)
nokogiri (~> 1.3)
- xray-rails (0.1.15)
+ xray-rails (0.1.18)
coffee-rails
rails (>= 3.1.0)
yard (0.8.7.6)
@@ -471,7 +474,7 @@ PLATFORMS
DEPENDENCIES
active_decorator
- annotate!
+ annotate
awesome_print
better_errors
binding_of_caller
@@ -480,12 +483,12 @@ DEPENDENCIES
bugsnag
bullet
capybara
- coffee-rails (~> 4.0)
+ coffee-rails
compass-rails
database_cleaner
dekiru
delorean
- devise (>= 3.5.4)
+ devise
enumerize
factory_girl
factory_girl_rails
@@ -497,14 +500,14 @@ DEPENDENCIES
haml-rails
hirb
hirb-unicode
- jbuilder (~> 2.0)
- jquery-rails (>= 4.0.4)
+ jbuilder
+ jquery-rails
jquery-turbolinks
kaminari
launchy
letter_opener
newrelic_rpm
- nokogiri (>= 1.6.7.2)
+ nokogiri
omniauth
omniauth-facebook
omniauth-github
@@ -519,29 +522,28 @@ DEPENDENCIES
rack-mini-profiler
rails (~> 4.2.5)
rails-db-resetup
- rails-html-sanitizer (~> 1.0.3)
rails-i18n
rails_12factor
rails_autolink
ransack
rb-fsevent
- responders (~> 2.0)
+ responders
rspec-rails
- sass-rails (~> 4.0)
+ sass-rails
sdoc
shoulda-matchers
simple_form
- spring!
+ spring
tapp
thin
turbolinks
twitter
- uglifier (>= 2.7.2)
+ uglifier
validate_url
validates_email_format_of
view_source_map
web-console (>= 2.1.3)
xray-rails
BUNDLED WITH
- 1.10.6
+ 1.11.2
View
7 spec/spec_helper.rb
@@ -96,4 +96,11 @@
config.before(:all) do
FactoryGirl.reload
end
+
+ Shoulda::Matchers.configure do |config|
+ config.integrate do |with|
+ with.test_framework :rspec
+ with.library :rails
+ end
+ end
end

0 comments on commit 50667f6

Please sign in to comment.
Something went wrong with that request. Please try again.