devise-authy 1.7.0 → 1.8.0

data/spec/controllers/passwords_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe DeviseAuthy::PasswordsController do
-  include Devise::TestHelpers
+describe DeviseAuthy::PasswordsController, type: :controller do
+  include Devise::Test::ControllerHelpers
 
   before :each do
     request.env["devise.mapping"] = Devise.mappings[:user]
@@ -12,16 +12,16 @@ describe DeviseAuthy::PasswordsController do
     describe "Reset password" do
       it "Should redirect to verify token view" do
         user = create_user(:authy_id => 1)
-        user.reset_password_token = User.reset_password_token
-        user.reset_password_sent_at = Time.now.utc
         user.authy_enabled = true
         user.save
 
-        put :update, :user => { :reset_password_token => user.reset_password_token, :password => "password", :password_confirmation => "password" }
+        token = user.send_reset_password_instructions
+
+        put :update, :user => { :reset_password_token => token, :password => "password", :password_confirmation => "password" }
 
         user.reload
-        user.last_sign_in_at.should be_nil
-        response.should redirect_to(root_url)
+        expect(user.last_sign_in_at).to be_nil
+        expect(response).to redirect_to(root_url)
       end
     end
   end
@@ -29,20 +29,20 @@ describe DeviseAuthy::PasswordsController do
   context "when the user don't have 2FA" do
     describe "Reset password" do
       it "Should sign in the user" do
-        user = create_user
-        user.reset_password_token = User.reset_password_token
-        user.reset_password_sent_at = Time.now.utc
+        user = create_user(:authy_id => 1)
         user.save
 
+        token = user.send_reset_password_instructions
+
         last_sign_in_at = user.last_sign_in_at
 
-        put :update, :user => { :reset_password_token => user.reset_password_token, :password => "password", :password_confirmation => "password" }
-        response.should redirect_to(root_url)
+        put :update, :user => { :reset_password_token => token, :password => "password", :password_confirmation => "password" }
+        expect(response).to redirect_to(root_url)
 
         user.reload
-        user.last_sign_in_at.should_not be_nil
-        flash[:notice].should == "Your password was changed successfully. You are now signed in."
+        expect(user.last_sign_in_at).not_to be_nil
+        expect(flash[:notice]).to eq("Your password was changed successfully. You are now signed in.")
       end
     end
   end
-end
+end

data/spec/features/authy_authenticatable_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Authy Autnenticatable", :type => :request do
+describe "Authy Authenticatable", :type => :request do
   describe "If user don't have two factor authentication should login with email - password" do
     before :each do
       @user = create_user(:email => 'foo@bar.com')
@@ -8,18 +8,18 @@ describe "Authy Autnenticatable", :type => :request do
 
     it "Sign in should succeed" do
       fill_sign_in_form('foo@bar.com', '12345678')
-      current_path.should == root_path
-      page.should have_content('Signed in successfully.')
+      expect(current_path).to eq(root_path)
+      expect(page).to have_content('Signed in successfully.')
     end
 
-    it "Sign in shouldn't success" do
+    it "Sign in shouldn't succeed" do
       fill_sign_in_form('foo@bar.com', '14567823')
-      current_path.should == new_user_session_path
-      page.should_not have_content('Signed in successfully.')
+      expect(current_path).to eq(new_user_session_path)
+      expect(page).not_to have_content('Signed in successfully.')
     end
   end
 
-  describe "If user have two factor authentication" do
+  describe "If user has two factor authentication" do
     before :each do
       @user = create_user(:authy_id => 1)
       @user.update_attribute(:authy_enabled, true)
@@ -27,31 +27,31 @@ describe "Authy Autnenticatable", :type => :request do
 
     it "Sign in should succeed" do
       fill_sign_in_form(@user.email, '12345678')
-      current_path.should == user_verify_authy_path
-      page.should have_content('Please enter your Authy token')
+      expect(current_path).to eq(user_verify_authy_path)
+      expect(page).to have_content('Please enter your Authy token')
 
       within('#devise_authy') do
         fill_in 'authy-token', :with => '0000000'
       end
       click_on 'Check Token'
-      current_path.should == root_path
-      page.should have_content(I18n.t('devise.devise_authy.user.signed_in'))
+      expect(current_path).to eq(root_path)
+      expect(page).to have_content(I18n.t('devise.devise_authy.user.signed_in'))
       @user.reload
-      @user.last_sign_in_with_authy.should_not be_nil
+      expect(@user.last_sign_in_with_authy).not_to be_nil
     end
 
     it "Sign in shouldn't succeed" do
       fill_sign_in_form(@user.email, '12345678')
-      current_path.should == user_verify_authy_path
-      page.should have_content('Please enter your Authy token')
+      expect(current_path).to eq(user_verify_authy_path)
+      expect(page).to have_content('Please enter your Authy token')
 
       within('#devise_authy') do
         fill_in 'authy-token', :with => '324567'
       end
       click_on 'Check Token'
-      current_path.should == user_verify_authy_path
+      expect(current_path).to eq(user_verify_authy_path)
       @user.reload
-      @user.last_sign_in_with_authy.should be_nil
+      expect(@user.last_sign_in_with_authy).to be_nil
     end
 
     describe "With cookie['remember_device']" do
@@ -59,16 +59,16 @@ describe "Authy Autnenticatable", :type => :request do
         cookie_val = sign_cookie("remember_device", Time.now.to_i - 2.month.to_i)
         page.driver.browser.set_cookie("remember_device=#{cookie_val}")
         fill_sign_in_form(@user.email, '12345678')
-        current_path.should == user_verify_authy_path
-        page.should have_content('Please enter your Authy token')
+        expect(current_path).to eq(user_verify_authy_path)
+        expect(page).to have_content('Please enter your Authy token')
       end
 
       it "Shouldn't prompt for a token" do
         cookie_val = sign_cookie("remember_device", Time.now.to_i)
         page.driver.browser.set_cookie("remember_device=#{cookie_val}")
         fill_sign_in_form(@user.email, '12345678')
-        current_path.should == root_path
-        page.should have_content("Signed in successfully.")
+        expect(current_path).to eq(root_path)
+        expect(page).to have_content("Signed in successfully.")
       end
     end
 
@@ -77,14 +77,14 @@ describe "Authy Autnenticatable", :type => :request do
       page.driver.browser.set_cookie('user_password_checked=true')
 
       visit user_verify_authy_path
-      current_path.should == new_user_session_path
-      page.should have_content('Sign in')
+      expect(current_path).to eq(new_user_session_path)
+      expect(page).to have_content('Log in')
     end
 
     it "Click link Request sms" do
       fill_sign_in_form(@user.email, '12345678')
       click_link 'Request SMS'
-      page.should have_content("SMS token was sent")
+      expect(page).to have_content("token was sent")
     end
   end
 end

data/spec/features/authy_lockable_spec.rb

@@ -15,19 +15,19 @@ feature 'Authy Lockable' do
     end
 
     scenario 'account locked when user enters invalid code too many times' do
-      Devise.maximum_attempts.times do |i|
+      (LockableUser.maximum_attempts - 1).times do |i|
         fill_verify_token_form invalid_authy_token
         assert_at lockable_user_verify_authy_path
         expect(page).to have_content('Please enter your Authy token')
         user.reload
-        assert_account_locked_for user, nil
+        assert_account_locked_for user, false
         expect(user.failed_attempts).to eq(i + 1)
       end
 
       fill_verify_token_form invalid_authy_token
       user.reload
       assert_at new_user_session_path
-      assert_account_locked_for user
+      assert_account_locked_for user, true
       visit root_path
       assert_at new_user_session_path
     end
@@ -48,19 +48,19 @@ feature 'Authy Lockable' do
       fill_in 'authy-cellphone', with: '8001234567'
       click_on 'Enable'
 
-      Devise.maximum_attempts.times do |i|
+      (LockableUser.maximum_attempts - 1).times do |i|
         fill_in_verify_authy_installation_form invalid_authy_token
         assert_at lockable_user_verify_authy_installation_path
         expect(page).to have_content('Verify your account')
         user.reload
-        assert_account_locked_for user, nil
+        assert_account_locked_for user, false
         expect(user.failed_attempts).to eq(i + 1)
       end
 
       fill_in_verify_authy_installation_form invalid_authy_token
       user.reload
       assert_at new_user_session_path
-      assert_account_locked_for user
+      assert_account_locked_for user, true
       visit root_path
       assert_at new_user_session_path
     end

data/spec/generators_spec.rb

@@ -13,18 +13,20 @@ describe "generators for devise_authy" do
 
   it "rails g should include the generators" do
     @output = rails_command("g")
-    @output.include?('devise_authy:install').should be_true
-    @output.include?('active_record:devise_authy').should be_true
+    expect(@output.include?('devise_authy:install')).to be_truthy
+    expect(@output.include?('active_record:devise_authy')).to be_truthy
   end
 
   it "rails g devise_authy:install" do
     @output = rails_command("g", "devise_authy:install", "-s")
-    @output.include?('config/initializers/devise.rb').should be_true
-    @output.include?('config/locales/devise.authy.en.yml').should be_true
-    @output.include?('app/views/devise/devise_authy/enable_authy.html.erb').should be_true
-    @output.include?('app/views/devise/devise_authy/verify_authy.html.erb').should be_true
-    @output.include?('app/views/devise/devise_authy/verify_authy_installation.html.erb').should be_true
-    @output.include?('app/assets/stylesheets/devise_authy.css').should be_true
-    @output.include?('app/assets/javascripts/devise_authy.js').should be_true
+
+    expect(@output.include?('config/initializers/devise.rb')).to be_truthy
+    expect(@output.include?('authy.rb')).to be_truthy
+    expect(@output.include?('config/locales/devise.authy.en.yml')).to be_truthy
+    expect(@output.include?('app/views/devise/devise_authy/enable_authy.html.erb')).to be_truthy
+    expect(@output.include?('app/views/devise/devise_authy/verify_authy.html.erb')).to be_truthy
+    expect(@output.include?('app/views/devise/devise_authy/verify_authy_installation.html.erb')).to be_truthy
+    expect(@output.include?('app/assets/stylesheets/devise_authy.css')).to be_truthy
+    expect(@output.include?('app/assets/javascripts/devise_authy.js')).to be_truthy
   end
 end

data/spec/models/authy_authenticatable_spec.rb

@@ -1,17 +1,17 @@
 require 'spec_helper'
 
-describe Devise::Models::AuthyAuthenticatable do
+describe Devise::Models::AuthyAuthenticatable, type: :model do
   before(:each) do
     @user = create_user(:authy_id => '20')
   end
 
   describe "User#find_by_authy_id" do
     it "Should find the user" do
-      User.find_by_authy_id('20').should_not be_nil
+      expect(User.find_by_authy_id('20')).not_to be_nil
     end
 
     it "Shouldn't find the user" do
-      User.find_by_authy_id('80').should be_nil
+      expect(User.find_by_authy_id('80')).to be_nil
     end
   end
 end

data/spec/models/authy_lockable_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Devise::Models::AuthyLockable do
+describe Devise::Models::AuthyLockable, type: :controller do
 
   context 'model includes Devise::Models::Lockable' do
 
@@ -9,12 +9,12 @@ describe Devise::Models::AuthyLockable do
     context '#lockable?' do
 
       it 'returns true if lock_strategy is :failed_attempts' do
-        expect(user.lockable?).to be_true
+        expect(user.lockable?).to be_truthy
       end
 
       it 'returns false if lock_strategy is anything other than :failed attempts' do
         Devise.lock_strategy = :none
-        expect(user.lockable?).to be_false
+        expect(user.lockable?).to be_falsey
         Devise.lock_strategy = :failed_attempts
       end
 
@@ -35,17 +35,17 @@ describe Devise::Models::AuthyLockable do
 
       it 'respects the maximum attempts configuration for Devise::Models::Lockable' do
         4.times { user.invalid_authy_attempt! }
-        expect(user.send :attempts_exceeded?).to be_true # protected method
-        expect(user.access_locked?).to be_true
+        expect(user.send :attempts_exceeded?).to be_truthy # protected method
+        expect(user.access_locked?).to be_truthy
       end
 
       it 'returns true if the account is locked' do
         3.times { user.invalid_authy_attempt! }
-        expect(user.invalid_authy_attempt!).to be_true
+        expect(user.invalid_authy_attempt!).to be_truthy
       end
 
       it 'returns false if the account is not locked' do
-        expect(user.invalid_authy_attempt!).to be_false
+        expect(user.invalid_authy_attempt!).to be_falsey
       end
 
     end

data/spec/rails-app/Gemfile

@@ -1,9 +1,10 @@
 source "https://rubygems.org"
 
-gem "rails", "~> 3.2.6"
+gem "rails", "~> 4.2.7"
+gem 'json', '>= 1.8.1'
 gem "sqlite3"
 gem "rake"
 gem "authy"
-gem "devise"
+gem "devise", '>= 3.0.0'
 gem "devise-authy", :path => "../.."
-gem 'jquery-rails'
+gem 'launchy'

data/spec/rails-app/Gemfile.lock

@@ -1,105 +1,126 @@
 PATH
   remote: ../..
   specs:
-    devise-authy (1.5.3)
+    devise-authy (1.7.0)
       authy
       devise
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
+    actionmailer (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.7.1)
+      actionview (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.7.1)
+      activesupport (= 4.2.7.1)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    authy (2.0.1)
-      httpclient (>= 2.2.6)
-    bcrypt-ruby (3.0.1)
-    builder (3.0.4)
-    devise (2.2.3)
-      bcrypt-ruby (~> 3.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.7.1)
+      activesupport (= 4.2.7.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
+      builder (~> 3.1)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      arel (~> 6.0)
+    activesupport (4.2.7.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.4.0)
+    arel (6.0.3)
+    authy (2.7.1)
+      httpclient (>= 2.5.3.3)
+    bcrypt (3.1.11)
+    builder (3.2.2)
+    concurrent-ruby (1.0.2)
+    devise (4.2.0)
+      bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (~> 3.1)
-      warden (~> 1.2.1)
+      railties (>= 4.1.0, < 5.1)
+      responders
+      warden (~> 1.2.3)
     erubis (2.7.0)
-    hike (1.2.2)
-    httpclient (2.3.3)
-    i18n (0.6.1)
-    journey (1.0.4)
-    jquery-rails (3.1.4)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    json (1.7.7)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.22)
-    multi_json (1.7.2)
-    orm_adapter (0.4.0)
-    polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
+    globalid (0.3.7)
+      activesupport (>= 4.1.0)
+    httpclient (2.8.2.3)
+    i18n (0.7.0)
+    json (1.8.3)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    orm_adapter (0.5.0)
+    pkg-config (1.1.7)
+    rack (1.6.4)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
+    rails (4.2.7.1)
+      actionmailer (= 4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activerecord (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.7.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    thor (0.18.1)
-    tilt (1.3.7)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-    warden (1.2.1)
+      thor (>= 0.18.1, < 2.0)
+    rake (11.2.2)
+    responders (2.3.0)
+      railties (>= 4.2.0, < 5.1)
+    sprockets (3.7.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.11)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    warden (1.2.6)
       rack (>= 1.0)
 
 PLATFORMS
@@ -107,9 +128,13 @@ PLATFORMS
 
 DEPENDENCIES
   authy
-  devise
+  devise (>= 3.0.0)
   devise-authy!
-  jquery-rails
-  rails (~> 3.2.6)
+  json (>= 1.8.1)
+  launchy
+  rails (~> 4.2.7)
   rake
   sqlite3
+
+BUNDLED WITH
+   1.11.2