switch_user 1.4.0 → 1.5.4

data/spec/provider/authlogic_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'switch_user/provider/authlogic'
 
@@ -33,5 +35,5 @@ RSpec.describe SwitchUser::Provider::Authlogic do
   let(:controller) { AuthlogicController.new }
   let(:provider) { SwitchUser::Provider::Authlogic.new(controller) }
 
-  it_behaves_like "a provider"
+  it_behaves_like 'a provider'
 end

data/spec/provider/clearance_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'switch_user/provider/clearance'
 
@@ -19,5 +21,5 @@ RSpec.describe SwitchUser::Provider::Clearance do
   let(:controller) { ClearanceController.new }
   let(:provider) { SwitchUser::Provider::Clearance.new(controller) }
 
-  it_behaves_like "a provider"
+  it_behaves_like 'a provider'
 end

data/spec/provider/devise_spec.rb

@@ -1,15 +1,16 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'switch_user/provider/devise'
 
 class FakeWardenSessionSerializer
   attr_accessor :user_hash
 
-
   def store(user, scope)
     return unless user
+
     user_hash[scope] = user
   end
-
 end
 
 class FakeWarden
@@ -54,34 +55,34 @@ RSpec.describe SwitchUser::Provider::Devise do
   let(:provider) { SwitchUser::Provider::Devise.new(controller) }
   let(:user) { double(:user) }
 
-  it_behaves_like "a provider"
+  it_behaves_like 'a provider'
 
-  it "can use alternate scopes" do
+  it 'can use alternate scopes' do
     user = double(:user)
     provider.login(user, :admin)
 
     expect(provider.current_user(:admin)).to eq user
   end
 
-  describe "#login_exclusive" do
+  describe '#login_exclusive' do
     before do
-      allow(SwitchUser).to receive(:available_users).and_return({:user => nil, :admin => nil})
+      allow(SwitchUser).to receive(:available_users).and_return(user: nil, admin: nil)
       provider.login(user, :admin)
-      provider.login_exclusive(user, :scope => "user")
+      provider.login_exclusive(user, scope: 'user')
     end
 
-    it "logs the user in" do
-      expect(provider.current_user).to eq user
+    it 'logs the user in' do
+      expect(provider.current_user(:user)).to eq user
     end
 
-    it "logs out other scopes" do
+    it 'logs out other scopes' do
       expect(provider.current_user(:admin)).to be_nil
     end
   end
 
-  describe "#logout_all" do
-    it "logs out users under all scopes" do
-      allow(SwitchUser).to receive(:available_users).and_return({:user => nil, :admin => nil})
+  describe '#logout_all' do
+    it 'logs out users under all scopes' do
+      allow(SwitchUser).to receive(:available_users).and_return(user: nil, admin: nil)
       provider.login(user, :admin)
       provider.login(user, :user)
 
@@ -92,17 +93,17 @@ RSpec.describe SwitchUser::Provider::Devise do
     end
   end
 
-  describe "#all_current_users" do
-    it "pulls users from an alternate scope" do
-      allow(SwitchUser).to receive(:available_users).and_return({:user => nil, :admin => nil})
+  describe '#all_current_users' do
+    it 'pulls users from an alternate scope' do
+      allow(SwitchUser).to receive(:available_users).and_return(user: nil, admin: nil)
       provider.login(user, :admin)
 
       expect(provider.current_users_without_scope).to eq [user]
     end
   end
 
-  describe "#current_user?" do
-    it "logs the user in" do
+  describe '#current_user?' do
+    it 'logs the user in' do
       user = double(:user)
       provider.login(user, :user)
 

data/spec/provider/dummy_spec.rb

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'switch_user/provider/dummy'
 
-class SessionController < TestController
-end
+class SessionController < TestController; end
 
 RSpec.describe SwitchUser::Provider::Session do
   let(:controller) { SessionController.new }
   let(:provider) { SwitchUser::Provider::Dummy.new(controller) }
 
-  it_behaves_like "a provider"
+  it_behaves_like 'a provider'
 end

data/spec/provider/restful_authentication_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'switch_user/provider/restful_authentication'
 
@@ -13,5 +15,5 @@ RSpec.describe SwitchUser::Provider::RestfulAuthentication do
   let(:controller) { RestfulAuthenticationController.new }
   let(:provider) { SwitchUser::Provider::RestfulAuthentication.new(controller) }
 
-  it_behaves_like "a provider"
+  it_behaves_like 'a provider'
 end

data/spec/provider/session_spec.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'switch_user/provider/session'
 
 class SessionController < TestController
   def current_user
-    User.find_by_id(session[:uid]) if session[:uid]
+    User.find_by(id: session[:uid]) if session[:uid]
   end
 end
 
@@ -14,5 +16,5 @@ RSpec.describe SwitchUser::Provider::Session do
   let(:controller) { SessionController.new }
   let(:provider) { SwitchUser::Provider::Session.new(controller) }
 
-  it_behaves_like "a provider"
+  it_behaves_like 'a provider'
 end

data/spec/provider/sorcery_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'switch_user/provider/sorcery'
 
@@ -20,5 +22,5 @@ RSpec.describe SwitchUser::Provider::Sorcery do
   let(:controller) { SorceryController.new }
   let(:provider) { SwitchUser::Provider::Sorcery.new(controller) }
 
-  it_behaves_like "a provider"
+  it_behaves_like 'a provider'
 end

data/spec/provider_spec.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module SwitchUser
   RSpec.describe Provider do
-    it "initializes the provider" do
+    it 'initializes the provider' do
       SwitchUser.provider = :dummy
       expect(Provider.init(double(:controller))).to be_a(Provider::Dummy)
     end

data/spec/rspec/feature_helpers_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'capybara/rspec'
@@ -6,32 +8,32 @@ Capybara.app = MyApp::Application
 
 require 'switch_user/rspec'
 
-RSpec.feature "SwitchUser::RSpecFeatureHelpers", :type => :feature do
+RSpec.feature 'SwitchUser::RSpecFeatureHelpers', type: :feature do
   background do
-    @user = User.create!(:email => "foo@bar.com", :admin => true)
-    @client = Client.create!(:email => "foo@bar.com")
+    @user = User.create!(email: 'foo@bar.com', admin: true)
+    @client = Client.create!(email: 'foo@bar.com')
   end
 
-  before(:each) do
-    allow(SwitchUser).to receive(:controller_guard).and_return(lambda{|current_user, request| true})
+  before(:example) do
+    allow(SwitchUser).to receive(:controller_guard).and_return(->(_current_user, _request) { true })
 
-    allow(SwitchUser).to receive(:available_users).and_return({:user => lambda { User.all }})
+    allow(SwitchUser).to receive(:available_users).and_return(user: -> { User.all })
 
-    allow(SwitchUser).to receive(:available_users_identifiers).and_return({:user => :id})
+    allow(SwitchUser).to receive(:available_users_identifiers).and_return(user: :id)
 
-    allow(SwitchUser).to receive(:available_users_names).and_return({:user => :email})
+    allow(SwitchUser).to receive(:available_users_names).and_return(user: :email)
   end
 
-  scenario "when controller_guard return false" do
-    allow(SwitchUser).to receive(:controller_guard).and_return(lambda{|current_user, request| false})
+  scenario 'when controller_guard return false' do
+    allow(SwitchUser).to receive(:controller_guard).and_return(->(_current_user, _request) { false })
 
     expect do
       switch_user @user
-    end.to_not raise_error ActionController::RoutingError, /Do not try to hack us/
+    end.not_to raise_error
   end
 
-  scenario "when controller_guard return false and controller call original available?" do
-    allow(SwitchUser).to receive(:controller_guard).and_return(lambda{|current_user, request| false})
+  scenario 'when controller_guard return false and controller call original available?' do
+    allow(SwitchUser).to receive(:controller_guard).and_return(->(_current_user, _request) { false })
 
     allow_any_instance_of(SwitchUserController).to receive(:available?).and_call_original
 
@@ -40,73 +42,73 @@ RSpec.feature "SwitchUser::RSpecFeatureHelpers", :type => :feature do
     end.to raise_error ActionController::RoutingError, /Do not try to hack us/
   end
 
-  scenario "arg is @user, available_users is default, and available_users_identifiers is default" do
+  scenario 'arg is @user, available_users is default, and available_users_identifiers is default' do
     expect do
       switch_user @user
-    end.to_not raise_error
+    end.not_to raise_error
   end
 
-  scenario "arg is @user, available_users is default, and available_users_identifiers is {user: id}" do
-    allow(SwitchUser).to receive(:available_users_identifiers).and_return({user: :id})
+  scenario 'arg is @user, available_users is default, and available_users_identifiers is {user: id}' do
+    allow(SwitchUser).to receive(:available_users_identifiers).and_return(user: :id)
 
     expect do
       switch_user @user
-    end.to_not raise_error
+    end.not_to raise_error
   end
 
-  scenario "arg is @user, available_users is default, and available_users_identifiers is {:client => :id}" do
-    allow(SwitchUser).to receive(:available_users_identifiers).and_return({:client => :id})
-    allow(SwitchUser).to receive(:available_users_names).and_return({:client => :email})
+  scenario 'arg is @user, available_users is default, and available_users_identifiers is {:client => :id}' do
+    allow(SwitchUser).to receive(:available_users_identifiers).and_return(client: :id)
+    allow(SwitchUser).to receive(:available_users_names).and_return(client: :email)
 
     expect do
       switch_user @user
     end.to raise_error SwitchUser::InvalidScope, /config.available_users_identifiers/
   end
 
-  scenario "arg is @client, available_users is default, and available_users_identifiers is default" do
+  scenario 'arg is @client, available_users is default, and available_users_identifiers is default' do
     expect do
       switch_user @client
     end.to raise_error SwitchUser::InvalidScope, /config.available_users/
   end
 
-  scenario "arg is @client, available_users is {:user => lambda { User.all }, :client => lambda {Client.all}}, and available_users_identifiers is default" do
-    allow(SwitchUser).to receive(:available_users).and_return({:user => lambda { User.all }, :client => lambda {Client.all}})
+  scenario 'arg is @client, available_users is {:user => lambda { User.all }, :client => lambda {Client.all}}, and available_users_identifiers is default' do
+    allow(SwitchUser).to receive(:available_users).and_return(user: -> { User.all }, client: -> { Client.all })
 
     expect do
       switch_user @client
     end.to raise_error SwitchUser::InvalidScope, /config.available_users_identifiers/
   end
 
-  scenario "arg is @client, available_users is {:user => lambda { User.all }, :client => lambda {Client.all}}, and available_users_identifiers is {:user => id, :client => id}" do
-    allow(SwitchUser).to receive(:available_users).and_return({:user => lambda { User.all }, :client => lambda {Client.all}})
+  scenario 'arg is @client, available_users is {:user => lambda { User.all }, :client => lambda {Client.all}}, and available_users_identifiers is {:user => id, :client => id}' do
+    allow(SwitchUser).to receive(:available_users).and_return(user: -> { User.all }, client: -> { Client.all })
 
-    allow(SwitchUser).to receive(:available_users_identifiers).and_return({:user => :id, :client => :id})
-    allow(SwitchUser).to receive(:available_users_names).and_return({:user => :email, :client => :email})
+    allow(SwitchUser).to receive(:available_users_identifiers).and_return(user: :id, client: :id)
+    allow(SwitchUser).to receive(:available_users_names).and_return(user: :email, client: :email)
 
     expect do
       switch_user @client
-    end.to_not raise_error
+    end.not_to raise_error
   end
 
-  scenario "args is :user and @user.id, available_users is default, and available_users_identifiers is default" do
+  scenario 'args is :user and @user.id, available_users is default, and available_users_identifiers is default' do
     expect do
       switch_user :user, @user.id
-    end.to_not raise_error
+    end.not_to raise_error
   end
 
-  scenario "arg is :client and @client.id, available_users is default, and available_users_identifiers is default" do
+  scenario 'arg is :client and @client.id, available_users is default, and available_users_identifiers is default' do
     expect do
       switch_user :client, @client.id
     end.to raise_error SwitchUser::InvalidScope, /config.available_users/
   end
 
-  scenario "args is :user, available_users is default, and available_users_identifiers is default" do
+  scenario 'args is :user, available_users is default, and available_users_identifiers is default' do
     expect do
       switch_user :user
     end.to raise_error SwitchUser::RSpecFeatureHelpers::InvalidArgument, /user_id is empty/
   end
 
-  scenario "args is :user and nil, available_users is default, and available_users_identifiers is default" do
+  scenario 'args is :user and nil, available_users is default, and available_users_identifiers is default' do
     expect do
       switch_user :user, nil
     end.to raise_error SwitchUser::RSpecFeatureHelpers::InvalidArgument, /user_id is empty/
@@ -118,10 +120,9 @@ RSpec.feature "SwitchUser::RSpecFeatureHelpers", :type => :feature do
     end.to raise_error SwitchUser::RSpecFeatureHelpers::InvalidArgument, /user_id is empty/
   end
 
-  scenario "args is :user and 0, available_users is default, and available_users_identifiers is default" do
+  scenario 'args is :user and 0, available_users is default, and available_users_identifiers is default' do
     expect do
       switch_user :user, 0
-    end.to_not raise_error
+    end.not_to raise_error
   end
-
 end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
-ENV["RAILS_ENV"] = "test"
+# frozen_string_literal: true
+
+ENV['RAILS_ENV'] = 'test'
 require 'support/provider'
 require 'support/application'
 require 'rspec/rails'
@@ -7,7 +9,7 @@ require 'pry'
 require 'awesome_print'
 
 RSpec.configure do |config|
-  config.filter_run :focus => true
+  config.filter_run focus: true
   config.run_all_when_everything_filtered = true
   config.use_transactional_fixtures = true
   config.expose_dsl_globally = false

data/spec/support/application.rb

@@ -1,51 +1,64 @@
-require "rails"
-require "rails/all"
-require 'switch_user/rails'
+# frozen_string_literal: true
 
+require 'rails'
+require 'rails/all'
+require 'switch_user/rails'
 
 class ApplicationController < ActionController::Base
   def require_user
-    current_user || redirect_to("/dummy/open")
+    current_user || redirect_to('/dummy/open')
   end
 
   def current_user
-    User.find_by_id(session[SwitchUser.session_key])
+    User.find_by(id: session[SwitchUser.session_key])
   end
 
   def login
     user = User.find(params[:id])
     session[SwitchUser.session_key] = user.id
 
-    redirect_to("/dummy/protected")
+    redirect_to('/dummy/protected')
   end
 
   def logout
     session[SwitchUser.session_key] = nil
 
-    redirect_to("/dummy/open")
+    redirect_to('/dummy/open')
   end
 end
 
 class DummyController < ApplicationController
-  before_filter :require_user, :only => :protected
+  before_action :require_user, only: :protected
 
   def authenticated
-    render :text => current_user.inspect
+    if Rails.version.to_i >= 5
+      render plain: current_user.inspect
+    else
+      render text: current_user.inspect
+    end
   end
 
   def open
-    render :text => view_context.switch_user_select
+    if Rails.version.to_i >= 5
+      render plain: view_context.switch_user_select
+    else
+      render text: view_context.switch_user_select
+    end
   end
 
   def protected
-    render :text => view_context.switch_user_select
+    if Rails.version.to_i >= 5
+      render plain: view_context.switch_user_select
+    else
+      render text: view_context.switch_user_select
+    end
   end
 end
 
 module MyApp
   class Application < Rails::Application
     config.active_support.deprecation = :log
-    config.secret_key_base = "abc123"
+    config.secret_key_base = 'abc123'
     config.eager_load = true
     config.secret_token = '153572e559247c7aedd1bca5a246874d'
 
@@ -53,15 +66,16 @@ module MyApp
     config.action_dispatch.show_exceptions = false
   end
 end
+
 Rails.application.initialize!
 Rails.application.routes.draw do
-  get 'dummy/protected', :to => "dummy#protected"
-  get 'dummy/open', :to => "dummy#open"
-  post 'login', :to => "dummy#login"
-  get 'logout', :to => "dummy#logout"
-  get 'authenticated', :to => "dummy#authenticated"
-  get :switch_user, :to => 'switch_user#set_current_user'
-  get 'switch_user/remember_user', :to => 'switch_user#remember_user'
+  get 'dummy/protected', to: 'dummy#protected'
+  get 'dummy/open', to: 'dummy#open'
+  post 'login', to: 'dummy#login'
+  get 'logout', to: 'dummy#logout'
+  get 'authenticated', to: 'dummy#authenticated'
+  get :switch_user, to: 'switch_user#set_current_user'
+  get 'switch_user/remember_user', to: 'switch_user#remember_user'
 end
 
 connection = ActiveRecord::Base.connection
@@ -70,12 +84,10 @@ connection.create_table :users do |t|
   t.column :admin, :boolean
 end
 
-class User < ActiveRecord::Base
-end
+class User < ActiveRecord::Base; end
 
 connection.create_table :clients do |t|
   t.column :email, :string
 end
 
-class Client < ActiveRecord::Base
-end
+class Client < ActiveRecord::Base; end