sorcery 0.9.1 → 0.16.3

data/spec/active_record/user_spec.rb

@@ -2,36 +2,26 @@ require 'spec_helper'
 require 'rails_app/app/mailers/sorcery_mailer'
 require 'shared_examples/user_shared_examples'
 
-describe User, "with no submodules (core)", :active_record => true do
+describe User, 'with no submodules (core)', active_record: true do
   before(:all) do
     sorcery_reload!
   end
 
-  context "when app has plugin loaded" do
-    it "responds to the plugin activation class method" do
+  context 'when app has plugin loaded' do
+    it 'responds to the plugin activation class method' do
       expect(ActiveRecord::Base).to respond_to :authenticates_with_sorcery!
     end
 
-    it "User responds to .authenticates_with_sorcery!" do
+    it 'User responds to .authenticates_with_sorcery!' do
       expect(User).to respond_to :authenticates_with_sorcery!
     end
   end
 
   # ----------------- PLUGIN CONFIGURATION -----------------------
 
-  it_should_behave_like "rails_3_core_model"
+  it_should_behave_like 'rails_3_core_model'
 
-  describe "external users" do
-    before(:all) do
-      ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
-      User.reset_column_information
-      sorcery_reload!
-    end
-
-    after(:all) do
-      ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
-    end
-
-    it_should_behave_like "external_user"
+  describe 'external users' do
+    it_should_behave_like 'external_user'
   end
 end

data/spec/controllers/controller_activity_logging_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 # require 'shared_examples/controller_activity_logging_shared_examples'
 
-describe SorceryController do
+describe SorceryController, type: :controller do
   after(:all) do
     sorcery_controller_property_set(:register_login_time, true)
     sorcery_controller_property_set(:register_logout_time, true)
@@ -11,8 +11,7 @@ describe SorceryController do
   end
 
   # ----------------- ACTIVITY LOGGING -----------------------
-  context "with activity logging features" do
-
+  context 'with activity logging features' do
     let(:adapter) { double('sorcery_adapter') }
     let(:user) { double('user', id: 42, sorcery_adapter: adapter) }
 
@@ -20,8 +19,6 @@ describe SorceryController do
       sorcery_reload!([:activity_logging])
     end
 
-    specify { expect(subject).to respond_to(:current_users) }
-
     before(:each) do
       allow(user).to receive(:username)
       allow(user).to receive_message_chain(:sorcery_config, :username_attribute_names, :first) { :username }
@@ -33,14 +30,7 @@ describe SorceryController do
       sorcery_controller_property_set(:register_last_activity_time, false)
     end
 
-    it "'current_users' should proxy to User.current_users" do
-      expect(User).to receive(:current_users).with(no_args)
-
-      subject.current_users
-    end
-
-
-    it "logs login time on login" do
+    it 'logs login time on login' do
       now = Time.now.in_time_zone
       Timecop.freeze(now)
 
@@ -51,7 +41,7 @@ describe SorceryController do
       Timecop.return
     end
 
-    it "logs logout time on logout" do
+    it 'logs logout time on logout' do
       login_user(user)
       now = Time.now.in_time_zone
       Timecop.freeze(now)
@@ -62,7 +52,7 @@ describe SorceryController do
       Timecop.return
     end
 
-    it "logs last activity time when logged in" do
+    it 'logs last activity time when logged in' do
       sorcery_controller_property_set(:register_last_activity_time, true)
 
       login_user(user)
@@ -75,14 +65,14 @@ describe SorceryController do
       Timecop.return
     end
 
-    it "logs last IP address when logged in" do
+    it 'logs last IP address when logged in' do
       sorcery_controller_property_set(:register_last_ip_address, true)
-      expect(user).to receive(:set_last_ip_addess).with('0.0.0.0')
+      expect(user).to receive(:set_last_ip_address).with('0.0.0.0')
 
       login_user(user)
     end
 
-    it "updates nothing but activity fields" do
+    it 'updates nothing but activity fields' do
       pending 'Move to model'
       original_user_name = User.last.username
       login_user(user)
@@ -91,14 +81,14 @@ describe SorceryController do
       expect(User.last.username).to eq original_user_name
     end
 
-    it "does not register login time if configured so" do
+    it 'does not register login time if configured so' do
       sorcery_controller_property_set(:register_login_time, false)
 
       expect(user).to receive(:set_last_login_at).never
       login_user(user)
     end
 
-    it "does not register logout time if configured so" do
+    it 'does not register logout time if configured so' do
       sorcery_controller_property_set(:register_logout_time, false)
       login_user(user)
 
@@ -106,19 +96,18 @@ describe SorceryController do
       logout_user
     end
 
-    it "does not register last activity time if configured so" do
+    it 'does not register last activity time if configured so' do
       sorcery_controller_property_set(:register_last_activity_time, false)
 
       expect(user).to receive(:set_last_activity_at).never
       login_user(user)
     end
 
-    it "does not register last IP address if configured so" do
+    it 'does not register last IP address if configured so' do
       sorcery_controller_property_set(:register_last_ip_address, false)
-      expect(user).to receive(:set_last_ip_addess).never
+      expect(user).to receive(:set_last_ip_address).never
 
       login_user(user)
     end
-
   end
 end

data/spec/controllers/controller_brute_force_protection_spec.rb

@@ -1,16 +1,14 @@
 require 'spec_helper'
 
-describe SorceryController do
-
+describe SorceryController, type: :controller do
   let(:user) { double('user', id: 42, email: 'bla@bla.com') }
 
   def request_test_login
-    get :test_login, email: 'bla@bla.com', password: 'blabla'
+    get :test_login, params: { email: 'bla@bla.com', password: 'blabla' }
   end
 
   # ----------------- SESSION TIMEOUT -----------------------
-  describe "brute force protection features" do
-
+  describe 'brute force protection features' do
     before(:all) do
       sorcery_reload!([:brute_force_protection])
     end
@@ -21,8 +19,8 @@ describe SorceryController do
       Timecop.return
     end
 
-    it "counts login retries" do
-      allow(User).to receive(:authenticate)
+    it 'counts login retries' do
+      allow(User).to receive(:authenticate) { |&block| block.call(nil, :other) }
       allow(User.sorcery_adapter).to receive(:find_by_credentials).with(['bla@bla.com', 'blabla']).and_return(user)
 
       expect(user).to receive(:register_failed_login!).exactly(3).times
@@ -30,14 +28,14 @@ describe SorceryController do
       3.times { request_test_login }
     end
 
-    it "resets the counter on a good login" do
+    it 'resets the counter on a good login' do
       # dirty hack for rails 4
       allow(@controller).to receive(:register_last_activity_time_to_db)
 
-      allow(User).to receive(:authenticate).and_return(user)
+      allow(User).to receive(:authenticate) { |&block| block.call(user, nil) }
       expect(user).to receive_message_chain(:sorcery_adapter, :update_attribute).with(:failed_logins_count, 0)
 
-      get :test_login, email: 'bla@bla.com', password: 'secret'
+      get :test_login, params: { email: 'bla@bla.com', password: 'secret' }
     end
   end
 end

data/spec/controllers/controller_http_basic_auth_spec.rb

@@ -1,68 +1,67 @@
 require 'spec_helper'
 
-describe SorceryController do
+describe SorceryController, type: :controller do
+  let(:user) { double('user', id: 42, email: 'bla@bla.com') }
 
-  let(:user) { double("user", id: 42, email: 'bla@bla.com') }
-
-  describe  "with http basic auth features" do
+  describe 'with http basic auth features' do
     before(:all) do
       sorcery_reload!([:http_basic_auth])
 
-      sorcery_controller_property_set(:controller_to_realm_map, {"sorcery" => "sorcery"})
+      sorcery_controller_property_set(:controller_to_realm_map, 'sorcery' => 'sorcery')
     end
 
     after(:each) do
       logout_user
     end
 
-    it "requests basic authentication when before_filter is used" do
+    it 'requests basic authentication when before_action is used' do
       get :test_http_basic_auth
 
       expect(response.status).to eq 401
     end
 
-    it "authenticates from http basic if credentials are sent" do
+    it 'authenticates from http basic if credentials are sent' do
       # dirty hack for rails 4
       allow(subject).to receive(:register_last_activity_time_to_db)
 
-      @request.env["HTTP_AUTHORIZATION"] = "Basic #{Base64::encode64("#{user.email}:secret")}"
+      @request.env['HTTP_AUTHORIZATION'] = "Basic #{Base64.encode64("#{user.email}:secret")}"
       expect(User).to receive('authenticate').with('bla@bla.com', 'secret').and_return(user)
-      get :test_http_basic_auth, nil, http_authentication_used: true
+      get :test_http_basic_auth, params: {}, session: { http_authentication_used: true }
 
-      expect(response).to be_a_success
+      expect(response).to be_successful
     end
 
-    it "fails authentication if credentials are wrong" do
-      @request.env["HTTP_AUTHORIZATION"] = "Basic #{Base64::encode64("#{user.email}:wrong!")}"
+    it 'fails authentication if credentials are wrong' do
+      @request.env['HTTP_AUTHORIZATION'] = "Basic #{Base64.encode64("#{user.email}:wrong!")}"
       expect(User).to receive('authenticate').with('bla@bla.com', 'wrong!').and_return(nil)
-      get :test_http_basic_auth, nil, http_authentication_used: true
+      get :test_http_basic_auth, params: {}, session: { http_authentication_used: true }
 
       expect(response).to redirect_to root_url
     end
 
     it "allows configuration option 'controller_to_realm_map'" do
-      sorcery_controller_property_set(:controller_to_realm_map, {"1" => "2"})
+      sorcery_controller_property_set(:controller_to_realm_map, '1' => '2')
 
-      expect(Sorcery::Controller::Config.controller_to_realm_map).to eq({"1" => "2"})
+      expect(Sorcery::Controller::Config.controller_to_realm_map).to eq('1' => '2')
     end
 
-    it "displays the correct realm name configured for the controller" do
-      sorcery_controller_property_set(:controller_to_realm_map, {"sorcery" => "Salad"})
+    it 'displays the correct realm name configured for the controller' do
+      sorcery_controller_property_set(:controller_to_realm_map, 'sorcery' => 'Salad')
       get :test_http_basic_auth
 
-      expect(response.headers["WWW-Authenticate"]).to eq "Basic realm=\"Salad\""
+      expect(response.headers['WWW-Authenticate']).to eq 'Basic realm="Salad"'
     end
 
     it "signs in the user's session on successful login" do
       # dirty hack for rails 4
       allow(controller).to receive(:register_last_activity_time_to_db)
 
-      @request.env["HTTP_AUTHORIZATION"] = "Basic #{Base64::encode64("#{user.email}:secret")}"
+      @request.env['HTTP_AUTHORIZATION'] = "Basic #{Base64.encode64("#{user.email}:secret")}"
       expect(User).to receive('authenticate').with('bla@bla.com', 'secret').and_return(user)
 
-      get :test_http_basic_auth, nil, http_authentication_used: true
+      get :test_http_basic_auth, params: {}, session: { http_authentication_used: true }
 
-      expect(session[:user_id]).to eq "42"
+      expect(session[:user_id]).to eq '42'
     end
   end
 end