clearance 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e291b837723c76c6e2a1615f30a1e93a3b01c6e
-  data.tar.gz: b2c577781ebc764be239d9a97a2bdda8d4c1ad0c
+  metadata.gz: fbf88ab9f935fc17b80bd9901390e94c0f7ab684
+  data.tar.gz: a522250322d628529f2056ec9de17ef2eaceb608
 SHA512:
-  metadata.gz: 11de7a2908a2ebc5e294eaefa8376507f76977e072231b5d16528b0c79df241a30a6694ff3371057ac250875fe771a6ececb3efc9e54a050a5d9ad9d8f9568fe
-  data.tar.gz: 634fd82edae876f4ca39e929dcc0dfb0a58d44ec6c32cd7fbe2dec9ede67d99e623ffc719786f0bf55c600a2beb370053539d254d56cd48caed13a1ded5728db
+  metadata.gz: 71ff65519b2a7ed783aa0341f7a3f8adb657029810748fafd8ddecfc4e14a5517b8bbab31773bd23f13f64d1439bc94bc401f756fc8774d0d98c6d952e376cbe
+  data.tar.gz: 3c25517857b86f5bfe43241d1c6e03abf814849418bc5d25da6ff47e36c3640d911dfcbed9a96be736eb15fe47d5523a56ac58322978d92696d806ca586a6d32

data/Appraisals

@@ -1,21 +1,15 @@
-# These are the various versions of rails we want to test against.
-# The non-rails gems (jbuilder, sdoc, etc) are dependencies introduced
-# in the default rails gemfiles used in the clearance features.
 appraise 'rails3.2' do
-  gem 'jbuilder', '~> 1.2'
-  gem 'rails', '~> 3.2.17'
-  gem 'sdoc'
+  gem 'rails', '~> 3.2.21'
 end
 
 appraise 'rails4.0' do
-  gem 'jbuilder', '~> 1.2'
-  gem 'rails', '~> 4.0.4'
-  gem 'sdoc'
+  gem 'rails', '~> 4.0.12'
 end
 
 appraise 'rails4.1' do
-  gem 'jbuilder', '~> 2.0'
-  gem 'rails', '~> 4.1.0'
-  gem 'sdoc'
-  gem 'spring'
+  gem 'rails', '~> 4.1.8'
+end
+
+appraise 'rails4.2' do
+  gem 'rails', '~> 4.2.0'
 end

data/Gemfile

@@ -4,7 +4,6 @@ gemspec
 
 gem 'appraisal', '~> 1.0'
 gem 'aruba', '~> 0.5'
-gem 'bourne', '~> 1.4'
 gem 'bundler', '~> 1.3'
 gem 'capybara', '~> 2.2.0'
 gem 'cucumber-rails', '~> 1.3', require: false
@@ -15,3 +14,4 @@ gem 'shoulda-matchers', '~> 2.4'
 gem 'sqlite3', '~> 1.3'
 gem 'timecop', '~> 0.6'
 gem 'rspec', '~> 2.14'
+gem 'pry', require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clearance (1.5.1)
+    clearance (1.6.0)
       bcrypt
       email_validator (~> 1.4)
       rails (>= 3.1)
@@ -9,44 +9,51 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.5)
-      actionpack (= 4.1.5)
-      actionview (= 4.1.5)
-      mail (~> 2.5.4)
-    actionpack (4.1.5)
-      actionview (= 4.1.5)
-      activesupport (= 4.1.5)
-      rack (~> 1.5.2)
+    actionmailer (4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.0)
+      actionview (= 4.2.0)
+      activesupport (= 4.2.0)
+      rack (~> 1.6.0)
       rack-test (~> 0.6.2)
-    actionview (4.1.5)
-      activesupport (= 4.1.5)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.5)
-      activesupport (= 4.1.5)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.0)
+      activesupport (= 4.2.0)
+      globalid (>= 0.3.0)
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
-    activerecord (4.1.5)
-      activemodel (= 4.1.5)
-      activesupport (= 4.1.5)
-      arel (~> 5.0.0)
-    activesupport (4.1.5)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.0)
+      activemodel (= 4.2.0)
+      activesupport (= 4.2.0)
+      arel (~> 6.0)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    appraisal (1.0.0)
+    appraisal (1.0.2)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (5.0.1.20140414130214)
+    arel (6.0.0)
     aruba (0.6.1)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
     bcrypt (3.1.9)
-    bourne (1.5.0)
-      mocha (>= 0.13.2, < 0.15)
     builder (3.2.2)
     capybara (2.2.1)
       mime-types (>= 1.16)
@@ -54,18 +61,19 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.5.3)
+    childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.3.16)
+    coderay (1.1.0)
+    cucumber (1.3.17)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.1)
-    cucumber-rails (1.4.1)
+    cucumber-rails (1.4.2)
       capybara (>= 1.1.2, < 3)
       cucumber (>= 1.3.8, < 2)
-      mime-types (~> 1.16)
+      mime-types (>= 1.16, < 3)
       nokogiri (~> 1.5)
       rails (>= 3, < 5)
     database_cleaner (1.3.0)
@@ -73,55 +81,68 @@ GEM
     email_validator (1.5.0)
       activemodel
     erubis (2.7.0)
-    factory_girl (4.4.0)
+    factory_girl (4.5.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.4.1)
-      factory_girl (~> 4.4.0)
+    factory_girl_rails (4.5.0)
+      factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    ffi (1.9.3)
+    ffi (1.9.6)
     gherkin (2.12.2)
       multi_json (~> 1.3)
+    globalid (0.3.0)
+      activesupport (>= 4.1.0)
     hike (1.2.3)
-    i18n (0.6.11)
+    i18n (0.7.0)
     json (1.8.1)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.4)
-    mime-types (1.25.1)
-    mini_portile (0.6.0)
-    minitest (5.4.0)
-    mocha (0.14.0)
-      metaclass (~> 0.0.1)
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    method_source (0.8.2)
+    mime-types (2.4.3)
+    mini_portile (0.6.1)
+    minitest (5.5.0)
     multi_json (1.10.1)
     multi_test (0.1.1)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
-    polyglot (0.3.5)
-    rack (1.5.2)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.6.0)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.5)
-      actionmailer (= 4.1.5)
-      actionpack (= 4.1.5)
-      actionview (= 4.1.5)
-      activemodel (= 4.1.5)
-      activerecord (= 4.1.5)
-      activesupport (= 4.1.5)
+    rails (4.2.0)
+      actionmailer (= 4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
+      activemodel (= 4.2.0)
+      activerecord (= 4.2.0)
+      activesupport (= 4.2.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.5)
-      sprockets-rails (~> 2.0)
-    railties (4.1.5)
-      actionpack (= 4.1.5)
-      activesupport (= 4.1.5)
+      railties (= 4.2.0)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.5)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.1)
+      loofah (~> 2.0)
+    railties (4.2.0)
+      actionpack (= 4.2.0)
+      activesupport (= 4.2.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rspec (2.99.0)
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)
       rspec-mocks (~> 2.99.0)
-    rspec-collection_matchers (1.0.0)
+    rspec-collection_matchers (1.1.2)
       rspec-expectations (>= 2.99.0.beta1)
     rspec-core (2.99.2)
     rspec-expectations (2.99.2)
@@ -136,25 +157,23 @@ GEM
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)
       rspec-mocks (~> 2.99.0)
-    shoulda-matchers (2.6.2)
+    shoulda-matchers (2.7.0)
       activesupport (>= 3.0.0)
-    sprockets (2.12.1)
+    slop (3.6.0)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.3)
+    sprockets-rails (2.2.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    sqlite3 (1.3.9)
+      sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.10)
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
     timecop (0.7.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     xpath (2.0.0)
@@ -166,13 +185,13 @@ PLATFORMS
 DEPENDENCIES
   appraisal (~> 1.0)
   aruba (~> 0.5)
-  bourne (~> 1.4)
   bundler (~> 1.3)
   capybara (~> 2.2.0)
   clearance!
   cucumber-rails (~> 1.3)
   database_cleaner (~> 1.0)
   factory_girl_rails (~> 4.2)
+  pry
   rspec (~> 2.14)
   rspec-rails
   shoulda-matchers (~> 2.4)

data/NEWS.md

@@ -1,5 +1,9 @@
 Thank you to all the [contributors](https://github.com/thoughtbot/clearance/graphs/contributors)!
 
+New for 1.6.0 (December 20, 2014)
+* When using Rails 4.2, password reset emails are sent with the
+  ActiveJob-compatible `#deliver_later` method.
+
 New for 1.5.1 (December 19, 2014)
 * Blowfish password strategy fixed
 * Specs generated with `rails generate clearance:specs` now work properly in

data/app/controllers/clearance/passwords_controller.rb

@@ -37,7 +37,13 @@ class Clearance::PasswordsController < Clearance::BaseController
   private
 
   def deliver_email(user)
-    ::ClearanceMailer.change_password(user).deliver
+    mail = ::ClearanceMailer.change_password(user)
+
+    if Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new("4.2.0")
+      mail.deliver_later
+    else
+      mail.deliver
+    end
   end
 
   def password_reset_params

data/features/step_definitions/configuration_steps.rb

@@ -26,6 +26,12 @@ When "I have a project with clearance" do
     And I configure ActionMailer to use "localhost" as a host
     And I configure a root route
     And I remove the "turn" gem from this project
+    And I remove the "web-console" gem from this project
+    And I remove the "jbuilder" gem from this project
+    And I remove the "sdoc" gem from this project
+    And I remove the "byebug" gem from this project
+    And I remove the "debugger" gem from this project
+    And I remove the "spring" gem from this project
     And I add the "clearance" gem from this project
   }
 end

data/features/step_definitions/gem_file_steps.rb

@@ -9,7 +9,7 @@ end
 When /^I remove the "([^"]*)" gem from this project$/ do |gem_name|
   in_current_dir do
     content = File.read('Gemfile')
-    content.gsub!(/^.*gem 'turn'.*\n/, '')
+    content.sub!(/^.*gem '#{gem_name}'.*\n/, "")
     File.open('Gemfile', 'w') { |file| file.write(content) }
   end
 end

data/lib/clearance/testing/application.rb

@@ -5,7 +5,7 @@ module Clearance
     APP_ROOT = File.expand_path('..', __FILE__).freeze
 
     def self.rails4?
-      Rails::VERSION::MAJOR == 4
+      Rails::VERSION::MAJOR >= 4
     end
 
     I18n.enforce_available_locales = true
@@ -27,6 +27,7 @@ module Clearance
       config.paths['config/database'] = "#{APP_ROOT}/config/database.yml"
       config.paths['log'] = 'tmp/log/development.log'
       config.secret_token = 'SECRET_TOKEN_IS_MIN_30_CHARS_LONG'
+      config.active_support.test_order = :random
 
       if Clearance::Testing.rails4?
         config.paths.add 'config/routes.rb', with: "#{APP_ROOT}/config/routes.rb"

data/lib/clearance/version.rb

@@ -1,3 +1,3 @@
 module Clearance
-  VERSION = "1.5.1"
+  VERSION = "1.6.0"
 end

data/spec/clearance/back_door_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe Clearance::BackDoor do
   it 'signs in as a given user' do
     user_id = '123'
-    user = stub('user')
-    User.stubs(:find).with(user_id).returns(user)
+    user = double("user")
+    allow(User).to receive(:find).with(user_id).and_return(user)
     env = env_for_user_id(user_id)
     back_door = Clearance::BackDoor.new(mock_app)
 
@@ -20,7 +20,7 @@ describe Clearance::BackDoor do
 
     result = back_door.call(env)
 
-    expect(env[:clearance]).to have_received(:sign_in).never
+    expect(env[:clearance]).not_to have_received(:sign_in)
     expect(result).to eq mock_app.call(env)
   end
 
@@ -29,7 +29,7 @@ describe Clearance::BackDoor do
   end
 
   def env_for_user_id(user_id)
-    clearance = stub('clearance', sign_in: true)
+    clearance = double("clearance", sign_in: true)
     Rack::MockRequest.env_for("/?as=#{user_id}").merge(clearance: clearance)
   end
 

data/spec/clearance/default_sign_in_guard_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Clearance::DefaultSignInGuard do
   context 'session is signed in' do
     it 'returns success' do
-      session = stub('Session', signed_in?: true)
+      session = double("Session", signed_in?: true)
       guard = Clearance::DefaultSignInGuard.new(session)
 
       expect(guard.call).to be_a Clearance::SuccessStatus
@@ -12,7 +12,7 @@ describe Clearance::DefaultSignInGuard do
 
   context 'session is not signed in' do
     it 'returns failure' do
-      session = stub('Session', signed_in?: false)
+      session = double("Session", signed_in?: false)
       guard = Clearance::DefaultSignInGuard.new(session)
 
       response = guard.call

data/spec/clearance/rack_session_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe Clearance::RackSession do
   it 'injects a clearance session into the environment' do
     expected_session = 'the session'
-    expected_session.stubs :add_cookie_to_headers
-    Clearance::Session.stubs new: expected_session
+    allow(expected_session).to receive(:add_cookie_to_headers)
+    allow(Clearance::Session).to receive(:new).and_return(expected_session)
     headers = { 'X-Roaring-Lobster' => 'Red' }
 
     app = Rack::Builder.new do
@@ -19,6 +19,6 @@ describe Clearance::RackSession do
     expect(Clearance::Session).to have_received(:new).with(env)
     expect(response.body).to eq expected_session
     expect(expected_session).to have_received(:add_cookie_to_headers).
-      with(has_entries(headers))
+      with(hash_including(headers))
   end
 end

data/spec/clearance/session_spec.rb

@@ -59,14 +59,14 @@ describe Clearance::Session do
       end
 
       def stub_status(status_class, success)
-        stub('status', success?: success).tap do |status|
-          status_class.stubs(new: status)
+        double("status", success?: success).tap do |status|
+          allow(status_class).to receive(:new).and_return(status)
         end
       end
 
       def stub_callable
         lambda {}.tap do |callable|
-          callable.stubs(:call)
+          allow(callable).to receive(:call)
         end
       end
     end
@@ -104,27 +104,29 @@ describe Clearance::Session do
       def stub_sign_in_guard(options)
         session_status = stub_status(options.fetch(:succeed))
 
-        stub('guard', call: session_status).tap do |guard|
+        double("guard", call: session_status).tap do |guard|
           Clearance.configuration.sign_in_guards << stub_guard_class(guard)
         end
       end
 
       def stub_default_sign_in_guard
-        stub(:default_sign_in_guard).tap do |sign_in_guard|
-          Clearance::DefaultSignInGuard.stubs(:new).with(session).
-            returns(sign_in_guard)
+        double("default_sign_in_guard").tap do |sign_in_guard|
+          allow(Clearance::DefaultSignInGuard).to receive(:new).
+            with(session).
+            and_return(sign_in_guard)
         end
       end
 
       def stub_guard_class(guard)
-        stub(:guard_class).tap do |guard_class|
-          guard_class.stubs(:new).with(session, stub_default_sign_in_guard).
-            returns(guard)
+        double("guard_class").tap do |guard_class|
+          allow(guard_class).to receive(:new).
+            with(session, stub_default_sign_in_guard).
+            and_return(guard)
         end
       end
 
       def stub_status(success)
-        stub('status', success?: success)
+        double("status", success?: success)
       end
 
       after do
@@ -163,7 +165,7 @@ describe Clearance::Session do
   describe 'remember token cookie expiration' do
     context 'default configuration' do
       it 'is set to 1 year from now' do
-        user = stub('User', remember_token: '123abc')
+        user = double("User", remember_token: "123abc")
         headers = {}
         session = Clearance::Session.new(env_without_remember_token)
         session.sign_in user
@@ -181,7 +183,7 @@ describe Clearance::Session do
         expiration = -> { Time.now }
         with_custom_expiration expiration do
           session = Clearance::Session.new(env_without_remember_token)
-          session.stubs(:warn)
+          allow(session).to receive(:warn)
           session.add_cookie_to_headers headers
 
           expect(session).to have_received(:warn).once
@@ -191,11 +193,11 @@ describe Clearance::Session do
       it 'is set to the value of the evaluated lambda' do
         expires_at = -> { 1.day.from_now }
         with_custom_expiration expires_at do
-          user = stub('User', remember_token: '123abc')
+          user = double("User", remember_token: "123abc")
           headers = {}
           session = Clearance::Session.new(env_without_remember_token)
           session.sign_in user
-          session.stubs(:warn)
+          allow(session).to receive(:warn)
           session.add_cookie_to_headers headers
 
           expect(headers).to set_cookie(
@@ -213,7 +215,7 @@ describe Clearance::Session do
           cookies['remember_me'] ? remembered_expires : nil
         end
         with_custom_expiration expires_at do
-          user = stub('User', remember_token: '123abc')
+          user = double("User", remember_token: "123abc")
           headers = {}
           environment = env_with_cookies(remember_me: 'true')
           session = Clearance::Session.new(environment)

data/spec/clearance/sign_in_guard_spec.rb

@@ -3,25 +3,27 @@ require 'spec_helper'
 module Clearance
   describe SignInGuard do
     it 'handles success' do
-      sign_in_guard = SignInGuard.new(stub('session'))
-      status = stub('status')
-      SuccessStatus.stubs(:new).returns(status)
+      sign_in_guard = SignInGuard.new(double("session"))
+      status = double("status")
+      allow(SuccessStatus).to receive(:new).and_return(status)
 
       expect(sign_in_guard.success).to eq(status)
     end
 
     it 'handles failure' do
-      sign_in_guard = SignInGuard.new(stub('session'))
-      status = stub('status')
+      sign_in_guard = SignInGuard.new(double("session"))
+      status = double("status")
       failure_message = "Failed"
-      FailureStatus.stubs(:new).with(failure_message).returns(status)
+      allow(FailureStatus).to receive(:new).
+        with(failure_message).
+        and_return(status)
 
       expect(sign_in_guard.failure(failure_message)).to eq(status)
     end
 
     it 'can proceed to the next guard' do
-      guards = stub('guards', call: true)
-      sign_in_guard = SignInGuard.new(stub('session'), guards)
+      guards = double("guards", call: true)
+      sign_in_guard = SignInGuard.new(double("session"), guards)
       sign_in_guard.next_guard
       expect(guards).to have_received(:call)
     end

data/spec/clearance/testing/helpers_spec.rb

@@ -16,8 +16,9 @@ describe Clearance::Testing::Helpers do
   describe '#sign_in' do
     it 'creates an instance of the clearance user model with FactoryGirl' do
       MyUserModel = Class.new
-      FactoryGirl.stubs(:create)
-      Clearance.configuration.stubs(user_model: MyUserModel)
+      allow(FactoryGirl).to receive(:create)
+      allow(Clearance.configuration).to receive(:user_model).
+        and_return(MyUserModel)
 
       TestClass.new.sign_in
 

data/spec/clearance/token_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Clearance::Token do
   it 'is a random hex string' do
     token = 'my_token'
-    SecureRandom.stubs(:hex).with(20).returns(token)
+    allow(SecureRandom).to receive(:hex).with(20).and_return(token)
 
     expect(Clearance::Token.new).to eq token
   end

data/spec/controllers/apis_controller_spec.rb

@@ -5,8 +5,6 @@ class ApisController < ActionController::Base
 
   before_filter :authorize
 
-  respond_to :js
-
   def show
     render text: 'response'
   end

data/spec/controllers/forgeries_controller_spec.rb

@@ -25,7 +25,6 @@ describe ForgeriesController do
       @user = create(:user)
       @user.update_attribute(:remember_token, 'old-token')
       @request.cookies['remember_token'] = 'old-token'
-      @request.session[:_csrf_token] = 'golden-ticket'
     end
 
     after do
@@ -33,7 +32,8 @@ describe ForgeriesController do
     end
 
     it 'succeeds with authentic token' do
-      post :create, authenticity_token: 'golden-ticket'
+      token = controller.send(:form_authenticity_token)
+      post :create, authenticity_token: token
       expect(subject).to redirect_to(action: 'index')
     end
 

data/spec/models/bcrypt_migration_from_sha1_spec.rb

@@ -10,13 +10,13 @@ describe Clearance::PasswordStrategies::BCryptMigrationFromSHA1 do
   describe '#password=' do
     let(:salt) { 'salt' }
     let(:password) { 'password' }
-    let(:encrypted_password) { stub('encrypted password') }
+    let(:encrypted_password) { double("encrypted password") }
 
     before do
       subject.salt = salt
       digestable = "--#{salt}--#{password}--"
       subject.encrypted_password = Digest::SHA1.hexdigest(digestable)
-      BCrypt::Password.stubs create: encrypted_password
+      allow(BCrypt::Password).to receive(:create).and_return(encrypted_password)
       subject.password = password
     end
 
@@ -43,7 +43,7 @@ describe Clearance::PasswordStrategies::BCryptMigrationFromSHA1 do
       before do
         subject.salt = salt
         subject.encrypted_password = sha1_hash
-        subject.stubs save: true
+        allow(subject).to receive(:save).and_return(true)
       end
 
       it 'is authenticated' do

data/spec/models/bcrypt_spec.rb

@@ -7,10 +7,10 @@ describe Clearance::PasswordStrategies::BCrypt do
 
   describe '#password=' do
     let(:password) { 'password' }
-    let(:encrypted_password) { stub('encrypted password') }
+    let(:encrypted_password) { double("encrypted password") }
 
     before do
-      BCrypt::Password.stubs create: encrypted_password
+      allow(BCrypt::Password).to receive(:create).and_return(encrypted_password)
     end
 
     it 'encrypts the password into encrypted_password' do
@@ -20,7 +20,8 @@ describe Clearance::PasswordStrategies::BCrypt do
     end
 
     it 'encrypts with BCrypt using default cost in non test environments' do
-      Rails.stubs env: ActiveSupport::StringInquirer.new("production")
+      allow(Rails).to receive(:env).
+        and_return(ActiveSupport::StringInquirer.new("production"))
 
       subject.password = password
 

data/spec/models/user_spec.rb

@@ -84,7 +84,7 @@ describe User do
   end
 
   it 'does not generate same remember token for users with same password at same time' do
-    Time.stubs now: Time.now
+    allow(Time).to receive(:now).and_return(Time.now)
     password = 'secret'
     first_user = create(:user, password: password)
     second_user = create(:user, password: password)

data/spec/spec_helper.rb

@@ -10,7 +10,6 @@ Bundler.require
 
 require 'clearance/testing/application'
 require 'rspec/rails'
-require 'bourne'
 require 'factory_girl_rails'
 require 'shoulda-matchers'
 require 'clearance/rspec'
@@ -22,9 +21,17 @@ Clearance::Testing::Application.initialize!
 
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
-  config.mock_with :mocha
   config.use_transactional_fixtures = true
+  config.order = :random
   config.infer_spec_type_from_file_location!
+
+  config.expect_with :rspec do |expectations|
+    expectations.syntax = :expect
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = :expect
+  end
 end
 
 def restore_default_config

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Dan Croak
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt