Test with and without aasm

bf4 · bf4 · commit c0b8c8d34337 · 2018-12-17T10:49:56.000-06:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,6 @@
 language: ruby
 rvm:
   - 2.0.0
+gemfile:
+  - Gemfile
+  - gemfiles/aasm.gemfile
diff --git a/circuit_breaker.gemspec b/circuit_breaker.gemspec
@@ -59,7 +59,6 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ["History.txt", "README.txt"]
   s.rdoc_options = ["--main", "README.txt", "--charset=UTF-8"]
 
-  s.add_development_dependency "aasm"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
 end
diff --git a/gemfiles/aasm.gemfile b/gemfiles/aasm.gemfile
@@ -0,0 +1,3 @@
+eval_gemfile "../Gemfile"
+
+gem "aasm"
