clearance 1.12.1 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 625a226d7fafddee52dd57e85023dd92035f7093
-  data.tar.gz: e28717fbeb6a97e8d6dde485ca67fb4d2f0aeabd
+  metadata.gz: 0472155cf20becdae95b0449996f13422cf8fd9f
+  data.tar.gz: 593e5208e89806394b03e9c0bac1c69f6836434b
 SHA512:
-  metadata.gz: 2984d34843ad635be7463a123448bf002d46a40b34ac0a60c83d5e04da9b068be57aa3ddb4552bf468204fdf0390a23c2896995135efa2bbf692a95b7745917d
-  data.tar.gz: 59b82d503fbe6b139b22992751a14ac2c62d5817df8ddddb319499ebd912a7dec7072ef818c675bf0b8a21c40250192774068f8429f37092109af1f6ec4d93b5
+  metadata.gz: c855e609161a0adc70754a033596de44ffc49ded096b0f1e61bb541c670e1d75e82f518e73f5a0ed53d00d25b4763e12d2f9b494a23802c3428154304665097d
+  data.tar.gz: b243f157204f0256c3405e62c8e24219c5101e7852c3818d21e057c0405c36d02aa59dbfe4a3d7f27260eb802b2d1f9d5ff306135fbce1f78d6dcefb39d52cbb

data/.travis.yml

@@ -18,8 +18,6 @@ gemfile:
   - gemfiles/rails50.gemfile
 
 matrix:
-  allow_failures:
-    - gemfile: gemfiles/rails50.gemfile
   exclude:
     - rvm: 1.9.3
       gemfile: gemfiles/rails50.gemfile

data/Appraisals

@@ -19,12 +19,8 @@ end
 
 if RUBY_VERSION >= "2.2.0"
   appraise "rails50" do
-    gem "rails", "~> 5.0.0.beta1"
-    gem "rspec-rails", github: "rspec/rspec-rails"
-    gem "rspec-support", github: "rspec/rspec-support"
-    gem "rspec-core", github: "rspec/rspec-core"
-    gem "rspec-mocks", github: "rspec/rspec-mocks"
-    gem "rspec-expectations", github: "rspec/rspec-expectations"
-    gem "rspec", github: "rspec/rspec"
+    gem "rails", "~> 5.0.0.beta3"
+    gem "rails-controller-testing"
+    gem "rspec-rails", "~> 3.5.0.beta1"
   end
 end

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 gem 'appraisal', '~> 1.0'
 gem 'ammeter'
 gem 'bundler', '~> 1.3'
-gem 'capybara', '>= 2.3'
+gem 'capybara', '>= 2.6.2'
 gem 'database_cleaner', '~> 1.0'
 gem 'factory_girl_rails', '~> 4.2'
 gem 'rspec-rails', '~> 3.1'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clearance (1.12.1)
+    clearance (1.13.0)
       bcrypt
       email_validator (~> 1.4)
       rails (>= 3.1)
@@ -44,6 +44,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    addressable (2.4.0)
     ammeter (1.1.3)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -55,14 +56,15 @@ GEM
     arel (6.0.3)
     bcrypt (3.1.10)
     builder (3.2.2)
-    capybara (2.5.0)
+    capybara (2.6.2)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
     coderay (1.1.0)
-    concurrent-ruby (1.0.0)
+    concurrent-ruby (1.0.1)
     database_cleaner (1.5.1)
     diff-lcs (1.2.5)
     email_validator (1.6.0)
@@ -142,7 +144,7 @@ GEM
     sprockets (3.5.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.0)
+    sprockets-rails (3.0.4)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -162,7 +164,7 @@ DEPENDENCIES
   ammeter
   appraisal (~> 1.0)
   bundler (~> 1.3)
-  capybara (>= 2.3)
+  capybara (>= 2.6.2)
   clearance!
   database_cleaner (~> 1.0)
   factory_girl_rails (~> 4.2)

data/NEWS.md

@@ -3,12 +3,27 @@
 The noteworthy changes for each Clearance version are included here. For a
 complete changelog, see the git history for each version via the version links.
 
+## [1.13.0] - March 4, 2016
+
+### Added
+- Clearance now supports Rails 5.0.0.beta3 and newer.
+
+### Fixed
+- Clearance will now infer the parameter name to use when accessing user
+  parameters in a request. This previously used `:user`, which was incorrect for
+  customized user models.
+- Generated feature specs no longer rely on RSpec monkey patches.
+
+[1.13.0]: https://github.com/thoughtbot/clearance/compare/v1.12.1...v1.13.0
+
 ## [1.12.1] - January 7, 2016
 
 ### Fixed
 - Fixed the `create_users` migration generated by `rails generate
   clearance:install` under Rails 3.x.
 
+[1.12.1]: https://github.com/thoughtbot/clearance/compare/v1.12.0...v1.12.1
+
 ## [1.12.0] - November 17, 2015
 
 ### Added

data/README.md

@@ -16,22 +16,30 @@ monitored by contributors.
 [GitHub Issues]: https://github.com/thoughtbot/clearance/issues
 [Stack Overflow]: http://stackoverflow.com/questions/tagged/clearance
 
-## Install
+## Getting Started
 
 Clearance is a Rails engine tested against Rails `>= 3.2` and Ruby `>= 1.9.3`.
-To get started, add Clearance to your `Gemfile`, `bundle install`, and run the
-`install generator`:
+
+You can add it to your Gemfile with:
+
+```sh
+gem 'clearance'
+```
+
+Run the bundle command to install it.
+
+After you install Clearance, you need to run the generator:
 
 ```sh
 $ rails generate clearance:install
 ```
 
-The generator:
+The Clearance install generator:
 
 * Inserts `Clearance::User` into your `User` model
 * Inserts `Clearance::Controller` into your `ApplicationController`
-* Creates an initializer to allow further configuration.
-* Creates a migration that either creates a users table or adds any necessary
+* Creates an initializer file to allow further configuration.
+* Creates a migration file that either create a users table or adds any necessary
   columns to the existing table.
 
 ## Configure
@@ -343,7 +351,7 @@ $ rails generate clearance:specs
 
 ### Controller Test Helpers
 
-To test controller actions that are protected by `before_filter :require_login`,
+To test controller actions that are protected by `before_action :require_login`,
 require Clearance's test helpers in your test suite.
 
 For `rspec`, add the following line to your `spec/rails_helper.rb` or

data/app/controllers/clearance/passwords_controller.rb

@@ -1,9 +1,23 @@
 require 'active_support/deprecation'
 
 class Clearance::PasswordsController < Clearance::BaseController
-  skip_before_filter :require_login, only: [:create, :edit, :new, :update]
-  skip_before_filter :authorize, only: [:create, :edit, :new, :update]
-  before_filter :ensure_existing_user, only: [:edit, :update]
+  if respond_to?(:before_action)
+    skip_before_action :require_login,
+      only: [:create, :edit, :new, :update],
+      raise: false
+    skip_before_action :authorize,
+      only: [:create, :edit, :new, :update],
+      raise: false
+    before_action :ensure_existing_user, only: [:edit, :update]
+  else
+    skip_before_filter :require_login,
+      only: [:create, :edit, :new, :update],
+      raise: false
+    skip_before_filter :authorize,
+      only: [:create, :edit, :new, :update],
+      raise: false
+    before_filter :ensure_existing_user, only: [:edit, :update]
+  end
 
   def create
     if user = find_user_for_create
@@ -39,7 +53,7 @@ class Clearance::PasswordsController < Clearance::BaseController
   def deliver_email(user)
     mail = ::ClearanceMailer.change_password(user)
 
-    if Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new("4.2.0")
+    if mail.respond_to?(:deliver_later)
       mail.deliver_later
     else
       mail.deliver

data/app/controllers/clearance/sessions_controller.rb

@@ -1,7 +1,21 @@
 class Clearance::SessionsController < Clearance::BaseController
-  before_filter :redirect_signed_in_users, only: [:new]
-  skip_before_filter :require_login, only: [:create, :new, :destroy]
-  skip_before_filter :authorize, only: [:create, :new, :destroy]
+  if respond_to?(:before_action)
+    before_action :redirect_signed_in_users, only: [:new]
+    skip_before_action :require_login,
+      only: [:create, :new, :destroy],
+      raise: false
+    skip_before_action :authorize,
+      only: [:create, :new, :destroy],
+      raise: false
+  else
+    before_filter :redirect_signed_in_users, only: [:new]
+    skip_before_filter :require_login,
+      only: [:create, :new, :destroy],
+      raise: false
+    skip_before_filter :authorize,
+      only: [:create, :new, :destroy],
+      raise: false
+  end
 
   def create
     @user = authenticate(params)

data/app/controllers/clearance/users_controller.rb

@@ -1,7 +1,13 @@
 class Clearance::UsersController < Clearance::BaseController
-  before_filter :redirect_signed_in_users, only: [:create, :new]
-  skip_before_filter :require_login, only: [:create, :new]
-  skip_before_filter :authorize, only: [:create, :new]
+  if respond_to?(:before_action)
+    before_action :redirect_signed_in_users, only: [:create, :new]
+    skip_before_action :require_login, only: [:create, :new], raise: false
+    skip_before_action :authorize, only: [:create, :new], raise: false
+  else
+    before_filter :redirect_signed_in_users, only: [:create, :new]
+    skip_before_filter :require_login, only: [:create, :new], raise: false
+    skip_before_filter :authorize, only: [:create, :new], raise: false
+  end
 
   def new
     @user = user_from_params
@@ -50,6 +56,6 @@ class Clearance::UsersController < Clearance::BaseController
   end
 
   def user_params
-    params[:user] || Hash.new
+    params[Clearance.configuration.user_parameter] || Hash.new
   end
 end

data/gemfiles/rails40.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "appraisal", "~> 1.0"
 gem "ammeter"
 gem "bundler", "~> 1.3"
-gem "capybara", ">= 2.3"
+gem "capybara", ">= 2.6.2"
 gem "database_cleaner", "~> 1.0"
 gem "factory_girl_rails", "~> 4.2"
 gem "rspec-rails", "~> 3.1"

data/gemfiles/rails41.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "appraisal", "~> 1.0"
 gem "ammeter"
 gem "bundler", "~> 1.3"
-gem "capybara", ">= 2.3"
+gem "capybara", ">= 2.6.2"
 gem "database_cleaner", "~> 1.0"
 gem "factory_girl_rails", "~> 4.2"
 gem "rspec-rails", "~> 3.1"

data/gemfiles/rails42.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "appraisal", "~> 1.0"
 gem "ammeter"
 gem "bundler", "~> 1.3"
-gem "capybara", ">= 2.3"
+gem "capybara", ">= 2.6.2"
 gem "database_cleaner", "~> 1.0"
 gem "factory_girl_rails", "~> 4.2"
 gem "rspec-rails", "~> 3.1"

data/gemfiles/rails50.gemfile

@@ -5,19 +5,15 @@ source "https://rubygems.org"
 gem "appraisal", "~> 1.0"
 gem "ammeter"
 gem "bundler", "~> 1.3"
-gem "capybara", ">= 2.3"
+gem "capybara", ">= 2.6.2"
 gem "database_cleaner", "~> 1.0"
 gem "factory_girl_rails", "~> 4.2"
-gem "rspec-rails", :github => "rspec/rspec-rails"
+gem "rspec-rails", "~> 3.5.0.beta1"
 gem "shoulda-matchers", "~> 2.8"
 gem "sqlite3", "~> 1.3"
 gem "timecop", "~> 0.6"
 gem "pry", :require => false
-gem "rails", "~> 5.0.0.beta1"
-gem "rspec-support", :github => "rspec/rspec-support"
-gem "rspec-core", :github => "rspec/rspec-core"
-gem "rspec-mocks", :github => "rspec/rspec-mocks"
-gem "rspec-expectations", :github => "rspec/rspec-expectations"
-gem "rspec", :github => "rspec/rspec"
+gem "rails", "~> 5.0.0.beta3"
+gem "rails-controller-testing"
 
 gemspec :path => "../"

data/lib/clearance/authentication.rb

@@ -4,7 +4,7 @@ module Clearance
 
     included do
       helper_method :current_user, :signed_in?, :signed_out?
-      hide_action(
+      private(
         :authenticate,
         :current_user,
         :current_user=,

data/lib/clearance/authorization.rb

@@ -3,7 +3,7 @@ module Clearance
     extend ActiveSupport::Concern
 
     included do
-      hide_action :authorize, :deny_access, :require_login
+      private :authorize, :deny_access, :require_login
     end
 
     # Use as a `before_action` to require a user be signed in to proceed.
@@ -25,9 +25,9 @@ module Clearance
 
     # @deprecated use {#require_login}
     def authorize
-      warn "[DEPRECATION] Clearance's `authorize` before_filter is " +
+      warn "[DEPRECATION] Clearance's `authorize` before_action is " +
         "deprecated. Use `require_login` instead. Be sure to update any " +
-        "instances of `skip_before_filter :authorize` or " +
+        "instances of `skip_before_action :authorize` or " +
         "`skip_before_action :authorize` as well"
       require_login
     end

data/lib/clearance/configuration.rb

@@ -121,12 +121,20 @@ module Clearance
       end
     end
 
+    # The name of user parameter for the configured user model.
+    # This is derived from the `model_name` of the `user_model` setting.
+    # In the default configuration, this is `user`.
+    # @return [Symbol]
+    def user_parameter
+      user_model.model_name.singular.to_sym
+    end
+
     # The name of foreign key parameter for the configured user model.
     # This is derived from the `model_name` of the `user_model` setting.
     # In the default configuration, this is `user_id`.
     # @return [Symbol]
     def user_id_parameter
-      "#{user_model.model_name.singular}_id".to_sym
+      "#{user_parameter}_id".to_sym
     end
 
     # @return [Boolean] are Clearance's built-in routes enabled?

data/lib/clearance/engine.rb

@@ -23,10 +23,7 @@ module Clearance
       app.config.filter_parameters += [:password, :token]
     end
 
-    config.app_middleware.insert_after(
-      ActionDispatch::ParamsParser,
-      Clearance::RackSession
-    )
+    config.app_middleware.use(Clearance::RackSession)
 
     config.to_prepare do
       Clearance.configuration.reload_user_model

data/lib/clearance/testing/controller_helpers.rb

@@ -29,7 +29,7 @@ module Clearance
       #
       # @return user
       def sign_in_as(user)
-        @controller.sign_in user
+        @request.env[:clearance].sign_in(user)
         user
       end
 
@@ -37,7 +37,7 @@ module Clearance
       #
       # @return [void]
       def sign_out
-        @controller.sign_out
+        @request.env[:clearance].sign_out
       end
     end
   end

data/lib/clearance/testing/deny_access_matcher.rb

@@ -67,13 +67,17 @@ module Clearance
         private
 
         def denied_access_url
-          if @controller.signed_in?
+          if clearance_session.signed_in?
             '/'
           else
             @controller.sign_in_url
           end
         end
 
+        def clearance_session
+          @controller.request.env[:clearance]
+        end
+
         def flash_notice
           @controller.flash[:notice]
         end

data/lib/clearance/token.rb

@@ -1,5 +1,5 @@
 module Clearance
-  # Random token used for password reset tokens and password reset tokens.
+  # Random token used for password reset and remember tokens.
   # Clearance tokens are also public API and are inteded to be used anywhere you
   # need a random token to correspond to a given user (e.g. you added an email
   # confirmation token).

data/lib/clearance/version.rb

@@ -1,3 +1,3 @@
 module Clearance
-  VERSION = "1.12.1"
+  VERSION = "1.13.0".freeze
 end

data/lib/generators/clearance/install/install_generator.rb

@@ -61,7 +61,7 @@ module Clearance
           migration_template(
             "db/migrate/#{migration_name}",
             "db/migrate/#{migration_name}",
-            config
+            config.merge(migration_version: migration_version),
           )
         end
       end
@@ -101,7 +101,11 @@ module Clearance
       end
 
       def users_table_exists?
-        ActiveRecord::Base.connection.table_exists?(:users)
+        if ActiveRecord::Base.connection.respond_to?(:data_source_exists?)
+          ActiveRecord::Base.connection.data_source_exists?(:users)
+        else
+          ActiveRecord::Base.connection.table_exists?(:users)
+        end
       end
 
       def existing_users_columns
@@ -116,6 +120,12 @@ module Clearance
       def self.next_migration_number(dir)
         ActiveRecord::Generators::Base.next_migration_number(dir)
       end
+
+      def migration_version
+        if Rails.version >= "5.0.0"
+          "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+        end
+      end
     end
   end
 end

data/lib/generators/clearance/install/templates/db/migrate/add_clearance_to_users.rb

@@ -1,4 +1,4 @@
-class AddClearanceToUsers < ActiveRecord::Migration
+class AddClearanceToUsers < ActiveRecord::Migration<%= migration_version %>
   def self.up
     change_table :users do |t|
 <% config[:new_columns].values.each do |column| -%>

data/lib/generators/clearance/install/templates/db/migrate/create_users.rb

@@ -1,4 +1,4 @@
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < ActiveRecord::Migration<%= migration_version %>
   def change
     create_table :users do |t|
       t.timestamps null: false

data/lib/generators/clearance/specs/templates/features/clearance/user_signs_out_spec.rb.tt

@@ -1,7 +1,7 @@
 require "<%= @helper_file %>"
 require "support/features/clearance_helpers"
 
-feature "User signs out" do
+RSpec.feature "User signs out" do
   scenario "signs out" do
     sign_in
     sign_out

data/lib/generators/clearance/specs/templates/features/clearance/visitor_resets_password_spec.rb.tt

@@ -1,8 +1,17 @@
 require "<%= @helper_file %>"
 require "support/features/clearance_helpers"
 
-feature "Visitor resets password" do
+RSpec.feature "Visitor resets password" do
   before { ActionMailer::Base.deliveries.clear }
+<% if defined?(ActiveJob) -%>
+
+  around do |example|
+    original_adapter = ActiveJob::Base.queue_adapter
+    ActiveJob::Base.queue_adapter = :inline
+    example.run
+    ActiveJob::Base.queue_adapter = original_adapter
+  end
+<% end -%>
 
   scenario "by navigating to the page" do
     visit sign_in_path

data/lib/generators/clearance/specs/templates/features/clearance/visitor_signs_in_spec.rb.tt

@@ -1,7 +1,7 @@
 require "<%= @helper_file %>"
 require "support/features/clearance_helpers"
 
-feature "Visitor signs in" do
+RSpec.feature "Visitor signs in" do
   scenario "with valid email and password" do
     create_user "user@example.com", "password"
     sign_in_with "user@example.com", "password"

data/lib/generators/clearance/specs/templates/features/clearance/visitor_signs_up_spec.rb.tt

@@ -1,7 +1,7 @@
 require "<%= @helper_file %>"
 require "support/features/clearance_helpers"
 
-feature "Visitor signs up" do
+RSpec.feature "Visitor signs up" do
   scenario "by navigating to the page" do
     visit sign_in_path
 

data/lib/generators/clearance/specs/templates/features/clearance/visitor_updates_password_spec.rb.tt

@@ -1,7 +1,7 @@
 require "<%= @helper_file %>"
 require "support/features/clearance_helpers"
 
-feature "Visitor updates password" do
+RSpec.feature "Visitor updates password" do
   scenario "with valid password" do
     user = user_with_reset_password
     update_password user, "newpassword"

data/spec/app_templates/testapp/app/controllers/home_controller.rb

@@ -1,5 +1,9 @@
 class HomeController < ApplicationController
   def show
-    render text: "", layout: "application"
+    if Rails::VERSION::MAJOR >= 5
+      render html: "", layout: "application"
+    else
+      render text: "", layout: "application"
+    end
   end
 end

data/spec/clearance/testing/controller_helpers_spec.rb

@@ -5,11 +5,11 @@ describe Clearance::Testing::ControllerHelpers do
     include Clearance::Testing::ControllerHelpers
 
     def initialize
-      @controller = Controller.new
-    end
-
-    class Controller
-      def sign_in(user); end
+      @request = Class.new do
+        def env
+          { clearance: Clearance::Session.new({}) }
+        end
+      end.new
     end
   end
 

data/spec/configuration_spec.rb

@@ -143,6 +143,15 @@ describe Clearance::Configuration do
     end
   end
 
+  describe "#user_parameter" do
+    it "returns the parameter key to use based on the user_model" do
+      Account = Class.new(ActiveRecord::Base)
+      Clearance.configure { |config| config.user_model = Account }
+
+      expect(Clearance.configuration.user_parameter).to eq :account
+    end
+  end
+
   describe '#user_id_parameter' do
     it 'returns the parameter key to use based on the user_model' do
       CustomUser = Class.new(ActiveRecord::Base)

data/spec/controllers/apis_controller_spec.rb

@@ -3,10 +3,14 @@ require 'spec_helper'
 class ApisController < ActionController::Base
   include Clearance::Controller
 
-  before_filter :require_login
+  if respond_to?(:before_action)
+    before_action :require_login
+  else
+    before_filter :require_login
+  end
 
   def show
-    render text: 'response'
+    head :ok
   end
 end
 

data/spec/controllers/forgeries_controller_spec.rb

@@ -4,7 +4,12 @@ class ForgeriesController < ActionController::Base
   include Clearance::Controller
 
   protect_from_forgery
-  before_filter :require_login
+
+  if respond_to?(:before_action)
+    before_action :require_login
+  else
+    before_filter :require_login
+  end
 
   # This is off in test by default, but we need it for this test
   self.allow_forgery_protection = true

data/spec/controllers/permissions_controller_spec.rb

@@ -3,14 +3,18 @@ require 'spec_helper'
 class PermissionsController < ActionController::Base
   include Clearance::Controller
 
-  before_filter :require_login, only: :show
+  if respond_to?(:before_action)
+    before_action :require_login, only: :show
+  else
+    before_filter :require_login, only: :show
+  end
 
   def new
-    render text: 'New page'
+    head :ok
   end
 
   def show
-    render text: 'Show page'
+    head :ok
   end
 end
 

data/spec/controllers/sessions_controller_spec.rb

@@ -45,7 +45,7 @@ describe Clearance::SessionsController do
       it { should redirect_to_url_after_create }
 
       it "sets the user in the clearance session" do
-        expect(controller.current_user).to eq @user
+        expect(request.env[:clearance].current_user).to eq @user
       end
 
       it "should not change the remember token" do
@@ -92,7 +92,7 @@ describe Clearance::SessionsController do
       end
 
       it "should unset the current user" do
-        expect(@controller.current_user).to be_nil
+        expect(request.env[:clearance].current_user).to be_nil
       end
     end
   end

data/spec/dummy/app/controllers/application_controller.rb

@@ -2,6 +2,10 @@ class ApplicationController < ActionController::Base
   include Clearance::Controller
 
   def show
-    render text: '', layout: 'application'
+    if Rails::VERSION::MAJOR >= 5
+      render html: "", layout: "application"
+    else
+      render text: "", layout: "application"
+    end
   end
 end

data/spec/dummy/application.rb

@@ -37,6 +37,10 @@ module Dummy
       config.paths.add "config/routes", with: "#{APP_ROOT}/config/routes.rb"
     end
 
+    if config.respond_to?(:active_job)
+      config.active_job.queue_adapter = :inline
+    end
+
     def require_environment!
       initialize!
     end

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

@@ -61,9 +61,7 @@ describe Clearance::Generators::InstallGenerator, :generator do
     context "users table does not exist" do
       it "creates a migration to create the users table" do
         provide_existing_application_controller
-        allow(ActiveRecord::Base.connection).to receive(:table_exists?).
-          with(:users).
-          and_return(false)
+        table_does_not_exist(:users)
 
         run_generator
         migration = migration_file("db/migrate/create_users.rb")
@@ -115,4 +113,18 @@ describe Clearance::Generators::InstallGenerator, :generator do
       end
     end
   end
+
+  def table_does_not_exist(name)
+    connection = ActiveRecord::Base.connection
+
+    if connection.respond_to?(:data_source_exists?)
+      allow(connection).to receive(:data_source_exists?).
+        with(name).
+        and_return(false)
+    else
+      allow(connection).to receive(:table_exists?).
+        with(name).
+        and_return(false)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -26,6 +26,13 @@ RSpec.configure do |config|
   config.mock_with :rspec do |mocks|
     mocks.syntax = :expect
   end
+
+  if Rails::VERSION::MAJOR >= 5
+    require 'rails-controller-testing'
+    config.include Rails::Controller::Testing::TestProcess
+    config.include Rails::Controller::Testing::TemplateAssertions
+    config.include Rails::Controller::Testing::Integration
+  end
 end
 
 def restore_default_config

data/spec/support/http_method_shim.rb

@@ -0,0 +1,23 @@
+# Rails 5 deprecates calling HTTP action methods with positional arguments
+# in favor of keyword arguments. However, the keyword argument form is only
+# supported in Rails 5+. Since we support back to 3.1, we need some sort of shim
+# to avoid super noisy deprecations when running tests.
+module HTTPMethodShim
+  def get(path, params=nil, headers=nil)
+    super(path, params: params, headers: headers)
+  end
+
+  def put(path, params=nil, headers=nil)
+    super(path, params: params, headers: headers)
+  end
+
+  def post(path, params=nil, headers=nil)
+    super(path, params: params, headers: headers)
+  end
+end
+
+if Rails::VERSION::MAJOR >= 5
+  RSpec.configure do |config|
+    config.include HTTPMethodShim, type: :controller
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.13.0
 platform: ruby
 authors:
 - Dan Croak
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -219,6 +219,7 @@ files:
 - spec/support/fake_model_with_password_strategy.rb
 - spec/support/fake_model_without_password_strategy.rb
 - spec/support/generator_spec_helpers.rb
+- spec/support/http_method_shim.rb
 - spec/support/request_with_remember_token.rb
 - spec/user_spec.rb
 - spec/views/view_helpers_spec.rb