clearance 2.9.3 → 2.11.0

data/spec/configuration_spec.rb

@@ -1,5 +1,12 @@
 require "spec_helper"
 
+MyController = Class.new
+DummyGuard = Class.new
+Account = Class.new(ActiveRecord::Base)
+CustomUser = Class.new(ActiveRecord::Base)
+ConfiguredUser = Class.new
+MyUser = Class.new
+
 describe Clearance::Configuration do
   let(:config) { Clearance.configuration }
 
@@ -10,14 +17,6 @@ describe Clearance::Configuration do
   end
 
   context "when a custom user_model_name is specified" do
-    before(:each) do
-      MyUser = Class.new
-    end
-
-    after(:each) do
-      Object.send(:remove_const, :MyUser)
-    end
-
     it "is used instead of User" do
       Clearance.configure { |config| config.user_model = MyUser }
 
@@ -38,14 +37,6 @@ describe Clearance::Configuration do
   end
 
   context "when a custom parent_controller is specified" do
-    before(:each) do
-      MyController = Class.new
-    end
-
-    after(:each) do
-      Object.send(:remove_const, :MyController)
-    end
-
     it "is used instead of ApplicationController" do
       Clearance.configure { |config| config.parent_controller = MyController }
 
@@ -139,7 +130,6 @@ describe Clearance::Configuration do
 
   context "when specifying sign in guards" do
     it "returns the stack with added guards" do
-      DummyGuard = Class.new
       Clearance.configure { |config| config.sign_in_guards = [DummyGuard] }
 
       expect(Clearance.configuration.sign_in_guards).to eq [DummyGuard]
@@ -192,7 +182,7 @@ describe Clearance::Configuration do
         expect(Clearance.configuration.allow_password_reset?).to eq true
       end
     end
-  end  
+  end
 
   describe "#user_actions" do
     context "when allow_sign_up is configured to false" do
@@ -218,7 +208,6 @@ describe Clearance::Configuration do
     end
 
     it "returns the parameter key to use based on the user_model by default" do
-      Account = Class.new(ActiveRecord::Base)
       Clearance.configure { |config| config.user_model = Account }
 
       expect(Clearance.configuration.user_parameter).to eq :account
@@ -227,7 +216,6 @@ describe Clearance::Configuration do
 
   describe "#user_id_parameter" do
     it "returns the parameter key to use based on the user_model" do
-      CustomUser = Class.new(ActiveRecord::Base)
       Clearance.configure { |config| config.user_model = CustomUser }
 
       expect(Clearance.configuration.user_id_parameter).to eq :custom_user_id
@@ -247,7 +235,6 @@ describe Clearance::Configuration do
 
   describe "#reload_user_model" do
     it "returns the user model class if one has already been configured" do
-      ConfiguredUser = Class.new
       Clearance.configure { |config| config.user_model = ConfiguredUser }
 
       expect(Clearance.configuration.reload_user_model).to eq ConfiguredUser

data/spec/controllers/apis_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 class ApisController < ActionController::Base
   include Clearance::Controller
@@ -21,7 +21,7 @@ describe ApisController do
     Rails.application.reload_routes!
   end
 
-  it 'responds with HTTP status code 401 when denied' do
+  it "responds with HTTP status code 401 when denied" do
     get :show, format: :js
     expect(subject).to respond_with(:unauthorized)
   end

data/spec/controllers/forgeries_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 class ForgeriesController < ActionController::Base
   include Clearance::Controller
@@ -11,43 +11,43 @@ class ForgeriesController < ActionController::Base
   self.allow_forgery_protection = true
 
   def create
-    redirect_to action: 'index'
+    redirect_to action: "index"
   end
 end
 
 describe ForgeriesController do
-  context 'signed in user' do
+  context "signed in user" do
     before do
       Rails.application.routes.draw do
         resources :forgeries
-        get '/sign_in'  => 'clearance/sessions#new', as: 'sign_in'
+        get "/sign_in" => "clearance/sessions#new", :as => "sign_in"
       end
 
       @user = create(:user)
-      @user.update_attribute(:remember_token, 'old-token')
-      @request.cookies['remember_token'] = 'old-token'
+      @user.update_attribute(:remember_token, "old-token")
+      @request.cookies["remember_token"] = "old-token"
     end
 
     after do
       Rails.application.reload_routes!
     end
 
-    it 'succeeds with authentic token' do
+    it "succeeds with authentic token" do
       token = controller.send(:form_authenticity_token)
       post :create, params: {
-        authenticity_token: token,
+        authenticity_token: token
       }
-      expect(subject).to redirect_to(action: 'index')
+      expect(subject).to redirect_to(action: "index")
     end
 
-    it 'fails with invalid token' do
+    it "fails with invalid token" do
       post :create, params: {
-        authenticity_token: "hax0r",
+        authenticity_token: "hax0r"
       }
       expect(subject).to deny_access
     end
 
-    it 'fails with no token' do
+    it "fails with no token" do
       post :create
       expect(subject).to deny_access
     end

data/spec/controllers/passwords_controller_spec.rb

@@ -18,7 +18,7 @@ describe Clearance::PasswordsController do
         user = create(:user)
 
         post :create, params: {
-          password: { email: user.email.upcase },
+          password: {email: user.email.upcase}
         }
 
         expect(user.reload.confirmation_token).not_to be_nil
@@ -29,18 +29,18 @@ describe Clearance::PasswordsController do
         user = create(:user)
 
         post :create, params: {
-          password: { email: user.email },
+          password: {email: user.email}
         }
 
         email = ActionMailer::Base.deliveries.last
-        expect(email.subject).to match(translated_string("passwords.edit.title"))
+        expect(email.subject).to match(I18n.t("passwords.edit.title"))
       end
 
       it "re-renders the page when turbo is enabled" do
         user = create(:user)
 
         post :create, params: {
-          password: { email: user.email.upcase },
+          password: {email: user.email.upcase}
         }
 
         expect(response).to have_http_status(:accepted)
@@ -50,16 +50,16 @@ describe Clearance::PasswordsController do
     context "email param is missing" do
       it "displays flash error on new page" do
         post :create, params: {
-          password: {},
+          password: {}
         }
 
-        expect(flash.now[:alert]).to match(translated_string("flashes.failure_when_missing_email"))
+        expect(flash.now[:alert]).to match(I18n.t("flashes.failure_when_missing_email"))
         expect(response).to render_template(:new)
       end
 
       it "re-renders the page when turbo is enabled" do
         post :create, params: {
-          password: {},
+          password: {}
         }
 
         expect(response).to have_http_status(:unprocessable_entity)
@@ -70,19 +70,19 @@ describe Clearance::PasswordsController do
       it "displays flash error on new page" do
         post :create, params: {
           password: {
-            email: "",
-          },
+            email: ""
+          }
         }
 
-        expect(flash.now[:alert]).to match(translated_string("flashes.failure_when_missing_email"))
+        expect(flash.now[:alert]).to match(I18n.t("flashes.failure_when_missing_email"))
         expect(response).to render_template(:new)
       end
 
       it "re-renders the page when turbo is enabled" do
         post :create, params: {
           password: {
-            email: "",
-          },
+            email: ""
+          }
         }
 
         expect(response).to have_http_status(:unprocessable_entity)
@@ -95,7 +95,7 @@ describe Clearance::PasswordsController do
         email = "this_user_does_not_exist@non_existent_domain.com"
 
         post :create, params: {
-          password: { email: email },
+          password: {email: email}
         }
 
         expect(ActionMailer::Base.deliveries).to be_empty
@@ -105,7 +105,7 @@ describe Clearance::PasswordsController do
         email = "this_user_does_not_exist@non_existent_domain.com"
 
         post :create, params: {
-          password: { email: email },
+          password: {email: email}
         }
 
         expect(response).to be_successful
@@ -116,7 +116,7 @@ describe Clearance::PasswordsController do
         email = "this_user_does_not_exist@non_existent_domain.com"
 
         post :create, params: {
-          password: { email: email },
+          password: {email: email}
         }
 
         expect(response).to have_http_status(:accepted)
@@ -131,7 +131,7 @@ describe Clearance::PasswordsController do
 
         get :edit, params: {
           user_id: user,
-          token: user.confirmation_token,
+          token: user.confirmation_token
         }
 
         expect(response).to be_redirect
@@ -147,7 +147,7 @@ describe Clearance::PasswordsController do
 
         request.session[:password_reset_token] = user.confirmation_token
         get :edit, params: {
-          user_id: user,
+          user_id: user
         }
 
         expect(response).to be_successful
@@ -160,11 +160,11 @@ describe Clearance::PasswordsController do
       it "renders the new password reset form with a flash alert" do
         get :edit, params: {
           user_id: 1,
-          token: "",
+          token: ""
         }
 
         expect(response).to render_template(:new)
-        expect(flash.now[:alert]).to match(translated_string("flashes.failure_when_forbidden"))
+        expect(flash.now[:alert]).to match(I18n.t("flashes.failure_when_forbidden"))
       end
     end
 
@@ -174,11 +174,11 @@ describe Clearance::PasswordsController do
 
         get :edit, params: {
           user_id: 1,
-          token: user.confirmation_token + "a",
+          token: user.confirmation_token + "a"
         }
 
         expect(response).to render_template(:new)
-        expect(flash.now[:alert]).to match(translated_string("flashes.failure_when_forbidden"))
+        expect(flash.now[:alert]).to match(I18n.t("flashes.failure_when_forbidden"))
       end
     end
 
@@ -190,7 +190,7 @@ describe Clearance::PasswordsController do
         user.forgot_password!
         get :edit, params: {
           user_id: user.id,
-          token: user.reload.confirmation_token,
+          token: user.reload.confirmation_token
         }
 
         expect(response).to redirect_to(edit_user_password_url(user))
@@ -207,7 +207,7 @@ describe Clearance::PasswordsController do
 
         put :update, params: update_parameters(
           user,
-          new_password: "my_new_password",
+          new_password: "my_new_password"
         )
 
         expect(user.reload.encrypted_password).not_to eq old_encrypted_password
@@ -219,7 +219,7 @@ describe Clearance::PasswordsController do
 
         put :update, params: update_parameters(
           user,
-          new_password: "my_new_password",
+          new_password: "my_new_password"
         )
 
         expect(current_user).to eq(user)
@@ -235,7 +235,7 @@ describe Clearance::PasswordsController do
 
           put :update, params: update_parameters(
             user,
-            new_password: "my_new_password",
+            new_password: "my_new_password"
           )
 
           expect(current_user).to be_nil
@@ -250,7 +250,7 @@ describe Clearance::PasswordsController do
 
         put :update, params: update_parameters(
           user,
-          new_password: "",
+          new_password: ""
         )
 
         user.reload
@@ -265,7 +265,7 @@ describe Clearance::PasswordsController do
           put :update, params: {
             user_id: user,
             token: user.confirmation_token,
-            password_reset: {},
+            password_reset: {}
           }
         end.not_to raise_error
       end
@@ -275,10 +275,10 @@ describe Clearance::PasswordsController do
 
         put :update, params: update_parameters(
           user,
-          new_password: "",
+          new_password: ""
         )
 
-        expect(flash.now[:alert]).to match(translated_string("flashes.failure_after_update"))
+        expect(flash.now[:alert]).to match(I18n.t("flashes.failure_after_update"))
         expect(response).to have_http_status(:unprocessable_entity)
         expect(response).to render_template(:edit)
       end
@@ -288,7 +288,7 @@ describe Clearance::PasswordsController do
 
         put :update, params: update_parameters(
           user,
-          new_password: "",
+          new_password: ""
         )
 
         expect(current_user).to be_nil
@@ -302,7 +302,7 @@ describe Clearance::PasswordsController do
     {
       user_id: user,
       token: user.confirmation_token,
-      password_reset: { password: new_password }
+      password_reset: {password: new_password}
     }
   end
 

data/spec/controllers/permissions_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 class PermissionsController < ActionController::Base
   include Clearance::Controller
@@ -18,7 +18,7 @@ describe PermissionsController do
   before do
     Rails.application.routes.draw do
       resource :permission, only: [:new, :show]
-      get '/sign_in' => 'clearance/sessions#new', as: 'sign_in'
+      get "/sign_in" => "clearance/sessions#new", :as => "sign_in"
     end
   end
 
@@ -26,30 +26,30 @@ describe PermissionsController do
     Rails.application.reload_routes!
   end
 
-  context 'with signed in user' do
+  context "with signed in user" do
     before { sign_in }
 
-    it 'allows access to new' do
+    it "allows access to new" do
       get :new
 
       expect(subject).not_to deny_access
     end
 
-    it 'allows access to show' do
+    it "allows access to show" do
       get :show
 
       expect(subject).not_to deny_access
     end
   end
 
-  context 'with visitor' do
-    it 'allows access to new' do
+  context "with visitor" do
+    it "allows access to new" do
       get :new
 
       expect(subject).not_to deny_access
     end
 
-    it 'denies access to show' do
+    it "denies access to show" do
       get :show
 
       expect(subject).to deny_access(redirect: sign_in_url)
@@ -58,15 +58,15 @@ describe PermissionsController do
     it "denies access to show and display a flash message" do
       get :show
 
-      expect(flash[:alert]).to match(translated_string("flashes.failure_when_not_signed_in"))
+      expect(flash[:alert]).to match(I18n.t("flashes.failure_when_not_signed_in"))
     end
   end
 
-  context 'when remember_token is blank' do
-    it 'denies acess to show' do
+  context "when remember_token is blank" do
+    it "denies acess to show" do
       user = create(:user)
-      user.update(remember_token: '')
-      cookies[:remember_token] = ''
+      user.update(remember_token: "")
+      cookies[:remember_token] = ""
 
       get :show
 

data/spec/controllers/sessions_controller_spec.rb

@@ -37,11 +37,11 @@ describe Clearance::SessionsController do
         user = create(:user_with_optional_password)
 
         post :create, params: {
-          session: { email: user.email, password: user.password },
+          session: {email: user.email, password: user.password}
         }
 
         expect(response).to render_template(:new)
-        expect(flash[:alert]).to match(translated_string("flashes.failure_after_create"))
+        expect(flash[:alert]).to match(I18n.t("flashes.failure_after_create"))
       end
     end
 
@@ -50,7 +50,7 @@ describe Clearance::SessionsController do
         @user = create(:user)
         @user.update_attribute :remember_token, "old-token"
         post :create, params: {
-          session: { email: @user.email, password: @user.password },
+          session: {email: @user.email, password: @user.password}
         }
       end
 
@@ -73,7 +73,7 @@ describe Clearance::SessionsController do
         request.session[:return_to] = return_url
 
         post :create, params: {
-          session: { email: user.email, password: user.password },
+          session: {email: user.email, password: user.password}
         }
 
         should redirect_to(url)
@@ -85,7 +85,7 @@ describe Clearance::SessionsController do
         request.session[:return_to] = return_url
 
         post :create, params: {
-          session: { email: user.email, password: user.password },
+          session: {email: user.email, password: user.password}
         }
 
         should redirect_to(return_url)
@@ -97,7 +97,7 @@ describe Clearance::SessionsController do
         request.session[:return_to] = return_url
 
         post :create, params: {
-          session: { email: user.email, password: user.password },
+          session: {email: user.email, password: user.password}
         }
 
         should redirect_to(return_url)
@@ -109,7 +109,7 @@ describe Clearance::SessionsController do
         request.session[:return_to] = return_url
 
         post :create, params: {
-          session: { email: user.email, password: user.password },
+          session: {email: user.email, password: user.password}
         }
 
         should redirect_to(return_url)

data/spec/controllers/users_controller_spec.rb

@@ -14,7 +14,7 @@ describe Clearance::UsersController do
 
       it "defaults email field to the value provided in the query string" do
         get :new, params: {
-          user: { email: "a@example.com" },
+          user: {email: "a@example.com"}
         }
 
         expect(assigns(:user).email).to eq "a@example.com"
@@ -42,7 +42,7 @@ describe Clearance::UsersController do
           old_user_count = User.count
 
           post :create, params: {
-            user: user_attributes,
+            user: user_attributes
           }
 
           expect(assigns(:user)).to be_present
@@ -59,7 +59,7 @@ describe Clearance::UsersController do
           @request.session[:return_to] = return_url
 
           post :create, params: {
-            user: user_attributes,
+            user: user_attributes
           }
 
           expect(assigns(:user)).to be_present
@@ -74,7 +74,7 @@ describe Clearance::UsersController do
           old_user_count = User.count
 
           post :create, params: {
-            user: user_attributes,
+            user: user_attributes
           }
 
           expect(User.count).to eq old_user_count
@@ -88,7 +88,7 @@ describe Clearance::UsersController do
         sign_in
 
         post :create, params: {
-          user: {},
+          user: {}
         }
 
         expect(response).to redirect_to(Clearance.configuration.redirect_url)

data/spec/dummy/config/environments/test.rb

@@ -5,7 +5,7 @@ Rails.application.configure do
 
   config.eager_load = ENV["CI"].present?
 
-  config.public_file_server.headers = { "Cache-Control" => "public, max-age=#{1.hour.to_i}" }
+  config.public_file_server.headers = {"Cache-Control" => "public, max-age=#{1.hour.to_i}"}
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local = true
@@ -19,13 +19,13 @@ Rails.application.configure do
   config.action_mailer.perform_caching = false
   config.action_mailer.delivery_method = :test
 
-  config.action_mailer.default_url_options = { host: "www.example.com" }
+  config.action_mailer.default_url_options = {host: "www.example.com"}
 
   config.active_support.deprecation = :stderr
   config.active_support.disallowed_deprecation = :raise
   config.active_support.disallowed_deprecation_warnings = []
 
-  config.factory_bot.definition_file_paths = [File.expand_path('../../../factories', __dir__)]
+  config.factory_bot.definition_file_paths = [File.expand_path("../../../factories", __dir__)]
 
   config.middleware.use Clearance::BackDoor
 end

data/spec/factories/users.rb

@@ -5,15 +5,15 @@ FactoryBot.define do
 
   factory :user do
     email
-    password { 'password' }
+    password { "password" }
 
     trait :with_forgotten_password do
       confirmation_token { Clearance::Token.new }
     end
 
-    factory :user_with_optional_password, class: 'UserWithOptionalPassword' do
+    factory :user_with_optional_password, class: "UserWithOptionalPassword" do
       password { nil }
-      encrypted_password { '' }
+      encrypted_password { "" }
     end
   end
 end

data/spec/generators/clearance/install/install_generator_spec.rb

@@ -117,13 +117,13 @@ describe Clearance::Generators::InstallGenerator, :generator do
         existing_columns = [Struct::Named.new("remember_token")]
         existing_indexes = [Struct::Named.new("index_users_on_remember_token")]
 
-        allow(ActiveRecord::Base.connection).to receive(:columns).
-          with(:users).
-          and_return(existing_columns)
+        allow(ActiveRecord::Base.connection).to receive(:columns)
+          .with(:users)
+          .and_return(existing_columns)
 
-        allow(ActiveRecord::Base.connection).to receive(:indexes).
-          with(:users).
-          and_return(existing_indexes)
+        allow(ActiveRecord::Base.connection).to receive(:indexes)
+          .with(:users)
+          .and_return(existing_indexes)
 
         run_generator
         migration = migration_file("db/migrate/add_clearance_to_users.rb")
@@ -136,10 +136,10 @@ describe Clearance::Generators::InstallGenerator, :generator do
         expect(migration).not_to contain("t.string :remember_token")
         expect(migration).not_to contain("add_index :users, :remember_token")
         expect(migration).to(
-          contain("add_index :users, :confirmation_token, unique: true"),
+          contain("add_index :users, :confirmation_token, unique: true")
         )
         expect(migration).to(
-          contain("remove_index :users, :confirmation_token, unique: true"),
+          contain("remove_index :users, :confirmation_token, unique: true")
         )
       end
     end
@@ -147,9 +147,9 @@ describe Clearance::Generators::InstallGenerator, :generator do
 
   def table_does_not_exist(name)
     connection = ActiveRecord::Base.connection
-    allow(connection).to receive(:data_source_exists?).
-      with(name).
-      and_return(false)
+    allow(connection).to receive(:data_source_exists?)
+      .with(name)
+      .and_return(false)
   end
 
   def preserve_original_primary_key_type_setting

data/spec/generators/clearance/routes/routes_generator_spec.rb

@@ -15,7 +15,7 @@ describe Clearance::Generators::RoutesGenerator, :generator do
     expect(initializer).to contain("config.routes = false")
     expect(routes).to have_correct_syntax
     expect(routes).to contain(
-      'get "/sign_in" => "clearance/sessions#new", as: "sign_in"'
+      'get "/sign_in" => "clearance/sessions#new", :as => "sign_in"'
     )
   end
 end

data/spec/generators/clearance/specs/specs_generator_spec.rb

@@ -5,7 +5,7 @@ describe Clearance::Generators::SpecsGenerator, :generator do
   it "copies specs to host app" do
     run_generator
 
-    specs = %w(
+    specs = %w[
       factories/clearance
       features/clearance/user_signs_out_spec
       features/clearance/visitor_resets_password_spec
@@ -14,7 +14,7 @@ describe Clearance::Generators::SpecsGenerator, :generator do
       features/clearance/visitor_updates_password_spec
       support/clearance
       support/features/clearance_helpers
-    )
+    ]
 
     spec_files = specs.map { |spec| file("spec/#{spec}.rb") }