Merge pull request #42 from xaviershay/rspec-3-compat

Rspec 3 compat
xaviershay · Nov 7, 2013 · 89fb999 · 89fb999
2 parents 44a173b + 15523f6
commit 89fb999
Show file tree

Hide file tree

Showing 9 changed files with 381 additions and 395 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,5 +8,4 @@ rvm:
   - ruby-head
 
 gemfile:
-  - spec/gemfiles/rspec-latest
-  - spec/gemfiles/rspec-master
+  - spec/gemfiles/rspec-2
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,21 +2,21 @@ PATH
   remote: .
   specs:
     rspec-fire (1.2.0)
-      rspec (~> 2.11)
+      rspec (>= 2.11, < 4)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.4)
     rake (10.0.4)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
+    rspec-mocks (2.14.4)
 
 PLATFORMS
   ruby