Bump RSpec version.

cupakromer · cupakromer · commit ffd3101b217b · 2015-12-21T22:17:15.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ spec/dummy/db/*.sqlite3-journal
 spec/dummy/log/*.log
 spec/dummy/tmp/
 spec/dummy/.sass-cache
+spec/examples.txt
diff --git a/.rspec b/.rspec
@@ -0,0 +1,2 @@
+--color
+--require spec_helper
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -120,23 +120,23 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-rails (3.3.3)
+      rspec-support (~> 3.4.0)
+    rspec-rails (3.4.0)
       actionpack (>= 3.0, < 4.3)
       activesupport (>= 3.0, < 4.3)
       railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
+      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)
     safe_yaml (1.0.4)
     slop (3.6.0)
     sprockets (3.2.0)
@@ -160,5 +160,8 @@ DEPENDENCIES
   kracken!
   pry
   pry-nav
-  rspec-rails (>= 3.0.0.rc1)
+  rspec-rails (~> 3.4)
   webmock
+
+BUNDLED WITH
+   1.10.6
diff --git a/bin/rspec b/bin/rspec
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')
diff --git a/kracken.gemspec b/kracken.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'faraday', '~> 0.8'
   s.add_dependency 'omniauth-oauth2', '~> 1.1'
 
-  s.add_development_dependency 'rspec-rails', '>= 3.0.0.rc1'
+  s.add_development_dependency 'rspec-rails', '~> 3.4'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'pry-nav'
   s.add_development_dependency 'webmock'
diff --git a/spec/kracken/authenticator_spec.rb b/spec/kracken/authenticator_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Kracken
-  describe Authenticator do
+  RSpec.describe Authenticator do
 
 
     describe ".with_credentials" do
diff --git a/spec/kracken/config_spec.rb b/spec/kracken/config_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Kracken
-  describe Config do
+  RSpec.describe Config do
 
     subject(:config){ Kracken::Config.new }
 
diff --git a/spec/kracken/controllers/authenticatable_spec.rb b/spec/kracken/controllers/authenticatable_spec.rb
@@ -8,7 +8,7 @@ class ControllerDouble < BaseControllerDouble
       include Kracken::Controllers::Authenticatable
     end
 
-    describe Authenticatable do
+    RSpec.describe Authenticatable do
       subject(:controller){ ControllerDouble.new }
 
       before do
diff --git a/spec/kracken/credential_authenticator_spec.rb b/spec/kracken/credential_authenticator_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Kracken
-  describe CredentialAuthenticator do
+  RSpec.describe CredentialAuthenticator do
 
     let(:json){ Fixtures.auth_hash.to_json }
 
diff --git a/spec/kracken/token_authenticator_spec.rb b/spec/kracken/token_authenticator_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Kracken
-  describe TokenAuthenticator do
+  RSpec.describe TokenAuthenticator do
     let(:json){ Fixtures.auth_hash.to_json }
 
     def set_request(status, body=nil)
diff --git a/spec/kracken_spec.rb b/spec/kracken_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Kracken do
+RSpec.describe Kracken do
   it "#setup yields the config block" do
     expect { |b| Kracken.setup(&b) }.to yield_with_args(Kracken.config)
   end
diff --git a/spec/routing/oauth_spec.rb b/spec/routing/oauth_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Kracken
-    describe "Kracken OAuth Routes", type: :routing do
+    RSpec.describe "Kracken OAuth Routes", type: :routing do
       routes { Kracken::Engine.routes }
 
       it "sign_out routes to sessions" do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -10,13 +10,27 @@
 
 RSpec.configure do |config|
   config.mock_with :rspec do |mocks|
-    mocks.syntax = :expect
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
     #mocks.verify_partial_doubles = true
+
+    mocks.allow_message_expectations_on_nil = false
+
     mocks.verify_doubled_constant_names = true
   end
 
   config.expect_with :rspec do |expectations|
-    expectations.syntax = :expect
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+
+    expectations.warn_about_potential_false_positives = true
   end
 
   # These two settings work together to allow you to limit a spec run
@@ -26,6 +40,22 @@
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
 
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
   # Many RSpec users commonly either run the entire suite or an individual
   # file, and it's useful to allow more verbose output when running an
   # individual spec file.
