removed rr, bump rspec version to 2.14, expect syntax, ruby 1.9.3/2.0…

….0 compatible
bryanrite · Jan 27, 2014 · cd04d23 · cd04d23
1 parent 8976293
commit cd04d23
Show file tree

Hide file tree

Showing 14 changed files with 438 additions and 440 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,7 @@
 rvm:
   - 1.8.7
+  - 1.9.3
+  - 2.0.0
   - ree
 notifications:
   recipients:

diff --git a/cancan.gemspec b/cancan.gemspec
@@ -10,9 +10,8 @@ Gem::Specification.new do |s|
   s.files        = Dir["{lib,spec}/**/*", "[A-Z]*", "init.rb"] - ["Gemfile.lock"]
   s.require_path = "lib"
 
-  s.add_development_dependency 'rspec', '~> 2.6.0'
+  s.add_development_dependency 'rspec', '~> 2.14.0'
   s.add_development_dependency 'rails', '~> 3.0.9'
-  s.add_development_dependency 'rr', '~> 0.10.11' # 1.0.0 has respond_to? issues: http://github.com/btakita/rr/issues/issue/43
   s.add_development_dependency 'supermodel', '~> 0.1.4'
 
   s.rubyforge_project = s.name