bundle update, including RSpec 3.0

whitelist 'should' syntax for expectations and mocks

Author: tjgrathwell

Gemfile.lock

@@ -1,14 +1,11 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.18)
+    activesupport (3.2.19)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
     coderay (1.1.0)
     daemons (1.1.9)
     deckrb (0.5.2)
@@ -27,19 +24,17 @@ GEM
     eventmachine (1.0.3)
     ffi (1.9.3)
     files (0.3.1)
-    i18n (0.6.9)
+    i18n (0.6.11)
     json (1.8.1)
-    listen (2.7.4)
+    listen (2.7.9)
       celluloid (>= 0.15.2)
-      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     mini_portile (0.6.0)
-    multi_json (1.10.0)
-    nio4r (1.0.0)
-    nokogiri (1.6.2.1)
+    multi_json (1.10.1)
+    nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
-    polyglot (0.3.4)
+    polyglot (0.3.5)
     predicated (0.2.6)
     rack (1.5.2)
     rack-codehighlighter (0.5.0)
@@ -49,28 +44,32 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.3.1)
+    rake (10.3.2)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     redcarpet (2.3.0)
     rerun (0.10.0)
       listen (~> 2.7, >= 2.7.3)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    ruby2ruby (2.1.0)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.4)
+    ruby2ruby (2.1.1)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
-    ruby_parser (3.6.1)
+    ruby_parser (3.6.2)
       sexp_processor (~> 4.1)
-    sass (3.3.7)
-    sexp_processor (4.4.3)
+    sass (3.4.1)
+    sexp_processor (4.4.4)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)

spec/spec_helper.rb

@@ -14,5 +14,13 @@ def assert_loosely_equal lhs, rhs
 
 RSpec.configure do |c|
   c.include Files
+
+  c.expect_with :rspec do |expectations|
+    expectations.syntax = [:expect, :should]
+  end
+
+  c.mock_with :rspec do |mocks|
+    mocks.syntax = [:should, :expect]
+  end
 end