Merge pull request #11 from RadiusNetworks/upgrade-rspec

cupakromer · cupakromer · commit 735daceb3a5d · 2015-12-21T22:20:07.000-05:00
Upgrade RSpec
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,13 @@
 .bundle/
+bundle/
+vendor/bundle/
 log/*.log
 pkg/
 spec/dummy/db/*.sqlite3
 spec/dummy/db/*.sqlite3-journal
 spec/dummy/log/*.log
 spec/dummy/tmp/
 spec/dummy/.sass-cache
+spec/examples.txt
+Gemfile.lock
+bin/
diff --git a/.rspec b/.rspec
@@ -0,0 +1,2 @@
+--color
+--require spec_helper
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,8 @@
 language: ruby
+bundler_args: --binstubs --jobs=3 --retry=3
+cache: bundler
+sudo: false
+script: bin/rake
 rvm:
-  - 2.1.0
+  - 2.1
+  - 2.2
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/app/controllers/kracken/sessions_controller.rb b/app/controllers/kracken/sessions_controller.rb
@@ -8,7 +8,6 @@ def index
 
     def create
       @user = user_class.find_or_create_from_auth_hash(auth_hash)
-      current_user = @user
       session[:user_id] = @user.id
       session[:user_cache_key] = cookies[:_radius_user_cache_key]
       session[:token_expires_at] = Time.zone.at(auth_hash[:credentials][:expires_at])
diff --git a/bin/rails b/bin/rails
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/lib/kracken/config.rb b/lib/kracken/config.rb
@@ -4,11 +4,11 @@ class Config
     attr_writer :provider_url, :user_class
 
     def provider_url
-      @provider_url || PROVIDER_URL
+      @provider_url ||= PROVIDER_URL
     end
 
     def user_class
-      @user_class || ::User
+      @user_class ||= ::User
     end
   end
 end
diff --git a/lib/kracken/controllers/authenticatable.rb b/lib/kracken/controllers/authenticatable.rb
@@ -92,8 +92,7 @@ def current_user=(u)
       end
 
       def current_user
-        return @current_user if @current_user
-        fetch_current_user
+        @current_user ||= fetch_current_user
       end
 
       def fetch_current_user
diff --git a/lib/kracken/controllers/json_api_compatible.rb b/lib/kracken/controllers/json_api_compatible.rb
@@ -1,5 +1,3 @@
-require 'kracken/controllers/json_api_compatible'
-
 module Kracken
   module Controllers
     module JsonApiCompatible
diff --git a/lib/omniauth/strategies/radius.rb b/lib/omniauth/strategies/radius.rb
@@ -23,16 +23,18 @@ def self.provider_url
       uid { raw_info['id'] }
 
       info do
-        raw_info["info"].slice *%w{
-          first_name
-          last_name
-          email
-          uid
-          confirmed
-          teams
-          admin
-          subscription_level
-        }
+        raw_info["info"].slice(
+          *%w{
+            first_name
+            last_name
+            email
+            uid
+            confirmed
+            teams
+            admin
+            subscription_level
+          }
+        )
       end
 
       extra do
diff --git a/spec/dummy/config/boot.rb b/spec/dummy/config/boot.rb
@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 $LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
diff --git a/spec/kracken/authenticator_spec.rb b/spec/kracken/authenticator_spec.rb
@@ -1,7 +1,7 @@
-require 'spec_helper'
+require 'rails_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'
+require 'rails_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
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 
 module Kracken
@@ -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'
+require 'rails_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'
+require 'rails_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'
+require 'rails_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/rails_helper.rb b/spec/rails_helper.rb
@@ -0,0 +1,37 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require 'spec_helper'
+require 'rspec/rails'
+# Add additional requires below this line. Rails is not loaded until this point!
+require 'webmock/rspec'
+
+Rails.backtrace_cleaner.remove_silencers!
+
+# Requires supporting ruby files with custom matchers and macros, etc, in
+# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
+# run as spec files by default. This means that files in spec/support that end
+# in _spec.rb will both be required and run as specs, causing the specs to be
+# run twice. It is recommended that you do not name files matching this glob to
+# end with _spec.rb. You can configure this pattern with the --pattern
+# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
+#
+# The following line is provided for convenience purposes. It has the downside
+# of increasing the boot-up time by auto-requiring all files in the support
+# directory. Alternatively, in the individual `*_spec.rb` files, manually
+# require only the support files necessary.
+#
+#Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
+Dir["#{__dir__}/support/**/*.rb"].each { |f| require f }
+
+RSpec.configure do |config|
+  # Filter lines from Rails gems in backtraces.
+  config.filter_rails_from_backtrace!
+  # arbitrary gems may also be filtered via:
+  # config.filter_gems_from_backtrace("gem name")
+
+  # If true, the base class of anonymous controllers will be inferred
+  # automatically. This will be the default behavior in future versions of
+  # rspec-rails.
+  config.infer_base_class_for_anonymous_controllers = false
+end
diff --git a/spec/requests/api_spec.rb b/spec/requests/api_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 module Kracken
   RSpec.describe 'token authenticatable resource requests', type: :request do
diff --git a/spec/requests/authentication_spec.rb b/spec/requests/authentication_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 module Kracken
   RSpec.describe "authenticatable resource requests", type: :request do
diff --git a/spec/routing/oauth_spec.rb b/spec/routing/oauth_spec.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
diff --git a/spec/support/omniauth.rb b/spec/support/omniauth.rb

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-require 'kracken/controllers/json_api_compatible'`
`2`		`-`
`3`	`1`	`module Kracken`
`4`	`2`	`module Controllers`
`5`	`3`	`module JsonApiCompatible`